started top group gen, added project subdirs

[blast.git] / Graph.cpp

diff --git a/Graph.cpp b/Graph.cpp
index 999e72aa375fc4d4d2a1c0a7a198057a3646deed..5b491b07ea15c5cd24d06daff89e90ff1bc814fa 100644 (file)
--- a/Graph.cpp
+++ b/Graph.cpp
@@ -24,7 +24,7 @@ GroupBlock* Graph::createChildGroupBlock(GroupBlock* parent) {
   return b;
 }
 
   return b;
 }
 

-bool Graph::removeGroupBlock(GroupBlock *group) {
+void Graph::removeGroupBlock(GroupBlock *group) {

   group->removeAllBlocks();
   GroupBlock* parent = AB_TO_GRP(group->getParent());
   parent->removeBlock(group);
   group->removeAllBlocks();
   GroupBlock* parent = AB_TO_GRP(group->getParent());
   parent->removeBlock(group);


@@ -88,8 +88,7 @@ FunctionalBlock* Graph::createSourceBlock(ReferenceBlock* ref) {
 
 FunctionalBlock* Graph::duplicateSourceBlock(FunctionalBlock *block) {
 
 
 FunctionalBlock* Graph::duplicateSourceBlock(FunctionalBlock *block) {
 

-  ReferenceBlock* ref = block->getReference();
-  GroupBlock* group = AB_TO_GRP(block->getParent());
+  ReferenceBlock* ref = block->getReference();  

 
   // adding to the graph
   FunctionalBlock* newBlock = createSourceBlock(ref);
 
   // adding to the graph
   FunctionalBlock* newBlock = createSourceBlock(ref);


@@ -108,12 +107,16 @@ bool Graph::removeSourceBlock(FunctionalBlock *block) {
   return true;
 }
 
   return true;
 }
 

-bool Graph::createPatterns() {
-  bool ok = true;
+void Graph::createPatterns() throw(Exception) {
+  

   foreach(AbstractBlock* block, sources) {
     FunctionalBlock* funBlock = AB_TO_FUN(block);
   foreach(AbstractBlock* block, sources) {
     FunctionalBlock* funBlock = AB_TO_FUN(block);

-    ok = funBlock->createPatterns();
-    if (!ok) return false;
+    try {
+      funBlock->createPatterns();
+    }
+    catch(Exception e) {
+      throw(e);      
+    }

   }
   
   foreach(AbstractBlock* block, groups) {
   }
   
   foreach(AbstractBlock* block, groups) {


@@ -121,31 +124,43 @@ bool Graph::createPatterns() {
     foreach(AbstractBlock* inBlock, group->getBlocks()) {
       if (inBlock->isFunctionalBlock()) {
         FunctionalBlock* funBlock = AB_TO_FUN(inBlock);
     foreach(AbstractBlock* inBlock, group->getBlocks()) {
       if (inBlock->isFunctionalBlock()) {
         FunctionalBlock* funBlock = AB_TO_FUN(inBlock);

-        ok = funBlock->createPatterns();
-        if (!ok) return false;
+        try {
+          funBlock->createPatterns();
+        }
+        catch(Exception e) {
+          throw(e);
+        }

       }
     }
       }
     }

-  }
-  return true;
+  }  

 }
 
 void Graph::resetPatternComputed() {
   foreach(AbstractBlock* block, sources) {
     block->setPatternComputed(false);
 }
 
 void Graph::resetPatternComputed() {
   foreach(AbstractBlock* block, sources) {
     block->setPatternComputed(false);

+    block->resetTraversalLevel();

   }
   foreach(AbstractBlock* block, groups) {
     GroupBlock* group = AB_TO_GRP(block);
     group->setPatternComputed(false);
   }
   foreach(AbstractBlock* block, groups) {
     GroupBlock* group = AB_TO_GRP(block);
     group->setPatternComputed(false);

+    block->resetTraversalLevel();

     foreach(AbstractBlock* inBlock, group->getBlocks()) {
       inBlock->setPatternComputed(false);
     foreach(AbstractBlock* inBlock, group->getBlocks()) {
       inBlock->setPatternComputed(false);

+      block->resetTraversalLevel();

     }
   }
 }
 
     }
   }
 }
 

-bool Graph::computeOutputPatterns(int nbExec) {
+void Graph::computeOutputPatterns(int nbExec) throw(Exception) {

   
   

-  createPatterns();
-  resetPatternComputed();  
+  try {
+    createPatterns();
+  }
+  catch(Exception e) {
+    throw(e);    
+  }
+
+  resetPatternComputed();

   // search for all block that are generators.
   QList<FunctionalBlock*> generators;
   generators.append(sources);
   // search for all block that are generators.
   QList<FunctionalBlock*> generators;
   generators.append(sources);


@@ -158,17 +173,31 @@ 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

-  topGroup->computeOutputPattern();
+  try {
+    topGroup->computeOutputPattern();
+  }
+  catch(Exception e) {
+    throw(e);
+  }
+}
+
+void Graph::generateVHDL(const QString &path) throw(Exception) {
+  try {
+    topGroup->generateVHDL(path);
+  }
+  catch(Exception e) {
+    throw(e);
+  }

 }
 }