- activate mergeSingleNodes

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21215 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 20, 2014 · 117a1c8 · 117a1c8
1 parent 1b1bac4
commit 117a1c8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Compiler/BackEnd/HpcOmSimCodeMain.mo b/Compiler/BackEnd/HpcOmSimCodeMain.mo
@@ -384,8 +384,7 @@ algorithm
         taskGraphMeta1 = HpcOmTaskGraph.copyTaskGraphMeta(iTaskGraphMeta);
         (taskGraph1,taskGraphMeta1,changed1) = HpcOmTaskGraph.mergeSimpleNodes(taskGraph1,taskGraphMeta1,inBackendDAE);
         (taskGraph1,taskGraphMeta1,changed2) = HpcOmTaskGraph.mergeParentNodes(taskGraph1, taskGraphMeta1);
-        //(taskGraph1,taskGraphMeta1,changed3) = HpcOmTaskGraph.mergeSingleNodes(taskGraph1, taskGraphMeta1);
-        changed3 = false;
+        (taskGraph1,taskGraphMeta1,changed3) = HpcOmTaskGraph.mergeSingleNodes(taskGraph1, taskGraphMeta1);
 
         (taskGraph1,taskGraphMeta1) = applyFiltersToGraph(taskGraph1,taskGraphMeta1,inBackendDAE,changed1 or changed2 or changed3);
       then (taskGraph1,taskGraphMeta1);

diff --git a/Compiler/BackEnd/HpcOmTaskGraph.mo b/Compiler/BackEnd/HpcOmTaskGraph.mo
@@ -2959,7 +2959,6 @@ algorithm
 end printCriticalPathInfo1;
 
 
-
 // functions to merge single nodes
 //------------------------------------------
 //------------------------------------------
@@ -2979,8 +2978,6 @@ protected
   array<list<Integer>> cluster;
   TaskGraph taskGraphT;
 algorithm
-  printTaskGraph(iTaskGraph);
-  printTaskGraphMeta(iTaskGraphMeta);
   numProc := Flags.getConfigInt(Flags.NUM_PROC);
   taskGraphT := BackendDAEUtil.transposeMatrix(iTaskGraph,arrayLength(iTaskGraph));
   //get the single nodes, sort them according to their exeCosts in decreasing order