X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/48f48e6a26a54751ecd0ab90b10ab972cc5e89cd..7af5c69c22148510cf8f042552018c9b966860cd:/FunctionalBlock.h?ds=inline

diff --git a/FunctionalBlock.h b/FunctionalBlock.h
index b6ac65f..2cf9a5a 100644
--- 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
   bool createProductionPattern(); // initialize a QList<char> for each interface from patterns defined in implementation
   bool createProductionCounter(); // initialize a QList<int> from counter defined in implementation
-  void initConsumptionPattern(); // initialize a char** from patterns defined for each interface
-  void initProductionPattern(); // initialize a char** from patterns defined for each interface
   void clearConsumptionPattern();
   void clearProductionPattern();
   bool computeOutputPattern(int nbExec = -1);
   
 private:  
-  // patterns  
-  bool isValidDataGroup(char** pattern, int nbPorts, int clock);
+  // patterns    
   double evaluateExpression(const QString& expression, bool* ok);
-  QList<char> expandPattern(const QString& pattern, bool* ok);
-  QList<char> expandPatternRecur(const QString& pattern, int* offset, bool* ok);
+  QList<char>* expandPattern(const QString& patternIn, bool* ok);
+  void expandPatternRecur(const QString& patternIn, int* offset, bool* ok, QList<char> *patternOut);
+  /*!
+   * \brief canCombinePatterns
+   * \param patternSrc the pattern that must be combined with patternDest (patternDest = patternDest OR patternSrc)  
+   * \param srcCol the column index within patternSrc
+   * \param patternDest the pattern that is modified by the combination (patternDest = patternDest OR patternSrc)
+   * \param destCol the column index within patternDest  
+   * \return true if the combination is possible, and false else (e.g. when X1 must be combined with 11)
+   * NB: if src/destCol are outside the range of the list, false is returned.   
+   */
+  bool canCombinePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, QMap<AbstractInterface*, QList<char>* > patternDest, int destCol);
   /*!
    * \brief combinePatterns
    * \param patternSrc the pattern that must be combined with patternDest (patternDest = patternDest OR patternSrc)  
    * \param srcCol the column index within patternSrc
    * \param patternDest the pattern that is modified by the combination (patternDest = patternDest OR patternSrc)
-   * \param destClock the column index within patternDest
-   * \param nbCols the numer of columns to combine
-   * \param nbPorts the number of rows in both patterns
-   * BEWARE: no check is done if nbCols is consistent with the real length of both patterns, thus an access outside
-   * the patterns is possible.
+   * \param destCol the column index within patternDest      
+   * BEWARE: this method returns as soons as there is an acces problem (i.e. out of list range, impossible combine, ...)
+   leaving the dest pattern in an inconsistent state. Thus, it is a good idea to call canCombine before.
    */
-  void combinePatterns(char** patternSrc, int srcCol, char** patternDest, int destCol, int nbCols, int nbPorts );
-
-  QList<int> productionCounter; //! only usefull for output interfaces
-  int delta;
+  void combinePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, QMap<AbstractInterface*, QList<char>* > patternDest, int destCol);
+  /*!
+   * \brief appendToPattern
+   * \param patternSrc the pattern that must be appended to patternDest
+   * \param srcCol the column index within patternSrc
+   * \param patternDest the pattern that is modified by the append   
+   * \param nbCols the numer of columns to append   
+   * BEWARE: if nbCols is not consistent with the real length of src pattern, there may be less that nbCols
+   * that will be appended
+   */
+  void appendToPattern(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, QMap<AbstractInterface*, QList<char>* > patternDest, int nbCols);
+  /*!
+  * \brief removeDataGroup
+  * \param pattern the pattern for which a column is removed
+  * \param offset the index of the column to remove 
+  */
+  void removeDataGroup(QMap<AbstractInterface*, QList<char>* >& pattern, int offset);
+  /*!
+  * \brief isValidGroup
+  * \param pattern the pattern to test
+  * \param offset the column to test
+  * isValidGroup checks if there is at least one 1 in the column offset of pattern.
+  */
+  bool isValidDataGroup(const QMap<AbstractInterface*, QList<char>* >& pattern, int offset);
+  /*!
+  * \brief isOnlyXGroup
+  * \param pattern the pattern to test
+  * \param offset the column to test
+  * isOnlyXGroup checks if there is only X in the column offset of pattern.
+  */
+  bool isOnlyXDataGroup(const QMap<AbstractInterface*, QList<char>* >& pattern, int offset);
+  /*!
+  * \brief shifRightPattern
+  * \param pattern the pattern to shift
+  * \param offset the column where to shift
+  * shiftRightPattern insert a null colmun in pattern, which leads to shift right the pattern at offset.
+  * this method is used during admittance generation
+  */
+  void shiftRightPattern(const QMap<AbstractInterface*, QList<char>* >& pattern, int offset);
+
+  QMap<AbstractInterface*, QList<char>* > consumptionPattern;
+  QMap<AbstractInterface*, QString > admittance; // the admittance expressed as prologue-cyclic part-eppilogue
+  QMap<AbstractInterface*, QList<char>* > admittanceExpanded; // the admittance expanded by taking into account nb exec.
+  QMap<AbstractInterface*, QList<char>* > productionPattern;
+  QMap<AbstractInterface*, QList<char>* > outputPattern; // CAUTION: the QList<char>* must also be stored in the outputPattern attributes of AbstractInterface
+  QList<int> productionCounter; //! only usefull for control output interfaces
   
-  char** consumptionPattern;
-  int nbConsumingPorts;
-  int lengthCP;
-  char** productionPattern;
-  int nbProducingPorts;
-  int lengthPP;
+  int delta;
+    
   ArithmeticEvaluator* evaluator;
   
   ReferenceBlock* reference;