Skip to content

Commit

Permalink
expected output
Browse files Browse the repository at this point in the history
  • Loading branch information
@vwaurich @OpenModelica-Hudson
vwaurich authored and OpenModelica-Hudson committed May 3, 2017
1 parent df74862 commit 582c559
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 108 deletions.
24 changes: 12 additions & 12 deletions simulation/modelica/synchronous/SamplingWithClocks.mos
View file
Expand Up @@ -71,17 +71,17 @@ translateModel(SamplingWithClocks); getErrorString();
// no matching
//
//
// clocked partition(4)
// clocked partition(2)
// ========================================
//
// Variables (1)
// ========================================
// 1: w:VARIABLE() type: Real
// 1: x:VARIABLE() type: Real
//
//
// Equations (1, 1)
// ========================================
// 1/1 (1): w = $getPart(x) [dynamic]
// 1/1 (1): x = $getPart(time) [dynamic]
//
//
// Simple Equations (0, 0)
Expand Down Expand Up @@ -119,17 +119,17 @@ translateModel(SamplingWithClocks); getErrorString();
// no matching
//
//
// clocked partition(2)
// clocked partition(4)
// ========================================
//
// Variables (1)
// ========================================
// 1: x:VARIABLE() type: Real
// 1: w:VARIABLE() type: Real
//
//
// Equations (1, 1)
// ========================================
// 1/1 (1): x = $getPart(time) [dynamic]
// 1/1 (1): w = $getPart(x) [dynamic]
//
//
// Simple Equations (0, 0)
Expand Down Expand Up @@ -189,17 +189,17 @@ translateModel(SamplingWithClocks); getErrorString();
// no matching
//
//
// clocked partition(4)
// clocked partition(2)
// ========================================
//
// Variables (1)
// ========================================
// 1: w:VARIABLE() type: Real
// 1: x:VARIABLE() type: Real
//
//
// Equations (1, 1)
// ========================================
// 1/1 (1): w = $getPart(x) [dynamic]
// 1/1 (1): x = $getPart(time) [dynamic]
//
//
// Simple Equations (0, 0)
Expand Down Expand Up @@ -237,17 +237,17 @@ translateModel(SamplingWithClocks); getErrorString();
// no matching
//
//
// clocked partition(2)
// clocked partition(4)
// ========================================
//
// Variables (1)
// ========================================
// 1: x:VARIABLE() type: Real
// 1: w:VARIABLE() type: Real
//
//
// Equations (1, 1)
// ========================================
// 1/1 (1): x = $getPart(time) [dynamic]
// 1/1 (1): w = $getPart(x) [dynamic]
//
//
// Simple Equations (0, 0)
Expand Down
136 changes: 68 additions & 68 deletions simulation/modelica/synchronous/SynchronousFeatures.ControlledMass.mos
View file
Expand Up @@ -87,21 +87,23 @@ translateModel(SynchronousFeatures.ControlledMass); getErrorString();
// no matching
//
//
// clocked partition(4)
// clocked partition(1)
// ========================================
//
// Variables (3)
// Variables (4)
// ========================================
// 1: uInner:DISCRETE(start = 0.0 ) type: Real
// 2: vref:DISCRETE() type: Real
// 3: vd:DISCRETE() type: Real
// 1: uOuter:DISCRETE(start = 0.0 ) type: Real
// 2: intE:DISCRETE(start = 0.0 ) type: Real
// 3: eOuter:DISCRETE() type: Real
// 4: xd:DISCRETE() type: Real
//
//
// Equations (3, 3)
// Equations (4, 4)
// ========================================
// 1/1 (1): vd = $getPart($var2) [dynamic]
// 2/2 (1): vref = $getPart($var3) [dynamic]
// 3/3 (1): uInner = KInner * (vref - vd) [dynamic]
// 1/1 (1): xd = $getPart(x) [dynamic]
// 2/2 (1): eOuter = xref - xd [dynamic]
// 3/3 (1): intE = previous(intE) + eOuter [dynamic]
// 4/4 (1): uOuter = KOuter * (eOuter + intE / Ti) [dynamic]
//
//
// Simple Equations (0, 0)
Expand All @@ -115,17 +117,19 @@ translateModel(SynchronousFeatures.ControlledMass); getErrorString();
// no matching
//
//
// clocked partition(3)
// clocked partition(2)
// ========================================
//
// Variables (1)
// Variables (2)
// ========================================
// 1: $var3:VARIABLE() type: Real
// 1: xdFast:DISCRETE() type: Real
// 2: $var2:VARIABLE() type: Real
//
//
// Equations (1, 1)
// Equations (2, 2)
// ========================================
// 1/1 (1): $var3 = $getPart(uOuter) [dynamic]
// 1/1 (1): xdFast = $getPart(x) [dynamic]
// 2/2 (1): $var2 = (xdFast - previous(xdFast)) / interval() [dynamic]
//
//
// Simple Equations (0, 0)
Expand All @@ -139,19 +143,17 @@ translateModel(SynchronousFeatures.ControlledMass); getErrorString();
// no matching
//
//
// clocked partition(2)
// clocked partition(3)
// ========================================
//
// Variables (2)
// Variables (1)
// ========================================
// 1: xdFast:DISCRETE() type: Real
// 2: $var2:VARIABLE() type: Real
// 1: $var3:VARIABLE() type: Real
//
//
// Equations (2, 2)
// Equations (1, 1)
// ========================================
// 1/1 (1): xdFast = $getPart(x) [dynamic]
// 2/2 (1): $var2 = (xdFast - previous(xdFast)) / interval() [dynamic]
// 1/1 (1): $var3 = $getPart(uOuter) [dynamic]
//
//
// Simple Equations (0, 0)
Expand All @@ -165,23 +167,21 @@ translateModel(SynchronousFeatures.ControlledMass); getErrorString();
// no matching
//
//
// clocked partition(1)
// clocked partition(4)
// ========================================
//
// Variables (4)
// Variables (3)
// ========================================
// 1: uOuter:DISCRETE(start = 0.0 ) type: Real
// 2: intE:DISCRETE(start = 0.0 ) type: Real
// 3: eOuter:DISCRETE() type: Real
// 4: xd:DISCRETE() type: Real
// 1: uInner:DISCRETE(start = 0.0 ) type: Real
// 2: vref:DISCRETE() type: Real
// 3: vd:DISCRETE() type: Real
//
//
// Equations (4, 4)
// Equations (3, 3)
// ========================================
// 1/1 (1): xd = $getPart(x) [dynamic]
// 2/2 (1): eOuter = xref - xd [dynamic]
// 3/3 (1): intE = previous(intE) + eOuter [dynamic]
// 4/4 (1): uOuter = KOuter * (eOuter + intE / Ti) [dynamic]
// 1/1 (1): vd = $getPart($var2) [dynamic]
// 2/2 (1): vref = $getPart($var3) [dynamic]
// 3/3 (1): uInner = KInner * (vref - vd) [dynamic]
//
//
// Simple Equations (0, 0)
Expand All @@ -203,10 +203,10 @@ translateModel(SynchronousFeatures.ControlledMass); getErrorString();
//
// Sub clocks (4)
// ========================================
// 1: factor(5/1) shift(2/3) event(true)
// 1: factor(5/1) shift(2/3) event(false)
// 2: factor(1/2) shift(0/1) event(false)
// 3: factor(1/1) shift(2/3) event(false)
// 4: factor(1/1) shift(0/1) event(false)
// 4: factor(1/1) shift(0/1) event(true)
//
// synchronous features post-phase: synchronousFeatures
//
Expand Down Expand Up @@ -256,21 +256,23 @@ translateModel(SynchronousFeatures.ControlledMass); getErrorString();
// {3:2}
//
//
// clocked partition(4)
// clocked partition(1)
// ========================================
//
// Variables (3)
// Variables (4)
// ========================================
// 1: uInner:DISCRETE(start = 0.0 ) type: Real
// 2: vref:DISCRETE() type: Real
// 3: vd:DISCRETE() type: Real
// 1: uOuter:DISCRETE(start = 0.0 ) type: Real
// 2: intE:CLOCKED_STATE(start = 0.0 fixed = true ) type: Real
// 3: eOuter:DISCRETE() type: Real
// 4: xd:DISCRETE() type: Real
//
//
// Equations (3, 3)
// Equations (4, 4)
// ========================================
// 1/1 (1): vd = $getPart($var2) [dynamic]
// 2/2 (1): vref = $getPart($var3) [dynamic]
// 3/3 (1): uInner = KInner * (vref - vd) [dynamic]
// 1/1 (1): xd = $getPart(x) [dynamic]
// 2/2 (1): eOuter = xref - xd [dynamic]
// 3/3 (1): intE = previous(intE) + eOuter [dynamic]
// 4/4 (1): uOuter = KOuter * (eOuter + intE / Ti) [dynamic]
//
//
// Simple Equations (0, 0)
Expand All @@ -284,17 +286,19 @@ translateModel(SynchronousFeatures.ControlledMass); getErrorString();
// no matching
//
//
// clocked partition(3)
// clocked partition(2)
// ========================================
//
// Variables (1)
// Variables (2)
// ========================================
// 1: $var3:VARIABLE() type: Real
// 1: xdFast:CLOCKED_STATE(fixed = true ) type: Real
// 2: $var2:VARIABLE() type: Real
//
//
// Equations (1, 1)
// Equations (2, 2)
// ========================================
// 1/1 (1): $var3 = $getPart(uOuter) [dynamic]
// 1/1 (1): xdFast = $getPart(x) [dynamic]
// 2/2 (1): $var2 = (xdFast - previous(xdFast)) / interval() [dynamic]
//
//
// Simple Equations (0, 0)
Expand All @@ -308,19 +312,17 @@ translateModel(SynchronousFeatures.ControlledMass); getErrorString();
// no matching
//
//
// clocked partition(2)
// clocked partition(3)
// ========================================
//
// Variables (2)
// Variables (1)
// ========================================
// 1: xdFast:CLOCKED_STATE(fixed = true ) type: Real
// 2: $var2:VARIABLE() type: Real
// 1: $var3:VARIABLE() type: Real
//
//
// Equations (2, 2)
// Equations (1, 1)
// ========================================
// 1/1 (1): xdFast = $getPart(x) [dynamic]
// 2/2 (1): $var2 = (xdFast - previous(xdFast)) / interval() [dynamic]
// 1/1 (1): $var3 = $getPart(uOuter) [dynamic]
//
//
// Simple Equations (0, 0)
Expand All @@ -334,23 +336,21 @@ translateModel(SynchronousFeatures.ControlledMass); getErrorString();
// no matching
//
//
// clocked partition(1)
// clocked partition(4)
// ========================================
//
// Variables (4)
// Variables (3)
// ========================================
// 1: uOuter:DISCRETE(start = 0.0 ) type: Real
// 2: intE:CLOCKED_STATE(start = 0.0 fixed = true ) type: Real
// 3: eOuter:DISCRETE() type: Real
// 4: xd:DISCRETE() type: Real
// 1: uInner:DISCRETE(start = 0.0 ) type: Real
// 2: vref:DISCRETE() type: Real
// 3: vd:DISCRETE() type: Real
//
//
// Equations (4, 4)
// Equations (3, 3)
// ========================================
// 1/1 (1): xd = $getPart(x) [dynamic]
// 2/2 (1): eOuter = xref - xd [dynamic]
// 3/3 (1): intE = previous(intE) + eOuter [dynamic]
// 4/4 (1): uOuter = KOuter * (eOuter + intE / Ti) [dynamic]
// 1/1 (1): vd = $getPart($var2) [dynamic]
// 2/2 (1): vref = $getPart($var3) [dynamic]
// 3/3 (1): uInner = KInner * (vref - vd) [dynamic]
//
//
// Simple Equations (0, 0)
Expand All @@ -372,10 +372,10 @@ translateModel(SynchronousFeatures.ControlledMass); getErrorString();
//
// Sub clocks (4)
// ========================================
// 1: factor(5/1) shift(2/3) event(true)
// 1: factor(5/1) shift(2/3) event(false)
// 2: factor(1/2) shift(0/1) event(false)
// 3: factor(1/1) shift(2/3) event(false)
// 4: factor(1/1) shift(0/1) event(false)
// 4: factor(1/1) shift(0/1) event(true)
//
// true
// ""
Expand Down

0 comments on commit 582c559

Please sign in to comment.