Skip to content

Commit

Permalink
Do not reset matching on no change
Browse files Browse the repository at this point in the history
  • Loading branch information
@lochel
lochel committed Mar 31, 2016
1 parent c864d3f commit 186a529
Show file tree
Hide file tree
Showing 4 changed files with 118 additions and 192 deletions.
98 changes: 41 additions & 57 deletions simulation/modelica/commonSubExp/cse1.mos
View file
Expand Up @@ -43,12 +43,12 @@ simulate(Tearing15); getErrorString();
//
// ########### Updated Variable List ########### (6)
// ========================================
// 1: $res2.$pDERNLSJac0.dummyVarNLSJac0:STATE_DER() type: Real unreplaceable
// 2: $res1.$pDERNLSJac0.dummyVarNLSJac0:STATE_DER() type: Real unreplaceable
// 3: v2.$pDERNLSJac0.dummyVarNLSJac0:VARIABLE() type: Real
// 4: v3.$pDERNLSJac0.dummyVarNLSJac0:VARIABLE() type: Real
// 5: $cse2:VARIABLE() type: Real unreplaceable
// 6: $cse1:VARIABLE() type: Real unreplaceable
// 1: $res2.$pDERNLSJac0.dummyVarNLSJac0:STATE_DER() type: Real unreplaceable
// 2: $res1.$pDERNLSJac0.dummyVarNLSJac0:STATE_DER() type: Real unreplaceable
// 3: v2.$pDERNLSJac0.dummyVarNLSJac0:VARIABLE() type: Real
// 4: v3.$pDERNLSJac0.dummyVarNLSJac0:VARIABLE() type: Real
// 5: $cse2:VARIABLE() type: Real unreplaceable
// 6: $cse1:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (6, 6)
Expand All @@ -63,10 +63,10 @@ simulate(Tearing15); getErrorString();
//
// ########### Updated Variable List ########### (4)
// ========================================
// 1: $res1.$pDERNLSJac1.dummyVarNLSJac1:STATE_DER() type: Real unreplaceable
// 2: v5.$pDERNLSJac1.dummyVarNLSJac1:VARIABLE() type: Real
// 3: $cse4:VARIABLE() type: Real unreplaceable
// 4: $cse3:VARIABLE() type: Real unreplaceable
// 1: $res1.$pDERNLSJac1.dummyVarNLSJac1:STATE_DER() type: Real unreplaceable
// 2: v5.$pDERNLSJac1.dummyVarNLSJac1:VARIABLE() type: Real
// 3: $cse4:VARIABLE() type: Real unreplaceable
// 4: $cse3:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (4, 4)
Expand All @@ -79,17 +79,17 @@ simulate(Tearing15); getErrorString();
//
// ########### Updated Variable List ########### (11)
// ========================================
// 1: v7:VARIABLE(start = 3.0 ) .Tearing15, .Real type: Real
// 2: v6:VARIABLE(start = 50.0 ) .Tearing15, .Real type: Real
// 3: v5:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 4: v4:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 5: v3:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 6: v2:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 7: v1:VARIABLE(start = 7.0 ) .Tearing15, .Real type: Real
// 8: source:VARIABLE() .Tearing15, .Real type: Real
// 9: $cse7:VARIABLE() type: Real unreplaceable
// 10: $cse6:VARIABLE() type: Real unreplaceable
// 11: $cse5:VARIABLE() type: Real unreplaceable
// 1: v7:VARIABLE(start = 3.0 ) .Tearing15, .Real type: Real
// 2: v6:VARIABLE(start = 50.0 ) .Tearing15, .Real type: Real
// 3: v5:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 4: v4:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 5: v3:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 6: v2:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 7: v1:VARIABLE(start = 7.0 ) .Tearing15, .Real type: Real
// 8: source:VARIABLE() .Tearing15, .Real type: Real
// 9: $cse7:VARIABLE() type: Real unreplaceable
// 10: $cse6:VARIABLE() type: Real unreplaceable
// 11: $cse5:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (11, 11)
Expand All @@ -109,19 +109,19 @@ simulate(Tearing15); getErrorString();
//
// ########### Updated Variable List ########### (13)
// ========================================
// 1: v7:VARIABLE(start = 3.0 ) .Tearing15, .Real type: Real
// 2: v6:VARIABLE(start = 50.0 ) .Tearing15, .Real type: Real
// 3: v5:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 4: v4:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 5: v3:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 6: v2:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 7: v1:VARIABLE(start = 7.0 ) .Tearing15, .Real type: Real
// 8: source:VARIABLE() .Tearing15, .Real type: Real
// 9: $cse7:VARIABLE() type: Real unreplaceable
// 10: $cse6:VARIABLE() type: Real unreplaceable
// 11: $cse5:VARIABLE() type: Real unreplaceable
// 12: $cseb17:VARIABLE() type: Real unreplaceable
// 13: $cseb3:VARIABLE() type: Real unreplaceable
// 1: v7:VARIABLE(start = 3.0 ) .Tearing15, .Real type: Real
// 2: v6:VARIABLE(start = 50.0 ) .Tearing15, .Real type: Real
// 3: v5:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 4: v4:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 5: v3:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 6: v2:VARIABLE(start = 1.0 ) .Tearing15, .Real type: Real
// 7: v1:VARIABLE(start = 7.0 ) .Tearing15, .Real type: Real
// 8: source:VARIABLE() .Tearing15, .Real type: Real
// 9: $cse7:VARIABLE() type: Real unreplaceable
// 10: $cse6:VARIABLE() type: Real unreplaceable
// 11: $cse5:VARIABLE() type: Real unreplaceable
// 12: $cseb17:VARIABLE() type: Real unreplaceable
// 13: $cseb3:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (13, 13)
Expand All @@ -141,27 +141,11 @@ simulate(Tearing15); getErrorString();
// 13/13 (1): $cseb3 = v1 * $cse6 [binding]
//
//
// ########### Updated Variable List ########### (4)
// ========================================
// 1: $res2.$pDERLSJac2.dummyVarLSJac2:STATE_DER() type: Real unreplaceable
// 2: $res1.$pDERLSJac2.dummyVarLSJac2:STATE_DER() type: Real unreplaceable
// 3: v7.$pDERLSJac2.dummyVarLSJac2:VARIABLE() type: Real
// 4: $cseb17.$pDERLSJac2.dummyVarLSJac2:VARIABLE() type: Real
//
//
// ########### Updated Equation List ########### (4, 4)
// ========================================
// 1/1 (1): v7.$pDERLSJac2.dummyVarLSJac2 - v3SeedLSJac2 - v2SeedLSJac2 = 0.0 [dynamic]
// 2/2 (1): -10.0 * v2SeedLSJac2 + -2.0 * v3SeedLSJac2 + 3.0 * $cseb17.$pDERLSJac2.dummyVarLSJac2 = 0.0 [dynamic]
// 3/3 (1): $res1.$pDERLSJac2.dummyVarLSJac2 = $cse5 * v7.$pDERLSJac2.dummyVarLSJac2 - $cseb17.$pDERLSJac2.dummyVarLSJac2 [binding]
// 4/4 (1): $res2.$pDERLSJac2.dummyVarLSJac2 = (-v3SeedLSJac2) * $cse5 - v7.$pDERLSJac2.dummyVarLSJac2 [dynamic]
//
//
// ########### Updated Variable List ########### (3)
// ========================================
// 1: $res1.$pDERNLSJac3.dummyVarNLSJac3:STATE_DER() type: Real unreplaceable
// 2: $cse6.$pDERNLSJac3.dummyVarNLSJac3:VARIABLE() type: Real
// 3: $cse8:VARIABLE() type: Real unreplaceable
// 1: $res1.$pDERNLSJac3.dummyVarNLSJac3:STATE_DER() type: Real unreplaceable
// 2: $cse6.$pDERNLSJac3.dummyVarNLSJac3:VARIABLE() type: Real
// 3: $cse8:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (3, 3)
Expand All @@ -173,10 +157,10 @@ simulate(Tearing15); getErrorString();
//
// ########### Updated Variable List ########### (4)
// ========================================
// 1: $res1.$pDERNLSJac4.dummyVarNLSJac4:STATE_DER() type: Real unreplaceable
// 2: v5.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE() type: Real
// 3: $cse7.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE() type: Real
// 4: $cse9:VARIABLE() type: Real unreplaceable
// 1: $res1.$pDERNLSJac4.dummyVarNLSJac4:STATE_DER() type: Real unreplaceable
// 2: v5.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE() type: Real
// 3: $cse7.$pDERNLSJac4.dummyVarNLSJac4:VARIABLE() type: Real
// 4: $cse9:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (4, 4)
Expand Down
100 changes: 36 additions & 64 deletions simulation/modelica/commonSubExp/cse2.mos
View file
Expand Up @@ -49,39 +49,25 @@ simulate(Tearing3); getErrorString();
// true
// ""
//
// ########### Updated Variable List ########### (3)
// ========================================
// 1: $res1.$pDERLSJac0.dummyVarLSJac0:STATE_DER() type: Real unreplaceable
// 2: $DER.uL.$pDERLSJac0.dummyVarLSJac0:VARIABLE() type: Real
// 3: $DER.u1.$pDERLSJac0.dummyVarLSJac0:VARIABLE() type: Real
//
//
// ########### Updated Equation List ########### (3, 3)
// ========================================
// 1/1 (1): $DER.uL.$pDERLSJac0.dummyVarLSJac0 = R2 * $DER_i2SeedLSJac0 [dynamic]
// 2/2 (1): $DER.u1.$pDERLSJac0.dummyVarLSJac0 = R1 * $DER_i2SeedLSJac0 [dynamic]
// 3/3 (1): $res1.$pDERLSJac0.dummyVarLSJac0 = $DER.uL.$pDERLSJac0.dummyVarLSJac0 + $DER.u1.$pDERLSJac0.dummyVarLSJac0 [dynamic]
//
//
// ########### Updated Variable List ########### (17)
// ========================================
// 1: iC:VARIABLE() .Tearing3, .Real type: Real
// 2: iL:DUMMY_STATE() .Tearing3, .Real type: Real
// 3: i2:STATE(1)(start = 0.0 fixed = true ) .Tearing3, .Real type: Real
// 4: i1:DUMMY_STATE() .Tearing3, .Real type: Real
// 5: i0:VARIABLE() .Tearing3, .Real type: Real
// 6: uC:DUMMY_STATE() .Tearing3, .Real type: Real
// 7: uL:DUMMY_STATE() .Tearing3, .Real type: Real
// 8: u1:DUMMY_STATE() .Tearing3, .Real type: Real
// 9: u0:DUMMY_STATE() .Tearing3, .Real type: Real
// 10: $DER.uC:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 11: $DER.iL:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 12: $DER.u0:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 13: $DER.i1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 14: $DER.u1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 15: $DER.uL:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 16: $cse2:VARIABLE() type: Real unreplaceable
// 17: $cse1:VARIABLE() type: Real unreplaceable
// 1: iC:VARIABLE() .Tearing3, .Real type: Real
// 2: iL:DUMMY_STATE() .Tearing3, .Real type: Real
// 3: i2:STATE(1)(start = 0.0 fixed = true ) .Tearing3, .Real type: Real
// 4: i1:DUMMY_STATE() .Tearing3, .Real type: Real
// 5: i0:VARIABLE() .Tearing3, .Real type: Real
// 6: uC:DUMMY_STATE() .Tearing3, .Real type: Real
// 7: uL:DUMMY_STATE() .Tearing3, .Real type: Real
// 8: u1:DUMMY_STATE() .Tearing3, .Real type: Real
// 9: u0:DUMMY_STATE() .Tearing3, .Real type: Real
// 10: $DER.uC:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 11: $DER.iL:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 12: $DER.u0:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 13: $DER.i1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 14: $DER.u1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 15: $DER.uL:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 16: $cse2:VARIABLE() type: Real unreplaceable
// 17: $cse1:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (17, 17)
Expand All @@ -107,25 +93,25 @@ simulate(Tearing3); getErrorString();
//
// ########### Updated Variable List ########### (19)
// ========================================
// 1: iC:VARIABLE() .Tearing3, .Real type: Real
// 2: iL:DUMMY_STATE() .Tearing3, .Real type: Real
// 3: i2:STATE(1)(start = 0.0 fixed = true ) .Tearing3, .Real type: Real
// 4: i1:DUMMY_STATE() .Tearing3, .Real type: Real
// 5: i0:VARIABLE() .Tearing3, .Real type: Real
// 6: uC:DUMMY_STATE() .Tearing3, .Real type: Real
// 7: uL:DUMMY_STATE() .Tearing3, .Real type: Real
// 8: u1:DUMMY_STATE() .Tearing3, .Real type: Real
// 9: u0:DUMMY_STATE() .Tearing3, .Real type: Real
// 10: $DER.uC:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 11: $DER.iL:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 12: $DER.u0:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 13: $DER.i1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 14: $DER.u1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 15: $DER.uL:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 16: $cse2:VARIABLE() type: Real unreplaceable
// 17: $cse1:VARIABLE() type: Real unreplaceable
// 18: $cseb10:VARIABLE() type: Real unreplaceable
// 19: $cseb3:VARIABLE() type: Real unreplaceable
// 1: iC:VARIABLE() .Tearing3, .Real type: Real
// 2: iL:DUMMY_STATE() .Tearing3, .Real type: Real
// 3: i2:STATE(1)(start = 0.0 fixed = true ) .Tearing3, .Real type: Real
// 4: i1:DUMMY_STATE() .Tearing3, .Real type: Real
// 5: i0:VARIABLE() .Tearing3, .Real type: Real
// 6: uC:DUMMY_STATE() .Tearing3, .Real type: Real
// 7: uL:DUMMY_STATE() .Tearing3, .Real type: Real
// 8: u1:DUMMY_STATE() .Tearing3, .Real type: Real
// 9: u0:DUMMY_STATE() .Tearing3, .Real type: Real
// 10: $DER.uC:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 11: $DER.iL:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 12: $DER.u0:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 13: $DER.i1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 14: $DER.u1:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 15: $DER.uL:DUMMY_DER(fixed = false ) .Tearing3, .Real type: Real
// 16: $cse2:VARIABLE() type: Real unreplaceable
// 17: $cse1:VARIABLE() type: Real unreplaceable
// 18: $cseb10:VARIABLE() type: Real unreplaceable
// 19: $cseb3:VARIABLE() type: Real unreplaceable
//
//
// ########### Updated Equation List ########### (19, 19)
Expand All @@ -150,20 +136,6 @@ simulate(Tearing3); getErrorString();
// 18/18 (1): $cseb10 = u1 + uL [binding]
// 19/19 (1): $cseb3 = $DER.u1 + $DER.uL [binding]
//
//
// ########### Updated Variable List ########### (3)
// ========================================
// 1: $res1.$pDERLSJac1.dummyVarLSJac1:STATE_DER() type: Real unreplaceable
// 2: $DER.uL.$pDERLSJac1.dummyVarLSJac1:VARIABLE() type: Real
// 3: $DER.u1.$pDERLSJac1.dummyVarLSJac1:VARIABLE() type: Real
//
//
// ########### Updated Equation List ########### (3, 3)
// ========================================
// 1/1 (1): $DER.uL.$pDERLSJac1.dummyVarLSJac1 = R2 * $DER_i2SeedLSJac1 [dynamic]
// 2/2 (1): $DER.u1.$pDERLSJac1.dummyVarLSJac1 = R1 * $DER_i2SeedLSJac1 [dynamic]
// 3/3 (1): $res1.$pDERLSJac1.dummyVarLSJac1 = $DER.uL.$pDERLSJac1.dummyVarLSJac1 + $DER.u1.$pDERLSJac1.dummyVarLSJac1 [binding]
//
// record SimulationResult
// resultFile = "Tearing3_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Tearing3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
Expand Down

0 comments on commit 186a529

Please sign in to comment.