modified pattern to use only QMap

[blast.git] / FunctionalBlock.h

diff --git a/FunctionalBlock.h b/FunctionalBlock.h
index b6ac65f1ee869f3f23c1ecec6ff68bd95b611895..2cf9a5afc01929f78b88f7abc352f5403fcce4b7 100644 (file)
--- a/FunctionalBlock.h
+++ b/FunctionalBlock.h
@@ -57,40 +57,83 @@ public:
   bool createConsumptionPattern(); // initialize a QList<char> for each interface from patterns defined in implementation\r
   bool createProductionPattern(); // initialize a QList<char> for each interface from patterns defined in implementation\r
   bool createProductionCounter(); // initialize a QList<int> from counter defined in implementation\r
   bool createConsumptionPattern(); // initialize a QList<char> for each interface from patterns defined in implementation\r
   bool createProductionPattern(); // initialize a QList<char> for each interface from patterns defined in implementation\r
   bool createProductionCounter(); // initialize a QList<int> from counter defined in implementation\r

-  void initConsumptionPattern(); // initialize a char** from patterns defined for each interface\r
-  void initProductionPattern(); // initialize a char** from patterns defined for each interface\r

   void clearConsumptionPattern();\r
   void clearProductionPattern();\r
   bool computeOutputPattern(int nbExec = -1);\r
   \r
 private:  \r
   void clearConsumptionPattern();\r
   void clearProductionPattern();\r
   bool computeOutputPattern(int nbExec = -1);\r
   \r
 private:  \r

-  // patterns  \r
-  bool isValidDataGroup(char** pattern, int nbPorts, int clock);\r
+  // patterns    \r

   double evaluateExpression(const QString& expression, bool* ok);\r
   double evaluateExpression(const QString& expression, bool* ok);\r

-  QList<char> expandPattern(const QString& pattern, bool* ok);\r
-  QList<char> expandPatternRecur(const QString& pattern, int* offset, bool* ok);\r
+  QList<char>* expandPattern(const QString& patternIn, bool* ok);\r
+  void expandPatternRecur(const QString& patternIn, int* offset, bool* ok, QList<char> *patternOut);\r
+  /*!\r
+   * \brief canCombinePatterns\r
+   * \param patternSrc the pattern that must be combined with patternDest (patternDest = patternDest OR patternSrc)  \r
+   * \param srcCol the column index within patternSrc\r
+   * \param patternDest the pattern that is modified by the combination (patternDest = patternDest OR patternSrc)\r
+   * \param destCol the column index within patternDest  \r
+   * \return true if the combination is possible, and false else (e.g. when X1 must be combined with 11)\r
+   * NB: if src/destCol are outside the range of the list, false is returned.   \r
+   */\r
+  bool canCombinePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, QMap<AbstractInterface*, QList<char>* > patternDest, int destCol);\r

   /*!\r
    * \brief combinePatterns\r
    * \param patternSrc the pattern that must be combined with patternDest (patternDest = patternDest OR patternSrc)  \r
    * \param srcCol the column index within patternSrc\r
    * \param patternDest the pattern that is modified by the combination (patternDest = patternDest OR patternSrc)\r
   /*!\r
    * \brief combinePatterns\r
    * \param patternSrc the pattern that must be combined with patternDest (patternDest = patternDest OR patternSrc)  \r
    * \param srcCol the column index within patternSrc\r
    * \param patternDest the pattern that is modified by the combination (patternDest = patternDest OR patternSrc)\r

-   * \param destClock the column index within patternDest\r
-   * \param nbCols the numer of columns to combine\r
-   * \param nbPorts the number of rows in both patterns\r
-   * BEWARE: no check is done if nbCols is consistent with the real length of both patterns, thus an access outside\r
-   * the patterns is possible.\r
+   * \param destCol the column index within patternDest      \r
+   * BEWARE: this method returns as soons as there is an acces problem (i.e. out of list range, impossible combine, ...)\r
+   leaving the dest pattern in an inconsistent state. Thus, it is a good idea to call canCombine before.\r

    */\r
    */\r

-  void combinePatterns(char** patternSrc, int srcCol, char** patternDest, int destCol, int nbCols, int nbPorts );\r
-\r
-  QList<int> productionCounter; //! only usefull for output interfaces\r
-  int delta;\r
+  void combinePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, QMap<AbstractInterface*, QList<char>* > patternDest, int destCol);\r
+  /*!\r
+   * \brief appendToPattern\r
+   * \param patternSrc the pattern that must be appended to patternDest\r
+   * \param srcCol the column index within patternSrc\r
+   * \param patternDest the pattern that is modified by the append   \r
+   * \param nbCols the numer of columns to append   \r
+   * BEWARE: if nbCols is not consistent with the real length of src pattern, there may be less that nbCols\r
+   * that will be appended\r
+   */\r
+  void appendToPattern(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, QMap<AbstractInterface*, QList<char>* > patternDest, int nbCols);\r
+  /*!\r
+  * \brief removeDataGroup\r
+  * \param pattern the pattern for which a column is removed\r
+  * \param offset the index of the column to remove \r
+  */\r
+  void removeDataGroup(QMap<AbstractInterface*, QList<char>* >& pattern, int offset);\r
+  /*!\r
+  * \brief isValidGroup\r
+  * \param pattern the pattern to test\r
+  * \param offset the column to test\r
+  * isValidGroup checks if there is at least one 1 in the column offset of pattern.\r
+  */\r
+  bool isValidDataGroup(const QMap<AbstractInterface*, QList<char>* >& pattern, int offset);\r
+  /*!\r
+  * \brief isOnlyXGroup\r
+  * \param pattern the pattern to test\r
+  * \param offset the column to test\r
+  * isOnlyXGroup checks if there is only X in the column offset of pattern.\r
+  */\r
+  bool isOnlyXDataGroup(const QMap<AbstractInterface*, QList<char>* >& pattern, int offset);\r
+  /*!\r
+  * \brief shifRightPattern\r
+  * \param pattern the pattern to shift\r
+  * \param offset the column where to shift\r
+  * shiftRightPattern insert a null colmun in pattern, which leads to shift right the pattern at offset.\r
+  * this method is used during admittance generation\r
+  */\r
+  void shiftRightPattern(const QMap<AbstractInterface*, QList<char>* >& pattern, int offset);\r
+\r
+  QMap<AbstractInterface*, QList<char>* > consumptionPattern;\r
+  QMap<AbstractInterface*, QString > admittance; // the admittance expressed as prologue-cyclic part-eppilogue\r
+  QMap<AbstractInterface*, QList<char>* > admittanceExpanded; // the admittance expanded by taking into account nb exec.\r
+  QMap<AbstractInterface*, QList<char>* > productionPattern;\r
+  QMap<AbstractInterface*, QList<char>* > outputPattern; // CAUTION: the QList<char>* must also be stored in the outputPattern attributes of AbstractInterface\r
+  QList<int> productionCounter; //! only usefull for control output interfaces\r

   \r
   \r

-  char** consumptionPattern;\r
-  int nbConsumingPorts;\r
-  int lengthCP;\r
-  char** productionPattern;\r
-  int nbProducingPorts;\r
-  int lengthPP;\r
+  int delta;\r
+    \r

   ArithmeticEvaluator* evaluator;\r
   \r
   ReferenceBlock* reference;\r
   ArithmeticEvaluator* evaluator;\r
   \r
   ReferenceBlock* reference;\r