added admittance computation

[blast.git] / Graph.cpp

diff --git a/Graph.cpp b/Graph.cpp
index 999e72aa375fc4d4d2a1c0a7a198057a3646deed..eb66dc4e8ad8b7cc35cb76108b78c06f9b0738c4 100644 (file)
--- a/Graph.cpp
+++ b/Graph.cpp
@@ -158,15 +158,15 @@ bool Graph::computeOutputPatterns(int nbExec) {
       }
     }    
   }
       }
     }    
   }

-  // search for maximum delta
-  int maxDelta = 0;
+  // search for maximum PP length
+  int maxPP = 0;

   foreach(FunctionalBlock* block, generators) {    
   foreach(FunctionalBlock* block, generators) {    

-    if (block->getDelta() > maxDelta) maxDelta = block->getDelta();
+    if (block->getProductionPatternLength() > maxPP) maxPP = block->getProductionPatternLength();

   }
   // compute output for generators
   }
   // compute output for generators

-  int maxExecLen = maxDelta*nbExec;
+  int maxExecLen = maxPP*nbExec;

   foreach(FunctionalBlock* block, generators) {    
   foreach(FunctionalBlock* block, generators) {    

-    int d = block->getDelta();
+    int d = block->getProductionPatternLength();

     block->computeOutputPattern((maxExecLen+d-1)/d);
   }
   // compute output for top group
     block->computeOutputPattern((maxExecLen+d-1)/d);
   }
   // compute output for top group