Remove FindZeroCrossings getters functions

OpenModelica · Jul 10, 2015 · 9116d28 · 9116d28
1 parent e728806
commit 9116d28
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 37 deletions.
diff --git a/Compiler/BackEnd/FindZeroCrossings.mo b/Compiler/BackEnd/FindZeroCrossings.mo
@@ -58,33 +58,6 @@ protected import HashTableExpToIndex;
 protected import List;
 protected import Util;
 
-// =============================================================================
-// section for some public util functions
-//
-// =============================================================================
-
-public function getZeroCrossings
-  input BackendDAE.BackendDAE inBackendDAE;
-  output list<BackendDAE.ZeroCrossing> outZeroCrossingList;
-algorithm
-  BackendDAE.DAE(shared=BackendDAE.SHARED(eventInfo=BackendDAE.EVENT_INFO(zeroCrossingLst=outZeroCrossingList))) := inBackendDAE;
-end getZeroCrossings;
-
-public function getRelations
-  input BackendDAE.BackendDAE inBackendDAE;
-  output list<BackendDAE.ZeroCrossing> outZeroCrossingList;
-algorithm
-  BackendDAE.DAE(shared=BackendDAE.SHARED(eventInfo=BackendDAE.EVENT_INFO(relationsLst=outZeroCrossingList))) := inBackendDAE;
-end getRelations;
-
-public function getSamples "deprecated - use EVENT_INFO.timeEvents instead"
-  input BackendDAE.BackendDAE inBackendDAE;
-  output list<BackendDAE.ZeroCrossing> outZeroCrossingList;
-algorithm
-  BackendDAE.DAE(shared=BackendDAE.SHARED(eventInfo=BackendDAE.EVENT_INFO(sampleLst=outZeroCrossingList))) := inBackendDAE;
-end getSamples;
-
-
 // =============================================================================
 // section for preOptModule >>encapsulateWhenConditions<<
 //

diff --git a/Compiler/SimCode/SimCodeUtil.mo b/Compiler/SimCode/SimCodeUtil.mo
@@ -163,7 +163,6 @@ public function createSimCode "entry point to create SimCode from BackendDAE."
 protected
   BackendDAE.BackendDAE dlow;
   BackendDAE.BackendDAE initDAE;
-  BackendDAE.EqSystems systs;
   BackendDAE.EquationArray removedEqs;
   BackendDAE.Shared shared;
   BackendDAE.SymbolicJacobians symJacs;
@@ -215,6 +214,7 @@ protected
   list<list<SimCode.SimEqSystem>> odeEquations;         // --> functionODE
   list<tuple<Integer, tuple<DAE.Exp, DAE.Exp, DAE.Exp>>> delayedExps;
   list<tuple<Integer,Integer>> equationSccMapping, eqBackendSimCodeMapping;
+  BackendDAE.EventInfo eventInfo;
 algorithm
   try
     dlow := inBackendDAE;
@@ -258,19 +258,20 @@ algorithm
     dlow := BackendDAEOptimize.addInitialStmtsToAlgorithms(dlow);
 
     BackendDAE.DAE(shared=shared as BackendDAE.SHARED(knownVars=knownVars,
-                                                      removedEqs=removedEqs,
                                                       constraints=constraints,
                                                       classAttrs=classAttributes,
+                                                      removedEqs=removedEqs,
                                                       symjacs=symJacs,
                                                       partitionsInfo=BackendDAE.PARTITIONS_INFO(baseClocks),
-                                                      eventInfo=BackendDAE.EVENT_INFO(timeEvents=timeEvents))) := dlow;
-
-    // created event suff e.g. zeroCrossings, samples, ...
-    whenClauses := createSimWhenClauses(dlow);
-    zeroCrossings := if ifcpp then FindZeroCrossings.getRelations(dlow) else FindZeroCrossings.getZeroCrossings(dlow);
-    relations := FindZeroCrossings.getRelations(dlow);
-    sampleZC := FindZeroCrossings.getSamples(dlow);
-    zeroCrossings := if ifcpp then listAppend(zeroCrossings, sampleZC) else zeroCrossings;
+                                                      eventInfo=eventInfo)) := dlow;
+
+ // created event suff e.g. zeroCrossings, samples, ...
+      timeEvents := eventInfo.timeEvents;
+      whenClauses := createSimWhenClauses(dlow);
+      zeroCrossings := if ifcpp then eventInfo.relationsLst else eventInfo.zeroCrossingLst;
+      relations := eventInfo.relationsLst;
+      sampleZC := eventInfo.sampleLst;
+      zeroCrossings := if ifcpp then listAppend(zeroCrossings, sampleZC) else zeroCrossings;
 
     // equation generation for euler, dassl2, rungekutta
     ( uniqueEqIndex, odeEquations, algebraicEquations, allEquations, equationsForZeroCrossings, tempvars,