- add flag to run OnRelaxation

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14897 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 23, 2013 · d7ec12f · d7ec12f
1 parent 90674b3
commit d7ec12f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Compiler/BackEnd/OnRelaxation.mo b/Compiler/BackEnd/OnRelaxation.mo
@@ -54,6 +54,7 @@ protected import Derive;
 protected import Expression;
 protected import ExpressionDump;
 protected import ExpressionSimplify;
+protected import Flags;
 protected import HashSet;
 protected import HashTable4;
 protected import IndexReduction;
@@ -73,7 +74,15 @@ public function relaxSystem
   input BackendDAE.BackendDAE inDAE;
   output BackendDAE.BackendDAE outDAE;
 algorithm
-  (outDAE,_) := BackendDAEUtil.mapEqSystemAndFold(inDAE,relaxSystem0,false);
+  outDAE := matchcontinue(inDAE)
+    case (_)
+      equation
+        true = Flags.isSet(Flags.ON_RELAXATION);
+        (outDAE,_) = BackendDAEUtil.mapEqSystemAndFold(inDAE, relaxSystem0, false);
+      then
+        outDAE;
+    else then inDAE;
+end matchcontinue;
 end relaxSystem;
 
 protected function relaxSystem0

diff --git a/Compiler/Util/Flags.mo b/Compiler/Util/Flags.mo
@@ -395,6 +395,8 @@ constant DebugFlag DUMP_INLINE_SOLVER = DEBUG_FLAG(114, "dumpInlineSolver",
     Util.gettext("dumps the inline solver equation system"));
 constant DebugFlag DUMP_ENCAPSULATEWHENCONDITIONS = DEBUG_FLAG(115, "dumpEncapsulateWhenConditions",
   Util.gettext("Dumps the results of the preOptModule encapsulateWhenConditions"));
+constant DebugFlag ON_RELAXATION = DEBUG_FLAG(116, "onRelaxation",
+    Util.gettext("perform O(n) Relaxation"));
 
 // This is a list of all debug flags, to keep track of which flags are used. A
 // flag can not be used unless it's in this list, and the list is checked at
@@ -515,7 +517,8 @@ constant list<DebugFlag> allDebugFlags = {
   NLS_ANALYTIC_JACOBIAN,
   INLINE_SOLVER,
   DUMP_INLINE_SOLVER,
-  DUMP_ENCAPSULATEWHENCONDITIONS
+  DUMP_ENCAPSULATEWHENCONDITIONS,
+  ON_RELAXATION
 };
 
 // CONFIGURATION FLAGS
@@ -628,7 +631,7 @@ constant ConfigFlag INDEX_REDUCTION_METHOD = CONFIG_FLAG(15, "indexReductionMeth
     Util.gettext("Sets the index reduction method to use. See +help=optmodules for more info."));
 constant ConfigFlag POST_OPT_MODULES = CONFIG_FLAG(16, "postOptModules",
   NONE(), EXTERNAL(), STRING_LIST_FLAG({
-//    "relaxSystem",
+    "relaxSystem",
     "removeFinalParameters",
     "removeevaluateParameters",
     "inlineArrayEqn",
@@ -643,7 +646,6 @@ constant ConfigFlag POST_OPT_MODULES = CONFIG_FLAG(16, "postOptModules",
     "detectJacobianSparsePattern",
 //    "generateSymbolicJacobian",
     "removeConstants"
-//    "optimizeInitialSystem"
 //    "partitionIndependentBlocks"
   }),
   SOME(STRING_DESC_OPTION({