added admittance computation

[blast.git] / GroupBlock.cpp

diff --git a/GroupBlock.cpp b/GroupBlock.cpp
index a8a06e641a7156b93de9de6ae52fbbaafb47b78e..2fc3012e62de0bf99d6dbec772df571170df530d 100644 (file)
--- a/GroupBlock.cpp
+++ b/GroupBlock.cpp
@@ -107,20 +107,30 @@ void GroupBlock::removeGenericParameter(QString name) {
 
 void GroupBlock::initInputPattern() {
   foreach(AbstractInterface* iface, getControlInputs()) {
 
 void GroupBlock::initInputPattern() {
   foreach(AbstractInterface* iface, getControlInputs()) {

-    iface->setOutputPattern(iface->getConnectedFrom()->getOutputPattern());    
+    ConnectedInterface* connIface = AI_TO_CON(iface);
+    QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));    
+    connIface->setOutputPattern(pattern);    

   }  
 }
 
 bool GroupBlock::computeOutputPattern(int nbExec) {
   }  
 }
 
 bool GroupBlock::computeOutputPattern(int nbExec) {

+
+  static QString fctName = "GroupBlock::computeOutputPattern()";
+#ifdef DEBUG_FCTNAME
+  cout << "call to " << qPrintable(fctName) << endl;
+#endif
+
+  cout << "computing output pattern of group " << qPrintable(name) << endl;

   
   bool canCompute = true;
   // get the input pattern on each inputs
   initInputPattern();
   
   
   bool canCompute = true;
   // get the input pattern on each inputs
   initInputPattern();
   

+  cout << "Input pattern OK" << endl;

   // find blocks that are connected to that inputs and generators
   QList<AbstractBlock*> fifo;
   foreach(AbstractBlock* block, blocks) {
   // find blocks that are connected to that inputs and generators
   QList<AbstractBlock*> fifo;
   foreach(AbstractBlock* block, blocks) {

-    
+        

     bool addIt = false;
     // if a block is a generator and has control outputs, add it
     if (block->isGeneratorBlock()) {
     bool addIt = false;
     // if a block is a generator and has control outputs, add it
     if (block->isGeneratorBlock()) {


@@ -129,19 +139,27 @@ bool GroupBlock::computeOutputPattern(int nbExec) {
     else {
       // if the block has a control input connected from an intput of the group, add it too
       foreach(AbstractInterface* iface, block->getControlInputs()) {
     else {
       // if the block has a control input connected from an intput of the group, add it too
       foreach(AbstractInterface* iface, block->getControlInputs()) {

-        ConnectedInterface* conn = (ConnectedInterface*)iface;
-        ConnectedInterface* groupIface = conn->getConnectionFromParentGroup();
-        if (groupIface != NULL) {
+        //cout << qPrintable(iface->getName()) << " of " << qPrintable(iface->getOwner()->getName()) << " connected to " << endl;       
+        ConnectedInterface* connFrom = ((ConnectedInterface*)iface)->getConnectedFrom();
+        //cout << qPrintable(connFrom->getName()) << " of " << qPrintable(connFrom->getOwner()->getName()) << endl;
+        
+        if (connFrom->getOwner() == this) {

           addIt = true;
           break;
         }
       }
     }
           addIt = true;
           break;
         }
       }
     }

-    if (addIt) fifo.append(block);    
+    if (addIt) {
+      cout << "adding " << qPrintable(block->getName()) << " to initialize the FIFO" << endl;
+      fifo.append(block);    
+    }

   }
   }

+  

   while (!fifo.isEmpty()) {
     AbstractBlock* block = fifo.takeFirst();
   while (!fifo.isEmpty()) {
     AbstractBlock* block = fifo.takeFirst();

-    cout << "computing pattern for " << qPrintable(block->getName()) << endl;
+    
+    if (block->getPatternComputed()) continue; // block has laready been processed
+        

     canCompute = block->computeOutputPattern();
     if (!canCompute) {
       cout << "cannot finalize output pattern computation of " << qPrintable(block->getName()) << endl;
     canCompute = block->computeOutputPattern();
     if (!canCompute) {
       cout << "cannot finalize output pattern computation of " << qPrintable(block->getName()) << endl;


@@ -167,7 +185,9 @@ bool GroupBlock::computeOutputPattern(int nbExec) {
   
   if (canCompute) {
     foreach(AbstractInterface* iface, getControlOutputs()) {
   
   if (canCompute) {
     foreach(AbstractInterface* iface, getControlOutputs()) {

-      iface->setOutputPattern(iface->getConnectedFrom()->getOutputPattern());    
+      ConnectedInterface* connIface = AI_TO_CON(iface);
+      QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));
+      connIface->setOutputPattern(pattern);    

     }
     setPatternComputed(true);
   }
     }
     setPatternComputed(true);
   }