changes in output pattern comput

[blast.git] / GroupBlock.cpp

diff --git a/GroupBlock.cpp b/GroupBlock.cpp
index 1b307da2445350211fc6ad5f85b4cdf106144571..62fd6ec8c813599c568d8c928b901f7ffc6e5aba 100644 (file)
--- a/GroupBlock.cpp
+++ b/GroupBlock.cpp
@@ -113,12 +113,10 @@ void GroupBlock::createInputPattern() {
   }  
 }
 
   }  
 }
 

-bool GroupBlock::checkInputPatternCompatibility() {
-  return true;
- 
+void GroupBlock::checkInputPatternCompatibility() throw(Exception){  

 }
 
 }
 

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

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


@@ -127,8 +125,7 @@ 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 = false;
-  bool compatible = false;
+  bool canCompute = false;  

   // get the input pattern on each inputs
   createInputPattern();
   
   // get the input pattern on each inputs
   createInputPattern();
   


@@ -166,16 +163,22 @@ bool GroupBlock::computeOutputPattern(int nbExec) {
     
     if (block->getPatternComputed()) continue; // block has already been processed
     
     
     if (block->getPatternComputed()) continue; // block has already been processed
     

-    compatible = block->checkInputPatternCompatibility();
-    if (!compatible) {
+    try {
+      block->checkInputPatternCompatibility();
+    }
+    catch(Exception e) {

       cout << qPrintable(block->getName()) << " is not compatible with his input pattern" << endl;
       cout << qPrintable(block->getName()) << " is not compatible with his input pattern" << endl;

-      break;
+      throw(e);
+    }    
+    
+    try {
+      block->computeOutputPattern();

     }
     }

-    canCompute = block->computeOutputPattern();
-    if (!canCompute) {
+    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()) {


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

-  }
-  return canCompute;
+  }  

 }
 }