Skip to content

Commit

Permalink
Update expected output
Browse files Browse the repository at this point in the history
  • Loading branch information
@lochel
lochel committed May 24, 2015
1 parent 81f8a83 commit 0bc3a73
Show file tree
Hide file tree
Showing 14 changed files with 5,558 additions and 5,558 deletions.
180 changes: 90 additions & 90 deletions openmodelica/debugDumps/optdaedump.mos
View file
Expand Up @@ -1315,11 +1315,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -1409,11 +1409,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -1503,11 +1503,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -1597,11 +1597,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -1715,11 +1715,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -1832,11 +1832,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -1949,11 +1949,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -2066,11 +2066,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -2183,11 +2183,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -2300,11 +2300,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -2417,11 +2417,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -2534,11 +2534,11 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (5)
// ========================================
// 1: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
// 2: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 1: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 2: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 3: R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 4: R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 5: v0:VARIABLE() = 0.0 .testOptdaedump, .Real type: Real []
// 4: L:PARAM() = 0.5 .testOptdaedump, .Real type: Real []
// 5: C:PARAM() = 3.0 .testOptdaedump, .Real type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -4097,15 +4097,15 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (9)
// ========================================
// 1: input $res1:VARIABLE() type: Real []
// 2: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 3: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 4: input uL:VARIABLE() .testOptdaedump, .Real type: Real []
// 1: input i1SeedNLSJac0:STATE_DER() type: Real []
// 2: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 3: input iL:STATE(1)() .testOptdaedump, .Real type: Real []
// 4: input R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 5: input R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 6: input R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 7: input iL:STATE(1)() .testOptdaedump, .Real type: Real []
// 8: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 9: input i1SeedNLSJac0:STATE_DER() type: Real []
// 6: input uL:VARIABLE() .testOptdaedump, .Real type: Real []
// 7: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 8: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 9: input $res1:VARIABLE() type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -4192,15 +4192,15 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (9)
// ========================================
// 1: input $res1:VARIABLE() type: Real []
// 2: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 3: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 4: input uL:VARIABLE() .testOptdaedump, .Real type: Real []
// 1: input i1SeedNLSJac0:STATE_DER() type: Real []
// 2: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 3: input iL:STATE(1)() .testOptdaedump, .Real type: Real []
// 4: input R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 5: input R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 6: input R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 7: input iL:STATE(1)() .testOptdaedump, .Real type: Real []
// 8: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 9: input i1SeedNLSJac0:STATE_DER() type: Real []
// 6: input uL:VARIABLE() .testOptdaedump, .Real type: Real []
// 7: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 8: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 9: input $res1:VARIABLE() type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -4286,15 +4286,15 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (9)
// ========================================
// 1: input $res1:VARIABLE() type: Real []
// 2: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 3: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 4: input uL:VARIABLE() .testOptdaedump, .Real type: Real []
// 1: input i1SeedNLSJac0:STATE_DER() type: Real []
// 2: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 3: input iL:STATE(1)() .testOptdaedump, .Real type: Real []
// 4: input R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 5: input R1:PARAM() = 1.0 .testOptdaedump, .Real type: Real []
// 6: input R2:PARAM() = 2.0 .testOptdaedump, .Real type: Real []
// 7: input iL:STATE(1)() .testOptdaedump, .Real type: Real []
// 8: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 9: input i1SeedNLSJac0:STATE_DER() type: Real []
// 6: input uL:VARIABLE() .testOptdaedump, .Real type: Real []
// 7: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 8: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 9: input $res1:VARIABLE() type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -6425,13 +6425,13 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (7)
// ========================================
// 1: input $res1:VARIABLE() type: Real []
// 2: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 3: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 1: input i1SeedNLSJac1:STATE_DER() type: Real []
// 2: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 3: input iL:VARIABLE() .testOptdaedump, .Real type: Real []
// 4: input uL:VARIABLE() .testOptdaedump, .Real type: Real []
// 5: input iL:VARIABLE() .testOptdaedump, .Real type: Real []
// 6: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 7: input i1SeedNLSJac1:STATE_DER() type: Real []
// 5: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 6: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 7: input $res1:VARIABLE() type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -6518,13 +6518,13 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (7)
// ========================================
// 1: input $res1:VARIABLE() type: Real []
// 2: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 3: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 1: input i1SeedNLSJac1:STATE_DER() type: Real []
// 2: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 3: input iL:VARIABLE() .testOptdaedump, .Real type: Real []
// 4: input uL:VARIABLE() .testOptdaedump, .Real type: Real []
// 5: input iL:VARIABLE() .testOptdaedump, .Real type: Real []
// 6: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 7: input i1SeedNLSJac1:STATE_DER() type: Real []
// 5: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 6: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 7: input $res1:VARIABLE() type: Real []
//
//
// External Objects (0)
Expand Down Expand Up @@ -6610,13 +6610,13 @@ buildModel(testOptdaedump); getErrorString();
//
// Known Variables (constants) (7)
// ========================================
// 1: input $res1:VARIABLE() type: Real []
// 2: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 3: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 1: input i1SeedNLSJac1:STATE_DER() type: Real []
// 2: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 3: input iL:VARIABLE() .testOptdaedump, .Real type: Real []
// 4: input uL:VARIABLE() .testOptdaedump, .Real type: Real []
// 5: input iL:VARIABLE() .testOptdaedump, .Real type: Real []
// 6: input uC:DUMMY_STATE() .testOptdaedump, .Real type: Real []
// 7: input i1SeedNLSJac1:STATE_DER() type: Real []
// 5: input u1:VARIABLE() .testOptdaedump, .Real type: Real []
// 6: input i2:VARIABLE() .testOptdaedump, .Real type: Real []
// 7: input $res1:VARIABLE() type: Real []
//
//
// External Objects (0)
Expand Down
42 changes: 21 additions & 21 deletions openmodelica/xml/BB.mos
View file
Expand Up @@ -111,27 +111,7 @@ readFile("BB.BouncingBall.xml"); getErrorString();
// </orderedVariables>
// <knownVariables dimension=\"2\">
// <variablesList>
// <variable id=\"1\" name=\"e\" variability=\"parameter\" direction=\"none\" type=\"Real\" fixed=\"true\" flow=\"NonConnector\" stream=\"NonStreamConnector\">
// <classesNames>
// <element>
// BB.BouncingBall
// </element>
// <element>
// Real
// </element>
// </classesNames>
// <attributesValues>
// <initialValue string=\"0.9\">
// <MathML>
// <math xmlns=\"http://www.w3.org/1998/Math/MathML\">
// <cn type=\"real\"> 0.9
// </cn>
// </math>
// </MathML>
// </initialValue>
// </attributesValues>
// </variable>
// <variable id=\"2\" name=\"b1.ay\" variability=\"continuous\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\">
// <variable id=\"1\" name=\"b1.ay\" variability=\"continuous\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\">
// <bindValueExpression>
// <bindExpression string=\"-9.800000000000001\">
// <MathML>
Expand All @@ -154,6 +134,26 @@ readFile("BB.BouncingBall.xml"); getErrorString();
// </element>
// </classesNames>
// </variable>
// <variable id=\"2\" name=\"e\" variability=\"parameter\" direction=\"none\" type=\"Real\" fixed=\"true\" flow=\"NonConnector\" stream=\"NonStreamConnector\">
// <classesNames>
// <element>
// BB.BouncingBall
// </element>
// <element>
// Real
// </element>
// </classesNames>
// <attributesValues>
// <initialValue string=\"0.9\">
// <MathML>
// <math xmlns=\"http://www.w3.org/1998/Math/MathML\">
// <cn type=\"real\"> 0.9
// </cn>
// </math>
// </MathML>
// </initialValue>
// </attributesValues>
// </variable>
// </variablesList>
// </knownVariables>
// </variables>
Expand Down

0 comments on commit 0bc3a73

Please sign in to comment.