-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #75 from audrey-jardin/main
Fix for CRML.mo, some reference test results and traffic-light example
- Loading branch information
Showing
36 changed files
with
353 additions
and
193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 6 additions & 2 deletions
8
resources/modelica_libraries/CRML_test/ETL/BecomesFalse/BecomesFalse_externals.mo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,20 @@ | ||
| within CRML_test.ETL.BecomesFalse; | ||
| model BecomesFalse_externals | ||
| CRML.Blocks.Events.EventPeriodic boolean4Constant1(period=3, startTime=2) | ||
| CRML.Blocks.Events.EventPeriodic eventPeriodic_1(period=3, startTime=2) | ||
| annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); | ||
| CRML.ETL.Connectors.Boolean4Output b1 | ||
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | ||
| CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 | ||
| annotation (Placement(transformation(extent={{-4,-4},{4,4}}))); | ||
| CRML.Blocks.Events.ShowEvent showEvent_eventPeriodic_b1 | ||
| annotation (Placement(transformation(extent={{-20,-44},{-12,-36}}))); | ||
| equation | ||
| connect(boolean4Constant1.y, booleanToBoolean4_1.u) | ||
| connect(eventPeriodic_1.y, booleanToBoolean4_1.u) | ||
| annotation (Line(points={{-39,0},{-4.4,0}}, color={217,67,180})); | ||
| connect(booleanToBoolean4_1.y, b1) | ||
| annotation (Line(points={{4.4,0},{110,0}}, color={162,29,33})); | ||
| connect(eventPeriodic_1.y, showEvent_eventPeriodic_b1.u) annotation (Line( | ||
| points={{-39,0},{-28,0},{-28,-40},{-20.4,-40}}, color={217,67,180})); | ||
| annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( | ||
| coordinateSystem(preserveAspectRatio=false))); | ||
| end BecomesFalse_externals; |
10 changes: 5 additions & 5 deletions
10
resources/modelica_libraries/CRML_test/ETL/BecomesFalse/BecomesFalse_verif.mo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 25 additions & 7 deletions
32
resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/BecomesTrueInside_externals.mo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,34 @@ | ||
| within CRML_test.ETL.BecomesTrueInside; | ||
| model BecomesTrueInside_externals | ||
| CRML.Blocks.Events.EventPeriodic boolean4Constant1(period=3, startTime=2) | ||
| annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); | ||
| CRML.ETL.Connectors.Boolean4Output b1 | ||
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | ||
| annotation (Placement(transformation(extent={{100,30},{120,50}}))); | ||
| CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 | ||
| annotation (Placement(transformation(extent={{-4,-4},{4,4}}))); | ||
| annotation (Placement(transformation(extent={{-4,36},{4,44}}))); | ||
| public | ||
| CRML.Blocks.Logical.BooleanTable booleanTable_b1( | ||
| y0=false, | ||
| option_width=false, | ||
| instant={2,5,7.5,9}) | ||
| annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); | ||
| CRML.Blocks.Logical.BooleanTable booleanTable_b2( | ||
| y0=false, | ||
| option_width=false, | ||
| instant={3.5,4.5}) | ||
| annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); | ||
| CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 | ||
| annotation (Placement(transformation(extent={{-4,-44},{4,-36}}))); | ||
| CRML.ETL.Connectors.Boolean4Output b2 | ||
| annotation (Placement(transformation(extent={{100,-50},{120,-30}}))); | ||
| equation | ||
| connect(boolean4Constant1.y, booleanToBoolean4_1.u) | ||
| annotation (Line(points={{-39,0},{-4.4,0}}, color={217,67,180})); | ||
| connect(booleanToBoolean4_1.y, b1) | ||
| annotation (Line(points={{4.4,0},{110,0}}, color={162,29,33})); | ||
| annotation (Line(points={{4.4,40},{110,40}}, | ||
| color={162,29,33})); | ||
| connect(booleanTable_b1.y, booleanToBoolean4_1.u) | ||
| annotation (Line(points={{-39,40},{-4.4,40}}, color={217,67,180})); | ||
| connect(booleanTable_b2.y, booleanToBoolean4_2.u) | ||
| annotation (Line(points={{-39,-40},{-4.4,-40}}, color={217,67,180})); | ||
| connect(booleanToBoolean4_2.y, b2) | ||
| annotation (Line(points={{4.4,-40},{110,-40}}, color={162,29,33})); | ||
| annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( | ||
| coordinateSystem(preserveAspectRatio=false))); | ||
| end BecomesTrueInside_externals; |
Oops, something went wrong.