Added new backend module "simplifyAllExpressions"

OpenModelica · Sep 22, 2015 · 2d2c6ee · 2d2c6ee
1 parent d98c6e1
commit 2d2c6ee
Show file tree

Hide file tree

Showing 6 changed files with 563 additions and 3 deletions.
diff --git a/openmodelica/cruntime/xmlFiles/testxmlInfoAllEqnsCorrectOrder.mos b/openmodelica/cruntime/xmlFiles/testxmlInfoAllEqnsCorrectOrder.mos
@@ -633,7 +633,7 @@ readFile("testModel_info.xml");getErrorString();
 //       <depends name=\"b\" />
 //       <depends name=\"s\" />
 //       <depends name=\"a\" />
-//       <rhs>DIVISION((-a) * s, b)</rhs>
+//       <rhs>(-a) * DIVISION(s, b)</rhs>
 //     </assign>
 //     <source>
 //       <info file=\"&lt;interactive&gt;\" lineStart=\"15\" lineEnd=\"15\" colStart=\"3\" colEnd=\"12\"/>

diff --git a/openmodelica/debugDumps/lateInline.mos b/openmodelica/debugDumps/lateInline.mos
@@ -2382,6 +2382,97 @@ buildModel(testOptdaedump); getErrorString();
 // Sub partitions (0)
 // ========================================
 //
+//
+// post-optimization module simplifyAllExpressions (initialization):
+//
+//
+// unknown partition
+// ========================================
+//
+// Variables (2)
+// ========================================
+// 1: y:VARIABLE() .testOptdaedump, .Real type: Real
+// 2: x:VARIABLE() .testOptdaedump, .Real type: Real
+//
+//
+// Equations (2, 2)
+// ========================================
+// 1/1 (1): y = exp(time ^ 3.0) + x    [binding]
+// 2/2 (1): x = time ^ 3.0 + exp(time ^ 3.0)    [binding]
+//
+//
+// Simple Equations (0, 0)
+// ========================================
+//
+//
+// State Sets
+// ========================================
+//
+//
+// Matching
+// ========================================
+// 2 variables and equations
+// var 1 is solved in eqn 1
+// var 2 is solved in eqn 2
+//
+//
+// StrongComponents
+// ========================================
+// {2:2}
+// {1:1}
+//
+//
+//
+// BackendDAEType: initialization
+//
+//
+// Known Variables (constants) (0)
+// ========================================
+//
+//
+// External Objects (0)
+// ========================================
+//
+//
+// Classes of External Objects (0)
+// ========================================
+//
+//
+// Alias Variables (0)
+// ========================================
+//
+//
+// Simple Shared Equations (0, 0)
+// ========================================
+//
+//
+// Initial Equations (0, 0)
+// ========================================
+//
+//
+// Zero Crossings (0)
+// ========================================
+//
+//
+// Relations (0)
+// ========================================
+//
+//
+// Time Events (0)
+// ========================================
+//
+//
+// Constraints (0)
+// ========================================
+//
+//
+// Base partitions (0)
+// ========================================
+//
+//
+// Sub partitions (0)
+// ========================================
+//
 // post-optimization done.
 //
 // post-optimization module lateInlineFunction (simulation):
@@ -5131,6 +5222,101 @@ buildModel(testOptdaedump); getErrorString();
 // ========================================
 //
 //
+// post-optimization module simplifyAllExpressions (simulation):
+//
+//
+// unspecified partition
+// ========================================
+//
+// Variables (3)
+// ========================================
+// 1: y:VARIABLE() .testOptdaedump, .Real type: Real
+// 2: x:VARIABLE() .testOptdaedump, .Real type: Real
+// 3: $cse1:VARIABLE()  type: Real
+//
+//
+// Equations (3, 3)
+// ========================================
+// 1/1 (1): x = time ^ 3.0 + $cse1    [binding]
+// 2/2 (1): y = $cse1 + x    [binding]
+// 3/3 (1): $cse1 = exp(time ^ 3.0)    [binding]
+//
+//
+// Simple Equations (0, 0)
+// ========================================
+//
+//
+// State Sets
+// ========================================
+//
+//
+// Matching
+// ========================================
+// 3 variables and equations
+// var 1 is solved in eqn 2
+// var 2 is solved in eqn 1
+// var 3 is solved in eqn 3
+//
+//
+// StrongComponents
+// ========================================
+// {3:3}
+// {1:2}
+// {2:1}
+//
+//
+//
+// BackendDAEType: simulation
+//
+//
+// Known Variables (constants) (0)
+// ========================================
+//
+//
+// External Objects (0)
+// ========================================
+//
+//
+// Classes of External Objects (0)
+// ========================================
+//
+//
+// Alias Variables (0)
+// ========================================
+//
+//
+// Simple Shared Equations (0, 0)
+// ========================================
+//
+//
+// Initial Equations (0, 0)
+// ========================================
+//
+//
+// Zero Crossings (0)
+// ========================================
+//
+//
+// Relations (0)
+// ========================================
+//
+//
+// Time Events (0)
+// ========================================
+//
+//
+// Constraints (0)
+// ========================================
+//
+//
+// Base partitions (0)
+// ========================================
+//
+//
+// Sub partitions (0)
+// ========================================
+//
+//
 // post-optimization module addInitialStmtsToAlgorithms (simulation):
 //
 //

diff --git a/openmodelica/debugDumps/optSimpleSolveDAEdump.mos b/openmodelica/debugDumps/optSimpleSolveDAEdump.mos
@@ -958,6 +958,101 @@ buildModel(testOptdaedump); getErrorString();
 // Sub partitions (0)
 // ========================================
 //
+//
+// post-optimization module simplifyAllExpressions (initialization):
+//
+//
+// unknown partition
+// ========================================
+//
+// Variables (3)
+// ========================================
+// 1: z:VARIABLE() .testOptdaedump, .Real type: Real
+// 2: y:VARIABLE() .testOptdaedump, .Real type: Real
+// 3: x:VARIABLE() .testOptdaedump, .Real type: Real
+//
+//
+// Equations (3, 3)
+// ========================================
+// 1/1 (1): z = if noEvent(x > 0.0) then y / 3.0 - 0.3333333333333333 else 0.2 * y - 0.4    [dynamic]
+// 2/2 (1): y = (-x ^ 3.0) ^ 0.3333333333333333    [dynamic]
+// 3/3 (1): x = 0.5 * log((1.0 + 0.9 * sin(10.0 * time)) / (1.0 - 0.9 * sin(10.0 * time)))    [dynamic]
+//
+//
+// Simple Equations (0, 0)
+// ========================================
+//
+//
+// State Sets
+// ========================================
+//
+//
+// Matching
+// ========================================
+// 3 variables and equations
+// var 1 is solved in eqn 1
+// var 2 is solved in eqn 2
+// var 3 is solved in eqn 3
+//
+//
+// StrongComponents
+// ========================================
+// {3:3}
+// {2:2}
+// {1:1}
+//
+//
+//
+// BackendDAEType: initialization
+//
+//
+// Known Variables (constants) (0)
+// ========================================
+//
+//
+// External Objects (0)
+// ========================================
+//
+//
+// Classes of External Objects (0)
+// ========================================
+//
+//
+// Alias Variables (0)
+// ========================================
+//
+//
+// Simple Shared Equations (0, 0)
+// ========================================
+//
+//
+// Initial Equations (0, 0)
+// ========================================
+//
+//
+// Zero Crossings (0)
+// ========================================
+//
+//
+// Relations (0)
+// ========================================
+//
+//
+// Time Events (0)
+// ========================================
+//
+//
+// Constraints (0)
+// ========================================
+//
+//
+// Base partitions (0)
+// ========================================
+//
+//
+// Sub partitions (0)
+// ========================================
+//
 // post-optimization done.
 //
 // post-optimization module solveSimpleEquations (simulation):