added admittance computation

[blast.git] / GroupBlock.cpp

diff --git a/GroupBlock.cpp b/GroupBlock.cpp
index 716cea644ec148c3ced17883a9d132c2e7785199..2fc3012e62de0bf99d6dbec772df571170df530d 100644 (file)
--- a/GroupBlock.cpp
+++ b/GroupBlock.cpp
@@ -1,6 +1,7 @@
 #include "GroupBlock.h"
 #include "BlockParameterGeneric.h"
 #include "AbstractInterface.h"
 #include "GroupBlock.h"
 #include "BlockParameterGeneric.h"
 #include "AbstractInterface.h"

+#include "ConnectedInterface.h"

 #include "string.h"
 #include <sstream>
 
 #include "string.h"
 #include <sstream>
 


@@ -106,17 +107,89 @@ 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);    

   }  
 }
 
   }  
 }
 

-void 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();
   // get the input pattern on each inputs
   initInputPattern();

-  // find blocks that are connected to that inputs

   
   

-  foreach(AbstractInterface* iface, getControlOutputs()) {
-    iface->setOutputPattern(iface->getConnectedFrom()->getOutputPattern());    
+  cout << "Input pattern OK" << endl;
+  // 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()) {
+      if (block->getControlOutputs().size() > 0) addIt = true;
+    }
+    else {
+      // if the block has a control input connected from an intput of the group, add it too
+      foreach(AbstractInterface* iface, block->getControlInputs()) {
+        //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;
+        }
+      }
+    }
+    if (addIt) {
+      cout << "adding " << qPrintable(block->getName()) << " to initialize the FIFO" << endl;
+      fifo.append(block);    
+    }
+  }
+  
+  while (!fifo.isEmpty()) {
+    AbstractBlock* block = fifo.takeFirst();
+    
+    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;
+      break;
+    }
+    block->setPatternComputed(true);
+    // add other blocks connected from block to the fifo
+    foreach(AbstractInterface* iface, block->getControlOutputs()) {
+      ConnectedInterface* conn = (ConnectedInterface*)iface;
+      foreach(ConnectedInterface* connTo, conn->getConnectedTo()) {
+        /* if connTo is owned by a functional block
+           or by a group block that is within this, add the block to the fifo.
+         */
+        if (connTo->getOwner()->isFunctionalBlock()) {
+          fifo.append(connTo->getOwner());
+        }
+        else if (connTo->getOwner() != this) {
+          fifo.append(connTo->getOwner());
+        }      
+      }
+    }
+  }
+  
+  if (canCompute) {
+    foreach(AbstractInterface* iface, getControlOutputs()) {
+      ConnectedInterface* connIface = AI_TO_CON(iface);
+      QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));
+      connIface->setOutputPattern(pattern);    
+    }
+    setPatternComputed(true);

   }
   }

+  return canCompute;

 }
 }