Fix for #2947:

- Optimized usage of BackendDAE.VARIABLES in the backend to improve performance. - Some cleaning up. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23275 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 7, 2014 · 89f0013 · 89f0013
1 parent da98a1f
commit 89f0013
Show file tree

Hide file tree

Showing 16 changed files with 1,054 additions and 1,736 deletions.
diff --git a/Compiler/BackEnd/BackendDAE.mo b/Compiler/BackEnd/BackendDAE.mo
@@ -151,7 +151,7 @@ end BackendDAEType;
 public
 uniontype Variables
   record VARIABLES
-    array<list<CrefIndex>> crefIdxLstArr "HashTB, cref->indx";
+    array<list<CrefIndex>> crefIndices "HashTB, cref->indx";
     VariableArray varArr "Array of variables";
     Integer bucketSize "bucket size";
     Integer numberOfVars "no. of vars";

diff --git a/Compiler/BackEnd/BackendDAECreate.mo b/Compiler/BackEnd/BackendDAECreate.mo
diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -1892,7 +1892,7 @@ protected
 algorithm
   BackendDAE.EQSYSTEM(orderedVars=vars1, orderedEqs=eqs1, stateSets=stateSets) := syst1;
   BackendDAE.EQSYSTEM(orderedVars=vars2, orderedEqs=eqs2, stateSets=statSets1) := syst2;
-  vars := BackendVariable.addVars(BackendVariable.varList(vars2), vars1);
+  vars := BackendVariable.mergeVariables(vars2, vars1);
   eqs := BackendEquation.addEquations(BackendEquation.equationList(eqs2), eqs1);
   stateSets := listAppend(stateSets, statSets1);
   syst := BackendDAE.EQSYSTEM(vars, eqs, NONE(), NONE(), BackendDAE.NO_MATCHING(), stateSets, BackendDAE.UNKNOWN_PARTITION());