changes in output pattern comput

[blast.git] / GroupBlock.cpp

diff --git a/GroupBlock.cpp b/GroupBlock.cpp
index 2fc3012e62de0bf99d6dbec772df571170df530d..62fd6ec8c813599c568d8c928b901f7ffc6e5aba 100644 (file)
--- a/GroupBlock.cpp
+++ b/GroupBlock.cpp
@@ -105,7 +105,7 @@ void GroupBlock::removeGenericParameter(QString name) {
   if (p != NULL) params.removeAll(p);
 }
 
   if (p != NULL) params.removeAll(p);
 }
 

-void GroupBlock::initInputPattern() {
+void GroupBlock::createInputPattern() {

   foreach(AbstractInterface* iface, getControlInputs()) {
     ConnectedInterface* connIface = AI_TO_CON(iface);
     QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));    
   foreach(AbstractInterface* iface, getControlInputs()) {
     ConnectedInterface* connIface = AI_TO_CON(iface);
     QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));    


@@ -113,7 +113,10 @@ void GroupBlock::initInputPattern() {
   }  
 }
 
   }  
 }
 

-bool GroupBlock::computeOutputPattern(int nbExec) {
+void GroupBlock::checkInputPatternCompatibility() throw(Exception){  
+}
+
+void GroupBlock::computeOutputPattern(int nbExec) throw(Exception) {

 
   static QString fctName = "GroupBlock::computeOutputPattern()";
 #ifdef DEBUG_FCTNAME
 
   static QString fctName = "GroupBlock::computeOutputPattern()";
 #ifdef DEBUG_FCTNAME


@@ -122,9 +125,9 @@ bool GroupBlock::computeOutputPattern(int nbExec) {
 
   cout << "computing output pattern of group " << qPrintable(name) << endl;
   
 
   cout << "computing output pattern of group " << qPrintable(name) << endl;
   

-  bool canCompute = true;
+  bool canCompute = false;  

   // get the input pattern on each inputs
   // get the input pattern on each inputs

-  initInputPattern();
+  createInputPattern();

   
   cout << "Input pattern OK" << endl;
   // find blocks that are connected to that inputs and generators
   
   cout << "Input pattern OK" << endl;
   // find blocks that are connected to that inputs and generators


@@ -158,13 +161,24 @@ bool GroupBlock::computeOutputPattern(int nbExec) {
   while (!fifo.isEmpty()) {
     AbstractBlock* block = fifo.takeFirst();
     
   while (!fifo.isEmpty()) {
     AbstractBlock* block = fifo.takeFirst();
     

-    if (block->getPatternComputed()) continue; // block has laready been processed
-        
-    canCompute = block->computeOutputPattern();
-    if (!canCompute) {
+    if (block->getPatternComputed()) continue; // block has already been processed
+    
+    try {
+      block->checkInputPatternCompatibility();
+    }
+    catch(Exception e) {
+      cout << qPrintable(block->getName()) << " is not compatible with his input pattern" << endl;
+      throw(e);
+    }    
+    
+    try {
+      block->computeOutputPattern();
+    }
+    catch(Exception e) {    

       cout << "cannot finalize output pattern computation of " << qPrintable(block->getName()) << endl;
       cout << "cannot finalize output pattern computation of " << qPrintable(block->getName()) << endl;

-      break;
+      throw(e);      

     }
     }

+    canCompute = true;

     block->setPatternComputed(true);
     // add other blocks connected from block to the fifo
     foreach(AbstractInterface* iface, block->getControlOutputs()) {
     block->setPatternComputed(true);
     // add other blocks connected from block to the fifo
     foreach(AbstractInterface* iface, block->getControlOutputs()) {


@@ -190,6 +204,5 @@ bool GroupBlock::computeOutputPattern(int nbExec) {
       connIface->setOutputPattern(pattern);    
     }
     setPatternComputed(true);
       connIface->setOutputPattern(pattern);    
     }
     setPatternComputed(true);

-  }
-  return canCompute;
+  }  

 }
 }