started top group gen, added project subdirs

[blast.git] / FunctionalBlock.cpp

diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp
index 66e89b420968bd2c703efd38075d89e59acaf83b..1ec0c11ecff735e63d5351388b43cd1b92d33242 100644 (file)
--- a/FunctionalBlock.cpp
+++ b/FunctionalBlock.cpp
@@ -28,8 +28,13 @@ FunctionalBlock::FunctionalBlock(GroupBlock *_parent, ReferenceBlock *_reference
   lengthOP = -1;\r
   lengthPP = -1;\r
   delta = -1;\r
   lengthOP = -1;\r
   lengthPP = -1;\r
   delta = -1;\r

+  evaluator = NULL;\r
+\r

 }\r
 \r
 }\r
 \r

+FunctionalBlock::~FunctionalBlock() {\r
+  if (evaluator != NULL) delete evaluator;\r
+}\r

 \r
 void FunctionalBlock::parametersValidation(QList<AbstractBlock*>* checkedBlocks, QList<AbstractBlock *> *blocksToConfigure) {\r
   /*\r
 \r
 void FunctionalBlock::parametersValidation(QList<AbstractBlock*>* checkedBlocks, QList<AbstractBlock *> *blocksToConfigure) {\r
   /*\r


@@ -73,6 +78,8 @@ void FunctionalBlock::populate() {
     addParameter(p);\r
   }\r
 \r
     addParameter(p);\r
   }\r
 \r

+  ConnectedInterface* toClk = NULL;\r
+  ConnectedInterface* toRst = NULL;\r

   // create interfaces from reference block\r
   QList<AbstractInterface *> lstRef = reference->getInterfaces();\r
   // store relation between functional and reference\r
   // create interfaces from reference block\r
   QList<AbstractInterface *> lstRef = reference->getInterfaces();\r
   // store relation between functional and reference\r


@@ -86,8 +93,19 @@ void FunctionalBlock::populate() {
       exit(1);\r
     }\r
     hashIface.insert(lstRef.at(i),inter);\r
       exit(1);\r
     }\r
     hashIface.insert(lstRef.at(i),inter);\r

-\r

     addInterface(inter);\r
     addInterface(inter);\r

+    /* WARNING FOR THE FUTURE :\r
+       in case of there are several clock interfaces ofr that block\r
+       it would be a godd idea to make the user choose which one\r
+       must be connected to defautl clk.\r
+       Presently, the first encountered is chosen\r
+     */\r
+    if ((toClk == NULL) && (inter->getPurpose() == AbstractInterface::Clock)) {\r
+      toClk = AI_TO_CON(inter);\r
+    }\r
+    if ((toRst == NULL) && (inter->getPurpose() == AbstractInterface::Reset)) {\r
+      toRst = AI_TO_CON(inter);\r
+    }\r

   }\r
     \r
   AbstractInterface* funCtlIface = NULL;\r
   }\r
     \r
   AbstractInterface* funCtlIface = NULL;\r


@@ -104,8 +122,19 @@ void FunctionalBlock::populate() {
       }       \r
     }\r
   }\r
       }       \r
     }\r
   }\r

-}\r

 \r
 \r

+  // connect clk and rst to group clk/rst or to clkrstgen\r
+  if ((name != "clkrstgen") && (parent != NULL)) {\r
+    try {\r
+      connectClkReset();\r
+    }\r
+    catch(Exception e) {\r
+      AbstractBlock* source = (AbstractBlock *)(e.getSource());\r
+      cerr << qPrintable(source->getName()) << ":" << qPrintable(e.getMessage()) << endl;\r
+      throw(e);\r
+    }\r
+  }\r
+}\r

 \r
 QString FunctionalBlock::getReferenceXmlFile() {\r
     return ((ReferenceBlock *)reference)->getXmlFile();\r
 \r
 QString FunctionalBlock::getReferenceXmlFile() {\r
     return ((ReferenceBlock *)reference)->getXmlFile();\r


@@ -115,26 +144,43 @@ QString FunctionalBlock::getReferenceHashMd5() {
     return ((ReferenceBlock *)reference)->getHashMd5();\r
 }\r
 \r
     return ((ReferenceBlock *)reference)->getHashMd5();\r
 }\r
 \r

-bool FunctionalBlock::createPatterns() {\r
+void FunctionalBlock::createPatterns() throw(Exception) {\r

   static QString fctName = "FunctionalBlock::createPatterns()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   static QString fctName = "FunctionalBlock::createPatterns()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r

+\r
+  if (implementation->hasNoPatterns()) return;\r

   \r
   cout << "create patterns for block " << qPrintable(name) << endl;\r
   \r
   cout << "create patterns for block " << qPrintable(name) << endl;\r

-  evaluator = new ArithmeticEvaluator();\r
-  bool ok = true;  \r
+  if (evaluator == NULL) evaluator = new ArithmeticEvaluator();\r

   if (! isGeneratorBlock()) {\r
   if (! isGeneratorBlock()) {\r

-    ok = ok & createDelta();\r
-    if (ok) ok = ok & createConsumptionPattern();    \r
-    if (ok) ok = ok & createProductionCounter();\r
+    try {\r
+      createDelta();\r
+      createConsumptionPattern();    \r
+      createProductionCounter();\r
+    }\r
+    catch(Exception e) {\r
+      throw(e); // rethrow e\r
+    }\r
+  }\r
+  try {\r
+    createProductionPattern();\r
+  }\r
+  catch(Exception e) {\r
+    throw(e);\r
+  }\r
+  cout << "PP of " << qPrintable(name) << endl;\r
+  QMapIterator<AbstractInterface*,QList<char>* > it(productionPattern);\r
+  while (it.hasNext()) {\r
+    it.next();\r
+    QList<char>* pat = it.value();\r
+    foreach(char c, *pat) cout << (int)c;\r
+    cout << endl;\r

   }\r
   }\r

-  if (ok) ok = ok & createProductionPattern();\r
-  delete evaluator;\r
-  return ok;\r

 }\r
 \r
 }\r
 \r

-bool FunctionalBlock::createDelta() {\r
+void FunctionalBlock::createDelta() throw(Exception) {\r

   static QString fctName = "FunctionalBlock::createDelta()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
   static QString fctName = "FunctionalBlock::createDelta()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r


@@ -144,85 +190,105 @@ bool FunctionalBlock::createDelta() {
   cout << "delta for " << qPrintable(name) << " = " << qPrintable(deltaStr) << endl;\r
   if (deltaStr.isEmpty()) {\r
     delta = -1;\r
   cout << "delta for " << qPrintable(name) << " = " << qPrintable(deltaStr) << endl;\r
   if (deltaStr.isEmpty()) {\r
     delta = -1;\r

-    return true;\r
+    return;\r

   }\r
   \r
   }\r
   \r

-  // look for parameter names\r
-  bool ok = true;\r
-  double result = evaluateExpression(deltaStr, &ok);\r
-  if (!ok) return false;\r
-  \r
+  // look for parameter names  \r
+  double result = 0;\r
+  try {\r
+    result = evaluateExpression(deltaStr);\r
+  }\r
+  catch(Exception e) {\r
+    throw(e);\r
+  }\r

   delta = result;\r
   cout << "delta = " << delta << endl;\r
   delta = result;\r
   cout << "delta = " << delta << endl;\r

-   \r
-  return true;\r

 }\r
 \r
 }\r
 \r

-bool FunctionalBlock::createConsumptionPattern() {\r
+void FunctionalBlock::createConsumptionPattern()  throw(Exception) {\r

   static QString fctName = "FunctionalBlock::createConsumptionPattern()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   \r
   static QString fctName = "FunctionalBlock::createConsumptionPattern()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   \r

-  lengthCP = -1;\r
-  bool ok = true; \r
+  // first clear if already exists\r
+  clearConsumptionPattern();\r
+\r
+  lengthCP = -1;  \r

   QHash<QString,QString> consPattern = implementation->getConsumptionPattern();  \r
   \r
   foreach(AbstractInterface* iface, getControlInputs()) {       \r
     FunctionalInterface* connIface = AI_TO_FUN(iface);\r
     QString refName = connIface->getReference()->getName();    \r
     if (! consPattern.contains(refName)) {\r
   QHash<QString,QString> consPattern = implementation->getConsumptionPattern();  \r
   \r
   foreach(AbstractInterface* iface, getControlInputs()) {       \r
     FunctionalInterface* connIface = AI_TO_FUN(iface);\r
     QString refName = connIface->getReference()->getName();    \r
     if (! consPattern.contains(refName)) {\r

+      throw(Exception(NO_IFACE_CP,this));\r

       cerr << "no consumption pattern for reference interface " << qPrintable(refName) << endl;\r
       cerr << "no consumption pattern for reference interface " << qPrintable(refName) << endl;\r

-      return false;\r

     }\r
     }\r

-    QList<char>* pattern = expandPattern(consPattern.value(refName),&ok);        \r
-    if (!ok) return false;\r
+    QList<char>* pattern = NULL;\r
+    try {\r
+      pattern = expandPattern(consPattern.value(refName));\r
+    }\r
+    catch(Exception e) {\r
+      throw(e);\r
+    }\r

     consumptionPattern.insert(connIface,pattern);\r
     if (lengthCP == -1) {\r
       lengthCP = pattern->size();\r
     }\r
     else {\r
     consumptionPattern.insert(connIface,pattern);\r
     if (lengthCP == -1) {\r
       lengthCP = pattern->size();\r
     }\r
     else {\r

-      if (pattern->size() != lengthCP) return false;\r
+      if (pattern->size() != lengthCP) {\r
+        throw(Exception(INVALID_IFACE_CP_LENGTH,this));\r
+      }\r

     }\r
     }\r

-  }        \r
-  return true;\r
+  }          \r

 }\r
 \r
 }\r
 \r

-bool FunctionalBlock::createProductionPattern() {  \r
+void FunctionalBlock::createProductionPattern() throw(Exception){  \r

   static QString fctName = "FunctionalBlock::createProductionPattern()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   static QString fctName = "FunctionalBlock::createProductionPattern()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r

+\r
+  // first clear if already exists\r
+  clearProductionPattern();\r

   \r
   \r

-  lengthPP = -1;\r
-  bool ok = true; \r
+  lengthPP = -1;  \r

   QHash<QString,QString> prodPattern = implementation->getProductionPattern();  \r
   \r
   foreach(AbstractInterface* iface, getControlOutputs()) {    \r
     FunctionalInterface* connIface = AI_TO_FUN(iface);\r
     QString refName = connIface->getReference()->getName();    \r
     if (! prodPattern.contains(refName)) {\r
   QHash<QString,QString> prodPattern = implementation->getProductionPattern();  \r
   \r
   foreach(AbstractInterface* iface, getControlOutputs()) {    \r
     FunctionalInterface* connIface = AI_TO_FUN(iface);\r
     QString refName = connIface->getReference()->getName();    \r
     if (! prodPattern.contains(refName)) {\r

-      cerr << "no production pattern for reference interface " << qPrintable(refName) << endl;\r
-      return false;\r
+      throw(Exception(NO_IFACE_PP,this));\r
+    }\r
+    QList<char>* pattern = NULL;\r
+    try {\r
+      pattern = expandPattern(prodPattern.value(refName));\r
+    }\r
+    catch(Exception e) {\r
+      throw(e);\r

     }\r
     }\r

-    QList<char>* pattern = expandPattern(prodPattern.value(refName),&ok);\r
-    if (!ok) return false;\r

     productionPattern.insert(connIface,pattern);\r
     if (lengthPP == -1) {\r
       lengthPP = pattern->size();\r
     }\r
     else {\r
     productionPattern.insert(connIface,pattern);\r
     if (lengthPP == -1) {\r
       lengthPP = pattern->size();\r
     }\r
     else {\r

-      if (pattern->size() != lengthPP) return false;\r
+      if (pattern->size() != lengthPP) {\r
+        throw(Exception(INVALID_IFACE_PP_LENGTH,this));\r
+      }\r

     }\r
     }\r

-  }    \r
-  return true;\r
+  }      \r

 }\r
 \r
 }\r
 \r

-bool FunctionalBlock::createProductionCounter() {\r
+void FunctionalBlock::createProductionCounter() throw(Exception) {\r

   static QString fctName = "FunctionalBlock::createProductionCounter()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   static QString fctName = "FunctionalBlock::createProductionCounter()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r

+\r
+  // first clear if already exists\r
+  productionCounter.clear();\r
+\r

   \r
   QStringList counterParts = implementation->getProductionCounter().split(",");\r
   foreach(QString s, counterParts) {\r
   \r
   QStringList counterParts = implementation->getProductionCounter().split(",");\r
   foreach(QString s, counterParts) {\r


@@ -236,14 +302,20 @@ bool FunctionalBlock::createProductionCounter() {
       s.remove(0,1);\r
       s.chop(1);\r
       QStringList gen = s.split(":");\r
       s.remove(0,1);\r
       s.chop(1);\r
       QStringList gen = s.split(":");\r

-      if (gen.size() != 3) return false;\r
+      if (gen.size() != 3) {\r
+        throw(Exception(INVALID_IFACE_PC,this));\r
+      }\r

       int start = 0;\r
       int nb = 0;\r
       int step = 0;\r
       int start = 0;\r
       int nb = 0;\r
       int step = 0;\r

-      for(int i=0;i<3;i++) {\r
-        bool okVal;\r
-        double result = evaluateExpression(gen.at(i),&okVal);\r
-        if (!okVal) return false;\r
+      for(int i=0;i<3;i++) {        \r
+        double result = 0.0;\r
+        try {\r
+          result = evaluateExpression(gen.at(i));\r
+        }\r
+        catch(Exception e) {\r
+          throw(e);\r
+        }\r

         if (i==0) start = result;\r
         else if (i==1) nb = result;\r
         else if (i==2) step = result;\r
         if (i==0) start = result;\r
         else if (i==1) nb = result;\r
         else if (i==2) step = result;\r


@@ -252,11 +324,14 @@ bool FunctionalBlock::createProductionCounter() {
         productionCounter.append(start+j*step);\r
       }\r
     }\r
         productionCounter.append(start+j*step);\r
       }\r
     }\r

-    else {\r
-      bool okVal;\r
-      double result = evaluateExpression(s,&okVal);\r
-      \r
-      if (!okVal) return false;\r
+    else {      \r
+      double result = 0.0;\r
+      try {\r
+        result = evaluateExpression(s);\r
+      }\r
+      catch(Exception e) {\r
+        throw(e);\r
+      }\r

       productionCounter.append(result);      \r
     }\r
   }\r
       productionCounter.append(result);      \r
     }\r
   }\r


@@ -264,45 +339,90 @@ bool FunctionalBlock::createProductionCounter() {
     cout << val << ",";\r
   }\r
   cout << endl;\r
     cout << val << ",";\r
   }\r
   cout << endl;\r

-  \r
-  return true;\r

 }\r
 \r
 }\r
 \r

-QList<char>* FunctionalBlock::expandPattern(const QString& patternIn, bool* ok) {\r
+QList<char>* FunctionalBlock::expandPattern(const QString& patternIn) throw(Exception) {\r

   static QString fctName = "FunctionalBlock::expandPattern()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   static QString fctName = "FunctionalBlock::expandPattern()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r

-  \r
-  QList<char> lst;\r
-  QString  p = patternIn;\r
+  /* expanding a pattern is done in two steps :\r
+      - 1 : finding all variables that correspond to an expression\r
+            and copy them in the pattern\r
+      - 2 : parsing the result\r
+\r
+      Note that the result MUST contain only variables that have a\r
+      integer/double value. Otherwise, expanding will fail.\r
+\r
+   */\r
+\r
+  // first step.\r
+\r
+  QString p = replaceExpressions(patternIn);\r
+\r
+  QList<char> lst;  \r

   p.append(')');\r
   p.append(')');\r

-  int offset = 0;\r
+  int offset = 0;  \r

   QList<char>* patternOut = new QList<char>();\r
   QList<char>* patternOut = new QList<char>();\r

-  expandPatternRecur(p,&offset,ok,patternOut);   \r
+  try {\r
+    patternOut->append(expandPatternRecur(p,&offset));\r
+  }\r
+  catch(Exception e) {\r
+    throw(e);\r
+  }\r
+\r

   return patternOut;\r
 }\r
 \r
   return patternOut;\r
 }\r
 \r

-void FunctionalBlock::expandPatternRecur(const QString& patternIn, int *offset, bool *ok, QList<char>* patternOut) {  \r
+QString FunctionalBlock::replaceExpressions(const QString& patternIn) throw(Exception) {\r
+\r
+  QString res = patternIn;\r
+  bool stop = false;\r
+  QRegularExpression re("[$][a-zA-Z0-9_]+");\r
+\r
+  while (!stop) {\r
+    stop = true;\r
+    QRegularExpressionMatchIterator matcher = re.globalMatch(res);\r
+    while(matcher.hasNext()) {\r
+      QRegularExpressionMatch m = matcher.next();\r
+      QString param = m.captured(0);\r
+      QString paramName = param;\r
+      paramName.remove(0,1);\r
+      BlockParameter* p = getParameterFromName(paramName);\r
+      if ((p != NULL) && (p->getType() == BlockParameter::Expression)) {\r
+        res.replace(param,p->getStringValue());\r
+        stop = false;\r
+        cout << "found an expr: " << qPrintable(paramName) << ", patern => " << qPrintable(res) << endl;\r
+      }\r
+    }\r
+  }\r
+  return res;\r
+}\r
+\r
+QList<char> FunctionalBlock::expandPatternRecur(const QString& patternIn, int *offset) throw(Exception) {\r

   \r
   \r

+  QList<char> patternOut;\r
+\r

   while ((*offset < patternIn.size()) && (patternIn.at(*offset) != ')')) {\r
     \r
     QChar c = patternIn.at(*offset);\r
     if (c == '(') {\r
       *offset += 1;\r
   while ((*offset < patternIn.size()) && (patternIn.at(*offset) != ')')) {\r
     \r
     QChar c = patternIn.at(*offset);\r
     if (c == '(') {\r
       *offset += 1;\r

-      expandPatternRecur(patternIn,offset, ok, patternOut);\r
-      if (!ok) {\r
-        return;\r
+      try {\r
+        patternOut.append(expandPatternRecur(patternIn,offset));\r
+      }\r
+      catch(Exception e) {\r
+        throw(e);\r

       }\r
     }\r
     else if (c == '0') {\r
       }\r
     }\r
     else if (c == '0') {\r

-      patternOut->append(0);\r
+      patternOut.append(0);\r

     }\r
     else if (c == '1') {\r
     }\r
     else if (c == '1') {\r

-      patternOut->append(1);\r
+      patternOut.append(1);\r

     }\r
     else if (c == 'X') {\r
     }\r
     else if (c == 'X') {\r

-      patternOut->append(-1);\r
+      patternOut.append(-1);\r

     }\r
     else if (c == '{') {\r
       *offset += 1;\r
     }\r
     else if (c == '{') {\r
       *offset += 1;\r


@@ -312,19 +432,21 @@ void FunctionalBlock::expandPatternRecur(const QString& patternIn, int *offset,
         *offset += 1;\r
       }\r
       if (*offset == patternIn.size()) {\r
         *offset += 1;\r
       }\r
       if (*offset == patternIn.size()) {\r

-        *ok = false;\r
-        return;\r
+        throw(Exception(INVALID_IFACE_PATTERN,this));\r
+      }\r
+      double repeat = 0;\r
+      try {\r
+        repeat = evaluateExpression(expr);\r
+      }\r
+      catch(Exception e) {\r
+        throw(e);\r

       }\r
       }\r

-      double repeat = evaluateExpression(expr,ok);\r
-      if (!ok) {\r
-        return;      \r
-      }            \r

       // repeat just the last value in currentGroup\r
       // repeat just the last value in currentGroup\r

-      char last = patternOut->last();      \r
+      char last = patternOut.last();\r

       //cout << "repeat last char " << repeat << " times : " << (int)last << endl;\r
       \r
       for(int i=1;i<(int)repeat;i++) {\r
       //cout << "repeat last char " << repeat << " times : " << (int)last << endl;\r
       \r
       for(int i=1;i<(int)repeat;i++) {\r

-        patternOut->append(last);\r
+        patternOut.append(last);\r

       }\r
     }    \r
     *offset += 1;\r
       }\r
     }    \r
     *offset += 1;\r


@@ -339,106 +461,258 @@ void FunctionalBlock::expandPatternRecur(const QString& patternIn, int *offset,
       *offset += 1;\r
     }\r
     if (*offset == patternIn.size()) {\r
       *offset += 1;\r
     }\r
     if (*offset == patternIn.size()) {\r

-      *ok = false;\r
-      return;\r
+      throw(Exception(INVALID_IFACE_PATTERN,this));\r

     }\r
     }\r

-    double repeat = evaluateExpression(expr,ok);\r
-    if (!ok) {\r
-      return;      \r
+    double repeat = 0;\r
+    try {\r
+      repeat = evaluateExpression(expr);\r
+    }\r
+    catch(Exception e) {\r
+      throw(e);\r

     }\r
     /*\r
     cout << "repeat last group " << repeat << " times : ";\r
     foreach (char c, currentGroup) cout <<(int)c;\r
     cout << endl;  \r
     */\r
     }\r
     /*\r
     cout << "repeat last group " << repeat << " times : ";\r
     foreach (char c, currentGroup) cout <<(int)c;\r
     cout << endl;  \r
     */\r

-    QList<char> single = *patternOut;\r
+    QList<char> single = patternOut;\r

     for(int i=1;i<(int)repeat;i++) {\r
     for(int i=1;i<(int)repeat;i++) {\r

-      patternOut->append(single);\r
+      patternOut.append(single);\r

     }    \r
     }    \r

-  }\r
-  //*offset += 1;\r
-  return;\r
+  }  \r
+  return patternOut;\r

 }\r
 \r
 }\r
 \r

-double FunctionalBlock::evaluateExpression(const QString& expression, bool* ok) {\r
+double FunctionalBlock::evaluateExpression(const QString& expression) throw(Exception) {\r

   static QString fctName = "FunctionalBlock::evaluateExpression()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   static QString fctName = "FunctionalBlock::evaluateExpression()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r

-  \r
-  *ok = true;\r
+    \r

   QHash<QString,double> vars;\r
   evaluator->setExpression(expression);\r
   QList<QString> varNames = evaluator->getVariableNames();\r
   foreach (QString name, varNames) {\r
     QString paramName = name;\r
     paramName.remove(0,1);\r
   QHash<QString,double> vars;\r
   evaluator->setExpression(expression);\r
   QList<QString> varNames = evaluator->getVariableNames();\r
   foreach (QString name, varNames) {\r
     QString paramName = name;\r
     paramName.remove(0,1);\r

-    BlockParameter* param = reference->getParameterFromName(paramName);    \r
+    BlockParameter* param = getParameterFromName(paramName);\r

     if (param == NULL) {\r
     if (param == NULL) {\r

-      cerr << "found an unknown parameter in delta"<< endl;\r
-      *ok = false;\r
-      return 0.0;\r
+      throw(Exception(EVAL_PARAM_UNKNOWN,this));\r

     }\r
     bool okVal;\r
     }\r
     bool okVal;\r

-    int val = param->getDoubleValue(&okVal);\r
+    int val = param->getDoubleValue(&okVal);    \r

     if (!okVal) {\r
     if (!okVal) {\r

-      cerr << "cannot obtain double value of paramter " << qPrintable(paramName) << endl;\r
-      *ok = false;\r
-      return 0.0;\r
+      throw(Exception(EVAL_PARAM_NOVALUE,this));\r

     }\r
     vars.insert(name,(double)val);    \r
   }\r
   \r
   evaluator->setVariablesValue(vars);\r
     }\r
     vars.insert(name,(double)val);    \r
   }\r
   \r
   evaluator->setVariablesValue(vars);\r

-  double result;\r
+  double result = 0.0;\r

   try {\r
     result = evaluator->evaluate();\r
   }\r
   catch(int index) {\r
     cerr << "Error at index " << index << ": " << qPrintable(evaluator->getError()) << endl;\r
   try {\r
     result = evaluator->evaluate();\r
   }\r
   catch(int index) {\r
     cerr << "Error at index " << index << ": " << qPrintable(evaluator->getError()) << endl;\r

-    *ok = false;\r
-    return 0.0;\r
+    throw(Exception(EVAL_INVALID_EXPR,this));\r

   }\r
   return result;\r
 }\r
 \r
   }\r
   return result;\r
 }\r
 \r

-void FunctionalBlock::createInputPattern() {\r
+void FunctionalBlock::computeAdmittanceDelays() throw(Exception) {\r
+  static QString fctName = "FunctionalBlock::computeAdmittanceDelays()";\r
+#ifdef DEBUG_FCTNAME\r
+  cout << "call to " << qPrintable(fctName) << endl;\r
+#endif\r
+  QList<int> inClock;\r
+  QList<int> delays;\r
+\r
+  clearAdmittanceDelays();\r
+\r
+  // trying to synchronize the first one in AP\r
+  QMapIterator<AbstractInterface*,QList<char>* > iterAP(admittance);\r
+  QMapIterator<AbstractInterface*,QList<char>* > iterIP(inputPattern);\r
+\r
+  while (iterAP.hasNext()) {\r
+    iterAP.next();\r
+    iterIP.next();\r
+    QList<char>* ap = iterAP.value();\r
+    QList<char>* ip = iterIP.value();\r
+    int first = 0;\r
+    while ((first < lengthIP) && (ip->at(first) == 0)) first++;\r
+    while ((first < lengthAP) && (ap->at(first) == 0)) first--;\r
+    delays.append(first);\r
+    inClock.append(0);\r
+    QList<int>* delays = new QList<int>();\r
+    admittanceDelays.insert(iterAP.key(), delays);\r
+  }\r
+\r
+  QMapIterator<AbstractInterface*,QList<int>* > iterDelays(admittanceDelays);\r
+\r
+  // get the delay to apply\r
+  int maxDelay = 0;\r
+  for(int i=0;i<delays.size();i++) {\r
+    if (delays[i] > maxDelay) maxDelay = delays[i];\r
+  }\r
+  // adding the delays to IP\r
+  iterIP.toFront();\r
+  int i = 0;\r
+  while (iterIP.hasNext()) {\r
+    iterIP.next();\r
+    iterDelays.next();\r
+    QList<char>* ip = iterIP.value();\r
+    QList<int>* d = iterDelays.value();\r
+    d->append(maxDelay-delays[i]);\r
+    cout << "prependind " << qPrintable(iterIP.key()->getName()) << " with " << (maxDelay-delays[i]) << " 0" << endl;\r
+    for(int j=0;j<maxDelay-delays[i];j++) {\r
+      ip->prepend(0);\r
+    }\r
+    for(int j=0;j<delays[i];j++) {\r
+      ip->append(0);\r
+    }\r
+    i++;\r
+  }\r
+  lengthIP += maxDelay;\r
+\r
+  cout << "IP length = " << lengthIP << ", AP length = " << lengthAP << endl;\r
+  bool stop = false;\r
+  int apIndex = 0;\r
+  int ipIndex = 0;\r
+  while (!stop) {\r
+\r
+    // if AP is a valid group, search for the next valid group in IP\r
+    if (isValidDataGroup(admittance,apIndex)) {\r
+\r
+      while ((ipIndex < lengthIP) && (! isValidDataGroup(inputPattern,ipIndex))) ipIndex++;\r
+      if (ipIndex == lengthIP) {\r
+        stop = true;\r
+        continue;\r
+      }\r
+    }\r
+\r
+    iterAP.toFront();\r
+    iterIP.toFront();\r
+    iterDelays.toFront();\r
+\r
+    if (samePatterns(inputPattern,ipIndex,admittance,apIndex)) {\r
+      while (iterAP.hasNext()) {\r
+        iterAP.next();\r
+        iterDelays.next();\r
+        QList<char>* ap = iterAP.value();\r
+        if (ap->at(apIndex) == 1) {\r
+          QList<int>* d = iterDelays.value();\r
+          d->append(0); // the 1 is at its good place, so no delay\r
+        }\r
+      }\r
+    }\r
+    else {\r
+      cout << "diff between IP and AP at " << apIndex << endl;\r
+      // search for the next 1 in IP for every input that has a 1 in AP\r
+\r
+      while (iterAP.hasNext()) {\r
+        iterAP.next();\r
+        iterIP.next();\r
+        iterDelays.next();\r
+        QList<char>* ap = iterAP.value();\r
+        QList<char>* ip = iterIP.value();\r
+        QList<int>* d = iterDelays.value();\r
+        // case 1: 1 in IP is too late\r
+        if ((ap->at(apIndex) == 1) && (ip->at(ipIndex) == 0)) {\r
+          int delay = 1;\r
+          while ( ((ipIndex+delay) < lengthIP) && (ip->at(ipIndex+delay) == 0) ) delay++;\r
+          cout << "found a delay of " << (-delay) << " for iface " << qPrintable(iterAP.key()->getName()) << endl;\r
+          // moving the 1 to its normal pos.\r
+          ip->replace(ipIndex,1);\r
+          ip->replace(ipIndex+delay,0);\r
+          d->append(-delay);\r
+        }\r
+        // case 2: 1 in IP is too soon\r
+        else if ((ap->at(apIndex) == 0) && (ip->at(ipIndex) == 1)) {\r
+          int delay = 1;\r
+          while ( ((apIndex+delay) < lengthAP) && (ap->at(apIndex+delay) == 0) ) delay++;\r
+          cout << "found a delay of " << delay << " for iface " << qPrintable(iterAP.key()->getName()) << endl;\r
+          // search for next 0 in IP to put the 1\r
+          int k = ipIndex+delay;\r
+          while ((k < lengthIP) && (ip->at(k) == 1)) k++;\r
+          ip->replace(ipIndex,0);\r
+          ip->replace(k,1);\r
+          d->append(delay);\r
+        }\r
+      }\r
+      if (! samePatterns(inputPattern,inClock,admittance,apIndex)) {\r
+         cout << "Abnormal case while searching for delays" << endl;\r
+      }\r
+    }\r
+\r
+    apIndex++;\r
+    ipIndex++;\r
+    if ((apIndex >= lengthAP) || (ipIndex >= lengthIP)) stop = true;\r
+  }\r
+  iterDelays.toFront();\r
+  while (iterDelays.hasNext()) {\r
+    iterDelays.next();\r
+    QList<int>* d = iterDelays.value();\r
+    foreach(int v, *d) {\r
+      cout << v << " ";\r
+    }\r
+    cout << endl;\r
+  }\r
+\r
+}\r
+\r
+void FunctionalBlock::createInputPattern()  throw(Exception) {\r

   static QString fctName = "FunctionalBlock::createInputPattern())";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   \r
   lengthIP = -1;\r
   static QString fctName = "FunctionalBlock::createInputPattern())";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   \r
   lengthIP = -1;\r

-  foreach(AbstractInterface* iface, getControlInputs()) {      \r
+  foreach(AbstractInterface* iface, getControlInputs()) {\r
+\r

     ConnectedInterface* connIface = AI_TO_CON(iface);\r
     ConnectedInterface* connIface = AI_TO_CON(iface);\r

+    // check if it is connected\r
+    if (connIface->getConnectedFrom() == NULL) {\r
+      throw(Exception(IFACE_NOT_CONNECTED,this));\r
+    }\r
+    // get the precursor output pattern\r

     QList<char>* out = connIface->getConnectedFrom()->getOutputPattern();\r
     QList<char>* out = connIface->getConnectedFrom()->getOutputPattern();\r

+    AbstractInputModifier* modifier = connIface->getInputModifier();\r
+    // check if the input is modified\r
+    if (modifier != NULL) {\r
+\r
+      out = modifier->getModifiedInput(out);\r
+    }\r
+\r
+    if (out->size() == 0) {\r
+      clearInputPattern();\r
+      throw(Exception(NO_IFACE_IP,this));\r
+    }\r

     if (lengthIP == -1) {\r
       lengthIP = out->size();\r
     }\r
     else {\r
       if (out->size() < lengthIP) lengthIP = out->size();\r
     }\r
     if (lengthIP == -1) {\r
       lengthIP = out->size();\r
     }\r
     else {\r
       if (out->size() < lengthIP) lengthIP = out->size();\r
     }\r

-    if (out->size() > 0) {\r
-      QList<char>* in = new QList<char>(*out);\r
-      foreach(char c, *in) {\r
-        cout << (int)c;\r
-      }\r
-      cout << endl;\r
-\r
-      inputPattern.insert(connIface,in);\r
+    \r
+    QList<char>* in = new QList<char>(*out);\r
+    foreach(char c, *in) {\r
+      cout << (int)c;\r

     }\r
     }\r

-    else {\r
-      inputPattern.insert(connIface,NULL);\r
-    }      \r
-  }  \r
+    cout << endl;    \r
+    inputPattern.insert(connIface,in);    \r
+  }\r
+  // search the last valid group in IP,\r
+  while(! isValidDataGroup(inputPattern,lengthIP-1)) {\r
+    //removeDataGroup(inputPattern,lengthIP-1);\r
+    lengthIP -= 1;\r
+  }\r

 }\r
 \r
 }\r
 \r

-bool FunctionalBlock::createAdmittance(int nbExec) {\r
+void FunctionalBlock::createAdmittance(int nbExec) throw(Exception) {\r

   static QString fctName = "FunctionalBlock::createAdmittance()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
   static QString fctName = "FunctionalBlock::createAdmittance()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r

-#endif\r
-  bool ok = true;\r
+#endif  \r

   // firstly, copy CP in AP\r
   QMapIterator<AbstractInterface*,QList<char>* > iterC(consumptionPattern);\r
   while (iterC.hasNext()) {\r
   // firstly, copy CP in AP\r
   QMapIterator<AbstractInterface*,QList<char>* > iterC(consumptionPattern);\r
   while (iterC.hasNext()) {\r


@@ -492,8 +766,7 @@ bool FunctionalBlock::createAdmittance(int nbExec) {
         j -= 1;\r
       }\r
       else {\r
         j -= 1;\r
       }\r
       else {\r

-        cout << "AP and CP are not consistent" << endl;\r
-        return false;\r
+        throw(INVALID_DELTA_CP);        \r

       }\r
     }\r
   }\r
       }\r
     }\r
   }\r


@@ -504,61 +777,76 @@ bool FunctionalBlock::createAdmittance(int nbExec) {
     QList<char>* pattern = iterA.value();\r
     for(int i=0;i<pattern->size();i++) {\r
       if (pattern->at(i) == -1) pattern->replace(i,0);\r
     QList<char>* pattern = iterA.value();\r
     for(int i=0;i<pattern->size();i++) {\r
       if (pattern->at(i) == -1) pattern->replace(i,0);\r

+      cout << (int)(pattern->at(i));\r

     }\r
     }\r

-  }\r
-  return true;\r
+    cout << endl;\r
+  }  \r

 }\r
 \r
 }\r
 \r

-bool FunctionalBlock::checkInputPatternCompatibility() {\r
+void FunctionalBlock::checkInputPatternCompatibility() throw(Exception) {\r

   static QString fctName = "FunctionalBlock::checkInputPatternCompatibility()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   static QString fctName = "FunctionalBlock::checkInputPatternCompatibility()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r

-  \r
-  bool ok = true;\r
+    \r

   // firstly, create input pattern\r
   // firstly, create input pattern\r

-  createInputPattern();      \r
-  // if some patterns are not available, end now, returning false\r
-  if (lengthIP == 0) {\r
-    clearInputPattern();\r
-    return false;\r
+  try {\r
+    createInputPattern();\r
+  }\r
+  catch(Exception e) {\r
+    throw(e);\r
+  }\r
+  int nbExec = createTriggers();\r
+  cout << qPrintable(name) << " will exec. " << nbExec << " times." << endl;\r
+  \r
+  try {\r
+    createAdmittance(nbExec);\r
+  }\r
+  catch(Exception e) {\r
+    cout << "cannot create admittance" << endl;\r
+    throw(e);\r

   }\r
   }\r

-  int nbExec = getNumberOfExecution();\r
-  ok = createAdmittance(nbExec);\r
-  if (!ok) return false;\r

   \r
   int clock = 0; // index in IP  \r
   \r
   int clock = 0; // index in IP  \r

-  int i = 0; // index in AP\r
-  while (clock < lengthIP) {\r
-    if (samePatterns(inputPattern,clock,admittance,i)) {\r
-      clock++;\r
-      i++;\r
-    }\r
-    else {\r
-      if (isValidDataGroup(admittance,i)) {\r
-        \r
-      }\r
-      else {\r
-        // IP and AP are not equal and AP is a valid group -> not compatible\r
-        return false;\r
+  int i = 0; // index in AP  \r
+  while ((clock < lengthIP) && (i < lengthAP)) {\r
+     \r
+    // if AP is a valid group, search for the next valid group in IP\r
+    if (isValidDataGroup(admittance,i)) {\r
+      while ((clock < lengthIP) && (! isValidDataGroup(inputPattern,clock))) clock++;\r
+      if (clock == lengthIP) {\r
+        cerr << "Abnormal case: end of IP has been reached without finding a valid group" << endl;\r
+        throw(Exception(IP_END_NULLCOL,this));\r

       }\r
       }\r

-      \r

     }    \r
     }    \r

+    /* at that point 2 cases of compat : IP(clock) and AP(i) are equal valid group, or\r
+       are both null columns\r
+    */\r
+    if (! samePatterns(inputPattern,clock,admittance,i)) {\r
+      cout << "AP(" << i << ") and IP(" << clock << ") are not equal" << endl;\r
+      throw(Exception(IP_AP_NOTCOMPAT,this)); // IP and AP not compatible\r
+    }\r
+    clock++;\r
+    i++;\r

   }\r
   }\r

-  return true;\r
+  if (clock < lengthIP) {\r
+    throw(Exception(AP_TOO_SHORT,this));\r
+    cerr << "Abnormal case: AP is to short" << endl;   \r
+  }  \r

 }\r
 \r
 }\r
 \r

-bool FunctionalBlock::computeOutputPattern(int nbExec) {\r
+void FunctionalBlock::computeOutputPattern(int nbExec) throw(Exception) {\r

   static QString fctName = "FunctionalBlock::computeOutputPattern()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   static QString fctName = "FunctionalBlock::computeOutputPattern()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r

-  \r
+\r
+  clearOutputPattern();\r
+\r

   /* case 1: the block is a generator for which output pattern\r
      must be computed for a nbExec following executions\r
   */\r
   /* case 1: the block is a generator for which output pattern\r
      must be computed for a nbExec following executions\r
   */\r

-  \r
-  \r
+\r

   if (nbExec > 0) {\r
     cout << "computing output pattern of " << qPrintable(name) << " for " << nbExec << " executions" << endl;\r
     foreach(AbstractInterface* iface, getControlOutputs()) {\r
   if (nbExec > 0) {\r
     cout << "computing output pattern of " << qPrintable(name) << " for " << nbExec << " executions" << endl;\r
     foreach(AbstractInterface* iface, getControlOutputs()) {\r


@@ -578,12 +866,14 @@ bool FunctionalBlock::computeOutputPattern(int nbExec) {
     \r
     // in case of inputPattern not created, do it\r
     if (lengthIP <= 0) {\r
     \r
     // in case of inputPattern not created, do it\r
     if (lengthIP <= 0) {\r

+\r
+      cout << "Strange case: input pattern is not created while it is time to compute output pattern !" << endl;\r

       // collect the input patterns for each input    \r
       // collect the input patterns for each input    \r

-      createInputPattern();    \r
-      // if some patterns are not available, end now, returning false\r
-      if (lengthIP == 0) {\r
-        clearInputPattern();\r
-        return false;\r
+      try {\r
+        createInputPattern();\r
+      }\r
+      catch(Exception e) {\r
+        throw(e);\r

       }\r
       cout << "input pattern array initialized with min. len " << lengthIP << endl;\r
     }\r
       }\r
       cout << "input pattern array initialized with min. len " << lengthIP << endl;\r
     }\r


@@ -671,10 +961,135 @@ bool FunctionalBlock::computeOutputPattern(int nbExec) {
 \r
     // clear input pattern\r
     clearInputPattern();\r
 \r
     // clear input pattern\r
     clearInputPattern();\r

-  }\r
-  return true;\r
+  }  \r

 }\r
 \r
 }\r
 \r

+/*\r
+\r
+void FunctionalBlock::computeOutputPattern(int nbExec) throw(Exception) {\r
+  static QString fctName = "FunctionalBlock::computeOutputPattern()";\r
+#ifdef DEBUG_FCTNAME\r
+  cout << "call to " << qPrintable(fctName) << endl;\r
+#endif\r
+\r
+  // case 1: the block is a generator for which output pattern\r
+  //   must be computed for a nbExec following executions\r
+\r
+  if (nbExec > 0) {\r
+    cout << "computing output pattern of " << qPrintable(name) << " for " << nbExec << " executions" << endl;\r
+    foreach(AbstractInterface* iface, getControlOutputs()) {\r
+      FunctionalInterface* connIface = AI_TO_FUN(iface);\r
+      // create output pattern\r
+      QList<char>* pp = productionPattern.value(connIface);\r
+      QList<char>* pattern = new QList<char>(*pp);\r
+      for(int i=1;i<nbExec;i++) pattern->append(*pp);\r
+      // assign pattern to interface\r
+      connIface->setOutputPattern(pattern);\r
+      // store it in QMap\r
+      outputPattern.insert(connIface,pattern);\r
+    }\r
+  }\r
+  else {\r
+    cout << "computing output pattern of " << qPrintable(name) << endl;\r
+\r
+    // in case of inputPattern not created, do it\r
+    if (lengthIP <= 0) {\r
+      // collect the input patterns for each input\r
+      try {\r
+        createInputPattern();\r
+      }\r
+      catch(Exception e) {\r
+        throw(e);\r
+      }\r
+      cout << "input pattern array initialized with min. len " << lengthIP << endl;\r
+    }\r
+\r
+    // initialize the output pattern\r
+    lengthOP = 0;\r
+    foreach(AbstractInterface* iface, getControlOutputs()) {\r
+      FunctionalInterface* connIface = AI_TO_FUN(iface);\r
+      lengthOP = lengthIP+productionPattern.value(connIface)->size();\r
+      QList<char>* pattern = new QList<char>();\r
+      for(int i=0;i<lengthOP;i++) pattern->append(0);\r
+      connIface->setOutputPattern(pattern);\r
+      outputPattern.insert(connIface,pattern);\r
+    }\r
+    cout << "output pattern array initialized" << endl;\r
+\r
+    int clock = 0;\r
+    nbExec = 0;\r
+    // search for the beginning of the first execution.\r
+    while ((clock < lengthIP) && (! isValidDataGroup(inputPattern,clock))) clock++;\r
+    cout << "found 1st exec clock: " << clock << endl;\r
+\r
+    while (clock < lengthIP) {\r
+      // initialize counters for current execution.\r
+      int p = 0; // index in production pattern\r
+      int o = 0; // clock+o will give the clock cycle of each output group\r
+      int cip = 0; // clock+cip give the clock cycle of an input group\r
+      int ccp = 0; // ccp give a column in the consumptio pattern\r
+      int nip = 0; // number of input data groups already consumed during the current execution, used while exploring IP\r
+      int ncp = 0; // number of input data groups already consumed during the current execution, used while exploring CP\r
+      bool cannotCompleteExec = false;\r
+      for(int m=0;m<productionCounter.size();m++) {\r
+        // search for the first production in PP\r
+        while (!isValidDataGroup(productionPattern,p)) {\r
+          p += 1;\r
+          o += 1;\r
+        }\r
+        int gap = 0; // count the number of extra null columns\r
+        // search for PC(m) valid input group in IP\r
+        while (nip < productionCounter.at(m)) {\r
+          if (clock+cip < lengthIP) {\r
+            if (isValidDataGroup(inputPattern,clock+cip)) nip += 1;\r
+            cip += 1;\r
+            gap += 1;\r
+          }\r
+          else {\r
+            cannotCompleteExec = true;\r
+            break;\r
+          }\r
+        }\r
+\r
+        if (cannotCompleteExec) break; // no need to go further since the next search of input data group will lead to go outside inputPattern\r
+\r
+        // search for PC(m) valid input group in IP\r
+        while (ncp < productionCounter.at(m)) {\r
+          if (isValidDataGroup(consumptionPattern,ccp)) ncp += 1;\r
+          ccp += 1;\r
+          gap -= 1;\r
+        }\r
+        o += gap; // to take into acocunt of extra null columns\r
+        combinePatterns(productionPattern,p,outputPattern,clock+o);\r
+        p += 1;\r
+        o += 1;\r
+      }\r
+\r
+      if (cannotCompleteExec) break; // no need to go further since the next search of input data group will lead to go outside inputPattern\r
+\r
+      // current exec. taken into accunt\r
+      nbExec += 1;\r
+\r
+      // search for the next exec.\r
+      clock += 1;\r
+      nip = 0;\r
+      while ((clock < lengthIP) && (nip < delta)) {\r
+        if (isValidDataGroup(inputPattern,clock)) nip += 1;\r
+        if (nip < delta) clock += 1;\r
+      }\r
+      cout << "found exec " << nbExec << " at clock: " << clock << endl;\r
+    }\r
+    // find the last valid output data group\r
+    while(! isValidDataGroup(outputPattern,lengthOP-1)) {\r
+      removeDataGroup(outputPattern,lengthOP-1);\r
+      lengthOP -= 1;\r
+    }\r
+\r
+    // clear input pattern\r
+    clearInputPattern();\r
+  }\r
+}\r
+*/\r

 bool FunctionalBlock::samePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, const QMap<AbstractInterface*, QList<char>* >& patternDest, int destCol) {\r
   \r
   if (patternSrc.size() != patternDest.size()) return false;\r
 bool FunctionalBlock::samePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, const QMap<AbstractInterface*, QList<char>* >& patternDest, int destCol) {\r
   \r
   if (patternSrc.size() != patternDest.size()) return false;\r


@@ -692,6 +1107,26 @@ bool FunctionalBlock::samePatterns(const QMap<AbstractInterface*, QList<char>* >
   return true;\r
 }\r
 \r
   return true;\r
 }\r
 \r

+bool FunctionalBlock::samePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, const QList<int> &srcCols, const QMap<AbstractInterface*, QList<char>* >& patternDest, int destCol) {\r
+  if (patternSrc.size() != srcCols.size()) return false;\r
+  if (patternSrc.size() != patternDest.size()) return false;\r
+\r
+  QMapIterator<AbstractInterface*, QList<char>* > iterSrc(patternSrc);\r
+  QListIterator<int> iterSrcCol(srcCols);\r
+  QMapIterator<AbstractInterface*, QList<char>* > iterDest(patternDest);\r
+  while (iterSrc.hasNext()) {\r
+    iterSrc.next();\r
+    int srcCol = iterSrcCol.next();\r
+    iterDest.next();\r
+    QList<char>* srcPat = iterSrc.value();\r
+    QList<char>* destPat = iterDest.value();\r
+    if (srcCol >= srcPat->size()) return false;\r
+    if (destCol >= destPat->size()) return false;\r
+    if (srcPat->at(srcCol) != destPat->at(destCol)) return false;\r
+  }\r
+  return true;\r
+}\r
+\r

 bool FunctionalBlock::canCombinePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, QMap<AbstractInterface*, QList<char>* > patternDest, int destCol) {\r
   if (patternSrc.size() != patternDest.size()) return false;\r
   QMapIterator<AbstractInterface*, QList<char>* > iterSrc(patternSrc);\r
 bool FunctionalBlock::canCombinePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, QMap<AbstractInterface*, QList<char>* > patternDest, int destCol) {\r
   if (patternSrc.size() != patternDest.size()) return false;\r
   QMapIterator<AbstractInterface*, QList<char>* > iterSrc(patternSrc);\r


@@ -776,6 +1211,19 @@ bool FunctionalBlock::isValidDataGroup(const QMap<AbstractInterface *, QList<cha
   return false;\r
 }\r
 \r
   return false;\r
 }\r
 \r

+bool FunctionalBlock::isValidDataGroup(const QMap<AbstractInterface*, QList<char>* >& pattern, const QList<int> offsets) {\r
+  QMapIterator<AbstractInterface*, QList<char>* > iterSrc(pattern);\r
+  QListIterator<int> iterOffsets(offsets);\r
+  while (iterSrc.hasNext()) {\r
+    iterSrc.next();\r
+    int offset = iterOffsets.next();\r
+    QList<char>* srcPat = iterSrc.value();\r
+    if (offset >= srcPat->size()) return false;\r
+    if (srcPat->at(offset) == 1) return true;\r
+  }\r
+  return false;\r
+}\r
+\r

 bool FunctionalBlock::isOnlyXDataGroup(const QMap<AbstractInterface *, QList<char> *> &pattern, int offset) {\r
   QMapIterator<AbstractInterface*, QList<char>* > iterSrc(pattern);  \r
   while (iterSrc.hasNext()) {\r
 bool FunctionalBlock::isOnlyXDataGroup(const QMap<AbstractInterface *, QList<char> *> &pattern, int offset) {\r
   QMapIterator<AbstractInterface*, QList<char>* > iterSrc(pattern);  \r
   while (iterSrc.hasNext()) {\r


@@ -821,24 +1269,349 @@ void FunctionalBlock::clearInputPattern() {
   lengthIP = -1;\r
 }\r
 \r
   lengthIP = -1;\r
 }\r
 \r

-int FunctionalBlock::getNumberOfExecution() {\r
+void FunctionalBlock::clearOutputPattern() {\r
+\r
+  QMapIterator<AbstractInterface*,QList<char>* > iterO(outputPattern);\r
+  while (iterO.hasNext()) {\r
+    iterO.next();\r
+    ConnectedInterface* connIface = AI_TO_CON(iterO.key());\r
+    connIface->resetOutputPattern();\r
+    QList<char>* pattern = iterO.value();\r
+    if (pattern != NULL) delete pattern;\r
+  }\r
+  outputPattern.clear();\r
+  lengthOP = -1;\r
+}\r
+\r
+void FunctionalBlock::clearAdmittanceDelays() {\r
+  QMapIterator<AbstractInterface*, QList<int>* > iterA(admittanceDelays);\r
+  while (iterA.hasNext()) {\r
+    iterA.next();\r
+    QList<int>* d = iterA.value();\r
+    if (d != NULL) delete d;\r
+  }\r
+  admittanceDelays.clear();\r
+}\r
+\r
+int FunctionalBlock::createTriggers() {\r
+  triggers.clear();\r

   /* NB: this method returns the number of executions that have been started\r
      but not necessary completed.\r
   */\r
   /* NB: this method returns the number of executions that have been started\r
      but not necessary completed.\r
   */\r

-  if (delta <= 0) return 0;\r
-  int nbExec = 0;\r
+  if (delta <= 0) return 0;  \r

   int offset = 0;\r
   // search for the first exec.\r
   while ((offset < lengthIP) && (! isValidDataGroup(inputPattern,offset))) offset++;\r
   if (offset == lengthIP) return 0;\r
   int offset = 0;\r
   // search for the first exec.\r
   while ((offset < lengthIP) && (! isValidDataGroup(inputPattern,offset))) offset++;\r
   if (offset == lengthIP) return 0;\r

-  nbExec = 1;\r
+  triggers.append(offset);  \r

   int nbGroup = 0;\r
   for(int i = offset;i<lengthIP;i++) {\r
   int nbGroup = 0;\r
   for(int i = offset;i<lengthIP;i++) {\r

-    if (isValidDataGroup(inputPattern,offset)) nbGroup++;\r
+    if (isValidDataGroup(inputPattern,i)) nbGroup++;\r

     if (nbGroup == delta+1) {\r
     if (nbGroup == delta+1) {\r

-      nbExec += 1;\r
+      triggers.append(i);\r

       nbGroup = 1;\r
     }\r
   }      \r
       nbGroup = 1;\r
     }\r
   }      \r

-  return nbExec;  \r
+  return triggers.size();\r
+}\r
+\r
+void FunctionalBlock::generateVHDL(const QString& path) throw(Exception){\r
+    \r
+  BlockImplementation* impl = reference->getImplementations().at(0); // for now only take first impl available\r
+  QFile implFile(impl->getXmlFile());\r
+\r
+  // reading in into QDomDocument\r
+  QDomDocument document("implFile");\r
+\r
+  if (!implFile.open(QIODevice::ReadOnly)) {\r
+    throw(Exception(IMPLFILE_NOACCESS));\r
+  }\r
+  if (!document.setContent(&implFile)) {\r
+    implFile.close();\r
+    throw(Exception(IMPLFILE_NOACCESS));\r
+  }\r
+  implFile.close();\r
+\r
+  bool genController = false;\r
+  QString coreFile = "";\r
+  QString controllerFile = "";\r
+\r
+  if (reference->isWBConfigurable()) {\r
+    genController = true;\r
+    controllerFile = path;\r
+    controllerFile += "/";\r
+    controllerFile.append(name);\r
+    controllerFile.append("_ctrl.vhd");    \r
+  }\r
+  else {\r
+    controllerFile = "nofile.vhd";    \r
+  }\r
+  coreFile = path;\r
+  coreFile += "/";\r
+  coreFile.append(name);\r
+  coreFile.append(".vhd");\r
+\r
+  QFile vhdlCore(coreFile);\r
+  QFile vhdlController(controllerFile);\r
+\r
+  if (!vhdlCore.open(QIODevice::WriteOnly)) {\r
+    throw(Exception(VHDLFILE_NOACCESS));\r
+  }\r
+\r
+  if (genController) {\r
+    if (!vhdlController.open(QIODevice::WriteOnly)) {\r
+      throw(Exception(VHDLFILE_NOACCESS));\r
+    }\r
+  }\r
+  QTextStream outCore(&vhdlCore);\r
+  QTextStream outController;\r
+  if (genController) {\r
+    outController.setDevice(&vhdlController);\r
+  }\r
+\r
+  try {\r
+    //Get the root element\r
+    QDomElement impl = document.documentElement();\r
+    QDomElement eltComments = impl.firstChildElement("comments");\r
+    generateComments(outCore,eltComments, coreFile);\r
+    QDomElement eltLibs = eltComments.nextSiblingElement("libraries");\r
+    generateLibraries(outCore, eltLibs);\r
+    generateEntity(outCore, genController);\r
+    QDomElement eltArch = eltLibs.nextSiblingElement("architecture");\r
+    generateArchitecture(outCore, eltArch );\r
+    if (genController) {\r
+      generateController(outController);\r
+    }\r
+  }\r
+  catch(Exception err) {\r
+    throw(err);\r
+  }\r
+\r
+  vhdlCore.close();\r
+  vhdlController.close();\r
+  \r
+ }\r
+\r
+void FunctionalBlock::generateComments(QTextStream& out, QDomElement &elt, QString coreFile) throw(Exception) {\r
+\r
+  for(int i = 0; i < 50; i++) {\r
+    out << "--";\r
+  }\r
+  out << "\n--" << endl;\r
+  QString fileName = coreFile;\r
+  out << "--  File        : " << fileName << endl;\r
+  out << "--" << endl;\r
+  QDomElement eltAuthor = elt.firstChildElement("author");\r
+  QString firstName = eltAuthor.attribute("firstname","");\r
+  QString lastName = eltAuthor.attribute("lastname","");\r
+  QString mail = eltAuthor.attribute("mail","");\r
+  out << "--  Author(s)   : "<<firstName+" "<<lastName<<" ("<<mail<<")" << endl;\r
+  out << "--" << endl;\r
+  QDomElement eltDate = eltAuthor.nextSiblingElement("date");\r
+  QString crea = eltDate.attribute("creation","");\r
+  out << "--  Creation Date   : "<<crea<< endl;\r
+  out << "--" << endl;\r
+  QDomElement eltRelated = eltDate.nextSiblingElement("related_files");\r
+  QString relateds = eltRelated.attribute("list","");\r
+  out << "--  Related files   :\n"<<relateds<<endl;\r
+  out << "--" << endl;\r
+  QDomElement eltDesc = eltRelated.nextSiblingElement("description");\r
+  QDomElement desc = eltDesc.firstChildElement();\r
+  QString descTxt = desc.text();\r
+  out << "--  Decription      :\n"<<descTxt<<endl;\r
+  out << "--" << endl;\r
+  QDomElement eltNote = eltDesc.nextSiblingElement("description");\r
+  QDomElement note = eltNote.firstChildElement();\r
+  QString noteTxt = note.text();\r
+  out << "--  Note          :\n"<<noteTxt<<endl;\r
+  out << "--" << endl;\r
+  for(int i = 0; i < 50; i++) {\r
+    out << "--";\r
+  }\r
+  out << endl << endl;\r
+}\r
+\r
+void FunctionalBlock::generateLibraries(QTextStream& out, QDomElement &elt) throw(Exception) {\r
+  \r
+  QDomNodeList listLib = elt.elementsByTagName("library");\r
+  for(int i = 0; i < listLib.length(); i++) {\r
+    QDomNode nodeLib = listLib.item(i);\r
+    QDomElement eltLib = nodeLib.toElement();\r
+    QString nameLib = eltLib.attribute("name","none");\r
+    out << "library " << nameLib << ";" << endl;\r
+    QDomNodeList listPack = eltLib.elementsByTagName("package");\r
+    for(int j = 0; j < listPack.length(); j++) {\r
+      QDomNode nodePack = listPack.item(j);\r
+      QDomElement eltPack = nodePack.toElement();\r
+      QString namePack = eltPack.attribute("name","none");\r
+      QString usePack = eltPack.attribute("use","none");\r
+      out << "use " << nameLib << "." << namePack << "." << usePack << endl;\r
+    }\r
+    out << endl;\r
+  }\r
+}\r
+\r
+void FunctionalBlock::generateEntity(QTextStream& out, bool hasController) throw(Exception) {\r
+\r
+  int i=0;\r
+  \r
+  //QList<BlockParameter*> listParams = reference->getParameters();\r
+  QList<AbstractInterface*> listInputs = getInputs();\r
+  QList<AbstractInterface*> listOutputs = getOutputs();\r
+  QList<AbstractInterface*> listBidirs = getBidirs();\r
+  QString typePort, namePort;\r
+\r
+  out << "entity " << name << " is" << endl;\r
+\r
+\r
+  /* TODO : rewrite the generation to take into acocunt the new object hierarchy */\r
+\r
+  // Generation of the generics\r
+  QList<BlockParameter*> listGenerics = getGenericParameters();\r
+  if ((!listGenerics.isEmpty()) || (hasController)) {\r
+    out << "  generic (" << endl;\r
+    if (hasController) {\r
+      out << "    wb_data_width : integer = 16;" << endl;\r
+      out << "    wb_addr_width : integer = 12";\r
+      if (!listGenerics.isEmpty()) out << ";";\r
+      out << endl;\r
+    }\r
+    for(i=0;i<listGenerics.size()-1;i++) {\r
+      out << "    " << listGenerics.at(i)->toVHDL(BlockParameter::Entity, 0) << endl;\r
+    }\r
+    out << "    " << listGenerics.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;\r
+\r
+    out << "    );" << endl;\r
+  }\r
+\r
+  out << "  port (" << endl;\r
+\r
+  // Generation of the clk & rst signals\r
+  out << "    -- clk/rst" << endl;\r
+  foreach(AbstractInterface* iface, listInputs) {\r
+    if(iface->getPurpose() == AbstractInterface::Clock || iface->getPurpose() == AbstractInterface::Reset) {\r
+      out << "    " << iface->getName() << " : in std_logic;" << endl;\r
+    }\r
+  }\r
+\r
+  if (hasController) {\r
+    // Generation of the wishbone signals\r
+    out << "    -- registers r/w via wishbone" << endl;\r
+    QList<BlockParameter*> listWB = reference->getWishboneParameters();\r
+    for(i=0;i<listWB.size()-1;i++) {\r
+      out << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity, 0) << endl;\r
+    }\r
+    out << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;\r
+  }\r
+\r
+\r
+  int count = 0;\r
+  foreach(AbstractInterface* iface, getInterfaces()) {\r
+    if((iface->getPurpose() == AbstractInterface::Data)||(iface->getPurpose() == AbstractInterface::Control)) count++;\r
+  }\r
+  // Generation of the data/control signals\r
+\r
+  int flag = 0;\r
+  bool first = true;\r
+\r
+  foreach(AbstractInterface* iface, listInputs) {\r
+    if(iface->getPurpose() == AbstractInterface::Data) {\r
+      if (first) {\r
+        out << "    -- input data ports" << endl;\r
+        first = false;\r
+      }\r
+      count--;\r
+      if (count == 0) flag = AbstractInterface::NoComma;\r
+      out << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;\r
+    }\r
+  }\r
+  first = true;\r
+  foreach(AbstractInterface* iface, listInputs) {\r
+    if(iface->getPurpose() == AbstractInterface::Control) {\r
+      if (first) {\r
+        out << "    -- input control ports" << endl;\r
+        first = false;\r
+      }\r
+      count--;\r
+      if (count == 0) flag = AbstractInterface::NoComma;\r
+      out << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;\r
+    }\r
+  }\r
+  first = true;\r
+  foreach(AbstractInterface* iface, listOutputs) {\r
+    if(iface->getPurpose() == AbstractInterface::Data) {\r
+      if (first) {\r
+        out << "    -- output data ports" << endl;\r
+        first = false;\r
+      }\r
+      count--;\r
+      if (count == 0) flag = AbstractInterface::NoComma;\r
+      out << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;\r
+    }\r
+  }\r
+  first = true;\r
+  foreach(AbstractInterface* iface, listOutputs) {\r
+    if(iface->getPurpose() == AbstractInterface::Control) {\r
+      if (first) {\r
+        out << "    -- output control ports" << endl;\r
+        first = false;\r
+      }\r
+      count--;\r
+      if (count == 0) flag = AbstractInterface::NoComma;\r
+      out << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;\r
+    }\r
+  }\r
+  first = true;\r
+  foreach(AbstractInterface* iface, listBidirs) {\r
+    if(iface->getPurpose() == AbstractInterface::Data) {\r
+      if (first) {\r
+        out << "    -- bidirs data ports" << endl;\r
+        first = false;\r
+      }\r
+      count--;\r
+      if (count == 0) flag = AbstractInterface::NoComma;\r
+      out << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;\r
+    }\r
+  }\r
+  out << "    );" << endl << endl;\r
+  out << "end " << name << ";" << endl << endl;\r

 }\r
 }\r

+\r
+void FunctionalBlock::generateArchitecture(QTextStream& out, QDomElement &elt ) throw(Exception) {\r
+  QString expr;\r
+  QString code = elt.text();\r
+  cout << qPrintable(code) << endl;\r
+  out << "architecture rtl of " << name << " is" << endl;\r
+\r
+  QStringList listLine = code.split("\n");\r
+  for(int i =0; i < listLine.size(); i++) {\r
+    QString line = listLine.at(i).simplified();\r
+\r
+    /*\r
+    if(listLine.at(i).contains(QRegularExpression("@foreach{"))) {\r
+      while(listLine.at(i).compare("@endforeach") != -1) {\r
+        expr = expr + listLine.at(i) + '\n';\r
+        i++;\r
+      }\r
+      expr = expr + listLine.at(i);\r
+      out << evalComplex(expr, 1) << '\n';\r
+    }\r
+    if(listLine.at(i).contains(QRegularExpression("@caseeach{"))) {\r
+      while(listLine.at(i).compare("@endcaseeach") != -1) {\r
+        expr = expr + listLine.at(i) + '\n';\r
+        i++;\r
+      }\r
+      expr = expr + listLine.at(i);\r
+      out << evalComplex(expr, 2) << '\n';\r
+    }\r
+*/\r
+    if(line.contains("@{")) {\r
+      out << line << endl;\r
+    }\r
+  }\r
+}\r
+\r
+void FunctionalBlock::generateController(QTextStream &out) throw(Exception) {\r
+  \r
+}\r
+\r