Skip to content

Commit

Permalink
Add fully specified initial conditions to modelicaML tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@lochel
lochel committed Oct 31, 2015
1 parent 8ac6287 commit 5a995db
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 27 deletions.
24 changes: 12 additions & 12 deletions openmodelica/modelicaML/BouncingBallExample/Ball.mo
View file
Expand Up @@ -6,15 +6,15 @@ model Ball
annotation(Diagram(coordinateSystem(extent={{-148.5,-105.0},{148.5,105.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10})), Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10}), graphics={Rectangle(visible=true, origin={0.0,65.0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, lineThickness=1, extent={{-100.0,-35.0},{100.0,35.0}}),Rectangle(visible=true, origin={0.0,-35.0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, lineThickness=1, extent={{-100.0,-65.0},{100.0,65.0}}),Text(visible=true, origin={0.0,52.0578}, fillPattern=FillPattern.Solid, extent={{-96.311,-15.0969},{96.311,15.0969}}, textString="Ball", fontName="Arial"),Text(visible=true, origin={0.0,83.1521}, fillPattern=FillPattern.Solid, extent={{-90.0,-11.3192},{90.0,11.3192}}, textString="«model»", fontName="Arial"),Text(visible=true, origin={0.3349,-37.1756}, fillPattern=FillPattern.Solid, extent={{-97.7954,-59.2801},{97.7954,59.2801}}, textString="M", fontName="Arial")}));
parameter Real g=9.81;
parameter Real c= 0.90;
Real height(start=0);
Real v(start=10);
Real height(start=0, fixed=true);
Real v(start=10, fixed=true);
record Ball_StateMachine_StateMachine_0
annotation(Diagram(coordinateSystem(extent={{-148.5,-105.0},{148.5,105.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10})), Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10}), graphics={Rectangle(visible=true, origin={-6.722,3.6841}, lineColor={0,85,127}, fillColor={85,170,255}, fillPattern=FillPattern.Solid, lineThickness=10, extent={{-75.0,-50.0},{75.0,50.0}}, radius=40),Rectangle(visible=true, origin={70.0,2.6556}, lineColor={85,170,255}, fillColor={0,85,127}, fillPattern=FillPattern.Solid, lineThickness=4, extent={{-26.8908,-25.0},{26.8908,25.0}})}));
// lib properties STATE MACHINE
Boolean active; // indicates if the state is active.
Real timeAtActivation; // time when the state is entered.
Boolean active(fixed=true); // indicates if the state is active.
Real timeAtActivation(fixed=true); // time when the state is entered.
Real stime; // stime means "state time". It is is a local timer. It starts when the state is entered and is equal to zero if the state is not active.
Boolean selfTransitionActivated;
Boolean selfTransitionActivated(fixed=true);
Boolean startBehaviour;
// REGIONS instantiation
StateMachine_0_Region_0 Region_0;
Expand All @@ -37,28 +37,28 @@ model Ball
record SimpleState
annotation(Diagram(coordinateSystem(extent={{-148.5,-105.0},{148.5,105.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10})), Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10}), graphics={Rectangle(visible=true, origin={-0.0,-0.1675}, lineColor={0,85,127}, fillColor={104,182,221}, fillPattern=FillPattern.HorizontalCylinder, lineThickness=10, extent={{-64.6031,-34.6638},{64.6031,34.6638}}, radius=40)}));
// lib properties SIMPLE STATE
Boolean active; // indicates if the state is active.
Real timeAtActivation; // time when the state is entered.
Boolean active(fixed=true); // indicates if the state is active.
Real timeAtActivation(fixed=true); // time when the state is entered.
Real stime; // stime means "state time". It is is a local timer. It starts when the state is entered and is equal to zero if the state is not active.
Boolean selfTransitionActivated;
Boolean selfTransitionActivated(fixed=true);
end SimpleState;

// library: INITIAL STATE
record InitialState
annotation(Diagram(coordinateSystem(extent={{-148.5,-105.0},{148.5,105.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10})), Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10}), graphics={Rectangle(visible=true, origin={-0.0,0.0}, lineColor={0,85,127}, fillColor={104,182,221}, fillPattern=FillPattern.HorizontalCylinder, lineThickness=10, extent={{-34.8134,-34.6638},{34.8134,34.6638}}, radius=40)}));
// lib properties INITIAL STATE
Boolean active; // indicates if the state is active.
Real timeAtActivation; // time when the state is entered.
Real timeAtActivation(fixed=true); // time when the state is entered.
Real stime; // stime means "state time". It is is a local timer. It starts when the state is entered and is equal to zero if the state is not active.
Boolean selfTransitionActivated;
Boolean selfTransitionActivated(fixed=true);
end InitialState;

// library: FINAL STATE
record FinalState
annotation(Diagram(coordinateSystem(extent={{-148.5,-105.0},{148.5,105.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10})), Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10}), graphics={Rectangle(visible=true, origin={0.0,0.0}, lineColor={0,85,127}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, lineThickness=10, extent={{-34.8134,-34.6638},{34.8134,34.6638}}, radius=40),Rectangle(visible=true, origin={0.0,0.0}, fillPattern=FillPattern.HorizontalCylinder, lineThickness=10, extent={{-17.2767,-17.2024},{17.2767,17.2024}}, radius=40)}));
// lib properties FINAL STATE
Boolean active; // indicates if the state is active.
Real timeAtActivation; // time when the state is entered.
Boolean active(fixed=true); // indicates if the state is active.
Real timeAtActivation(fixed=true); // time when the state is entered.
Real stime; // stime means "state time". It is is a local timer. It starts when the state is entered and is equal to zero if the state is not active.
Boolean selfTransitionActivated;
end FinalState;
Expand Down
20 changes: 10 additions & 10 deletions openmodelica/modelicaML/ModelicaMLModel/Design/SystemModel1.mo
View file
Expand Up @@ -8,10 +8,10 @@ model SystemModel1
record SystemModel1_StateMachine_StateMachine0
annotation(Diagram(coordinateSystem(extent={{-148.5,-105.0},{148.5,105.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10})), Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10}), graphics={Rectangle(visible=true, origin={-6.722,3.6841}, lineColor={0,85,127}, fillColor={85,170,255}, fillPattern=FillPattern.Solid, lineThickness=10, extent={{-75.0,-50.0},{75.0,50.0}}, radius=40),Rectangle(visible=true, origin={70.0,2.6556}, lineColor={85,170,255}, fillColor={0,85,127}, fillPattern=FillPattern.Solid, lineThickness=4, extent={{-26.8908,-25.0},{26.8908,25.0}})}));
// lib properties STATE MACHINE
Boolean active; // indicates if the state is active.
Real timeAtActivation; // time when the state is entered.
Boolean active(fixed=true); // indicates if the state is active.
Real timeAtActivation(fixed=true); // time when the state is entered.
Real stime; // stime means "state time". It is is a local timer. It starts when the state is entered and is equal to zero if the state is not active.
Boolean selfTransitionActivated;
Boolean selfTransitionActivated(fixed=true);
Boolean startBehaviour;
// REGIONS instantiation
StateMachine0_Region0 Region0;
Expand All @@ -33,30 +33,30 @@ model SystemModel1
record SimpleState
annotation(Diagram(coordinateSystem(extent={{-148.5,-105.0},{148.5,105.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10})), Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10}), graphics={Rectangle(visible=true, origin={-0.0,-0.1675}, lineColor={0,85,127}, fillColor={104,182,221}, fillPattern=FillPattern.HorizontalCylinder, lineThickness=10, extent={{-64.6031,-34.6638},{64.6031,34.6638}}, radius=40)}));
// lib properties SIMPLE STATE
Boolean active; // indicates if the state is active.
Real timeAtActivation; // time when the state is entered.
Boolean active(fixed=true); // indicates if the state is active.
Real timeAtActivation(fixed=true); // time when the state is entered.
Real stime; // stime means "state time". It is is a local timer. It starts when the state is entered and is equal to zero if the state is not active.
Boolean selfTransitionActivated;
Boolean selfTransitionActivated(fixed=true);
end SimpleState;

// library: INITIAL STATE
record InitialState
annotation(Diagram(coordinateSystem(extent={{-148.5,-105.0},{148.5,105.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10})), Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10}), graphics={Rectangle(visible=true, origin={-0.0,0.0}, lineColor={0,85,127}, fillColor={104,182,221}, fillPattern=FillPattern.HorizontalCylinder, lineThickness=10, extent={{-34.8134,-34.6638},{34.8134,34.6638}}, radius=40)}));
// lib properties INITIAL STATE
Boolean active; // indicates if the state is active.
Real timeAtActivation; // time when the state is entered.
Real timeAtActivation(fixed=true); // time when the state is entered.
Real stime; // stime means "state time". It is is a local timer. It starts when the state is entered and is equal to zero if the state is not active.
Boolean selfTransitionActivated;
Boolean selfTransitionActivated(fixed=true);
end InitialState;

// library: FINAL STATE
record FinalState
annotation(Diagram(coordinateSystem(extent={{-148.5,-105.0},{148.5,105.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10})), Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}, preserveAspectRatio=true, initialScale=0.1, grid={10,10}), graphics={Rectangle(visible=true, origin={0.0,0.0}, lineColor={0,85,127}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, lineThickness=10, extent={{-34.8134,-34.6638},{34.8134,34.6638}}, radius=40),Rectangle(visible=true, origin={0.0,0.0}, fillPattern=FillPattern.HorizontalCylinder, lineThickness=10, extent={{-17.2767,-17.2024},{17.2767,17.2024}}, radius=40)}));
// lib properties FINAL STATE
Boolean active; // indicates if the state is active.
Real timeAtActivation; // time when the state is entered.
Real timeAtActivation(fixed=true); // time when the state is entered.
Real stime; // stime means "state time". It is is a local timer. It starts when the state is entered and is equal to zero if the state is not active.
Boolean selfTransitionActivated;
Boolean selfTransitionActivated(fixed=true);
end FinalState;
end SystemModel1_StateMachine_StateMachine0;

Expand Down
6 changes: 4 additions & 2 deletions openmodelica/modelicaML/bouncingball.mos
View file
Expand Up @@ -5,8 +5,8 @@
//
// ModelicaML: 1.3.6 Examples from 29.Nov 2010

loadFile("./BouncingBallExample/package.mo");
simulate(BouncingBallExample.Ball,stopTime=20,numberOfIntervals=2000);
loadFile("./BouncingBallExample/package.mo"); getErrorString();
simulate(BouncingBallExample.Ball,stopTime=20,numberOfIntervals=2000); getErrorString();

val(height,0);
val(height,1.02);
Expand All @@ -19,11 +19,13 @@ val(StateMachine_0.Region_0.Falling.active,20);

// Result:
// true
// ""
// record SimulationResult
// resultFile = "BouncingBallExample.Ball_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 20.0, numberOfIntervals = 2000, tolerance = 0.000001, method = 'dassl', fileNamePrefix = 'BouncingBallExample.Ball', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// ""
// 0.00273783877491951
// 5.108748949347676
// 2.6034730761167073
Expand Down
6 changes: 3 additions & 3 deletions openmodelica/modelicaML/testModelicaML.mos
View file
Expand Up @@ -5,9 +5,8 @@
//
// ModelicaML: Examples from 22.Jun 2011

loadFile("./ModelicaMLModel/package.mo");
getErrorString();
simulate(ModelicaMLModel.Design.SystemModel1,stopTime=150);
loadFile("./ModelicaMLModel/package.mo"); getErrorString();
simulate(ModelicaMLModel.Design.SystemModel1,stopTime=150); getErrorString();

val(realVar,0);
val(realVar,20);
Expand All @@ -26,6 +25,7 @@ val(realVar,140);
// simulationOptions = "startTime = 0.0, stopTime = 150.0, numberOfIntervals = 500, tolerance = 0.000001, method = 'dassl', fileNamePrefix = 'ModelicaMLModel.Design.SystemModel1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// ""
// 0.0
// 0.0
// 0.0
Expand Down

0 comments on commit 5a995db

Please sign in to comment.