diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 458d33a..0eac328 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -50,7 +50,7 @@ jobs: # this is just an example, we should create .mos # files for each .mo file to run each as a JUnit test # load the library - echo 'loadFile("./resources/modelica_libraries/CRMLtoModelica.mo"); getErrorString();' >> runTests.mos + echo 'loadFile("./libraries/modelica/CRMLtoModelica.mo"); getErrorString();' >> runTests.mos # load a translated file echo 'loadFile("./build/testSuiteGenerated/spec-doc-examples/BooleanAccumulation/BooleanAccumulation.mo"); getErrorString();' >> runTests.mos # check the translated file diff --git a/README.md b/README.md index 0a27579..ac3c6a8 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,37 @@ -# crml-compiler +# crml compiler + +A POC compiler from CRML to Modelica. For questions contact lena.buffoni at liu.com ## Download it via github actions -Go to: [![Makefile CI](https://github.com/lenaRB/crml-compiler/actions/workflows/makefile.yml/badge.svg)](https://github.com/lenaRB/crml-compiler/actions/workflows/makefile.yml) then click on the last green action and download the artifact. +Go to: [![Makefile CI](https://github.com/OpenModelica/CRML/actions/workflows/makefile.yml/badge.svg)](https://github.com/OpenModelica/CRML/actions/workflows/makefile.yml) then click on the last green action and download the artifact. Unzip it to some place and run: ``` +java -jar crml-compiler-all.jar --help +``` +To see all the help flags and configurations + +To run the test suite: +``` java -jar crml-compiler-all.jar --testsuite ``` A directory generated/ will be created and for each crml test in the directory above a Modelica file will be created in the generated/ directory. -## Build on Linux & MacOS -To build and run the tests of the parser on the crml files -``` -# build the parser/translator and run the tests -make -# to clean the repository -make clean -``` +## Build + +You can use gradle to build the project from scratch. + + +## VSCode plugin + +[project repoisotry](https://github.com/lenaRB/crml-vscode) + -## Build on Windows -To build and run the tests of the parser/translator on the crml files -``` -project-run.bat -REM to clean call: project-clean.bat -``` # CRML specification -The documentation for CRML can be found [HERE](https://github.com/lenaRB/crml-compiler/tree/main/language_specification) +The documentation for CRML can be found [HERE](./CRML_specification_v1.2.pdf) diff --git a/documentation/crml_specification/CRML_specification_v1.2.pdf b/documentation/crml_specification/CRML_specification_v1.2.pdf new file mode 100644 index 0000000..df5cee7 Binary files /dev/null and b/documentation/crml_specification/CRML_specification_v1.2.pdf differ diff --git a/documentation/embrace-website/homepage.html b/documentation/embrace-website/homepage.html new file mode 100644 index 0000000..3204760 --- /dev/null +++ b/documentation/embrace-website/homepage.html @@ -0,0 +1,17 @@ + + + + Embrace project + + +

The next industrial revolution is evident in the combination of renewables, + electric mobility and connected objects. The proper operation of complex systems requires + cooperation between all stakeholders from the start of system design and all along the engineering + lifecycle. The EMBrACE project will provide a user-friendly open environment for the co-design of + CPS based on a common requirements modelling language, so that requirements can be easily understood, + used to verify and optimise the system design, and ensure that the system design is robust in the face + of real-life physical and economic constraints and uncertainties.

+

The project resulted in the CRML specification and compiler and the OMSimulator simulation tools.

+ + + \ No newline at end of file diff --git a/doc/2023_MasterThesis_New-design-method-based-for-Small-Modular-Reactors.pdf b/documentation/resources/2023_MasterThesis_New-design-method-based-for-Small-Modular-Reactors.pdf similarity index 100% rename from doc/2023_MasterThesis_New-design-method-based-for-Small-Modular-Reactors.pdf rename to documentation/resources/2023_MasterThesis_New-design-method-based-for-Small-Modular-Reactors.pdf diff --git a/doc/2023_ModelicaConf_CRML_paper_final.pdf b/documentation/resources/2023_ModelicaConf_CRML_paper_final.pdf similarity index 100% rename from doc/2023_ModelicaConf_CRML_paper_final.pdf rename to documentation/resources/2023_ModelicaConf_CRML_paper_final.pdf diff --git a/doc/2023_ModelicaConf_CRML_slides_final.pdf b/documentation/resources/2023_ModelicaConf_CRML_slides_final.pdf similarity index 100% rename from doc/2023_ModelicaConf_CRML_slides_final.pdf rename to documentation/resources/2023_ModelicaConf_CRML_slides_final.pdf diff --git a/doc/2024_OpenModelica-Workshop_OpenModelica-CRML-integration.pdf b/documentation/resources/2024_OpenModelica-Workshop_OpenModelica-CRML-integration.pdf similarity index 100% rename from doc/2024_OpenModelica-Workshop_OpenModelica-CRML-integration.pdf rename to documentation/resources/2024_OpenModelica-Workshop_OpenModelica-CRML-integration.pdf diff --git a/doc/2025_MODPROD_OpenModelica_CRML_integration.pdf b/documentation/resources/2025_MODPROD_OpenModelica_CRML_integration.pdf similarity index 100% rename from doc/2025_MODPROD_OpenModelica_CRML_integration.pdf rename to documentation/resources/2025_MODPROD_OpenModelica_CRML_integration.pdf diff --git a/documentation/resources/README.md b/documentation/resources/README.md new file mode 100644 index 0000000..d13bc75 --- /dev/null +++ b/documentation/resources/README.md @@ -0,0 +1 @@ +# List of CRML related publications and research material \ No newline at end of file diff --git a/resources/modelica_libraries/CRML.mo b/libraries/modelica/CRML.mo similarity index 100% rename from resources/modelica_libraries/CRML.mo rename to libraries/modelica/CRML.mo diff --git a/resources/modelica_libraries/CRMLtoModelica.mo b/libraries/modelica/CRMLtoModelica.mo similarity index 99% rename from resources/modelica_libraries/CRMLtoModelica.mo rename to libraries/modelica/CRMLtoModelica.mo index 7963dd5..5130f85 100644 --- a/resources/modelica_libraries/CRMLtoModelica.mo +++ b/libraries/modelica/CRMLtoModelica.mo @@ -572,6 +572,15 @@ end cvBooleanToBoolean4; end ClockAdd; + model setAnd + + input Types.Boolean4 [:] r1; + + output Types.Boolean4 out; + equation + + end setAnd; + diff --git a/resources/crml_tutorial/traffic_light/Spec_simplified.crml b/resources/crml_tutorial/traffic_light/Spec_simplified.crml index cd79b24..58bc872 100644 --- a/resources/crml_tutorial/traffic_light/Spec_simplified.crml +++ b/resources/crml_tutorial/traffic_light/Spec_simplified.crml @@ -1,6 +1,10 @@ +//model TrafficLightSpecification is flatten ETLlibrary union { + model TrafficLightSpecification is { // Requirement model for the traffic light example + + // User-defined types and operators // Definition of Requirement type //Type Requirement is Boolean; @@ -34,7 +38,7 @@ model TrafficLightSpecification is { // Operators for the evaluation of requirements // Check Operator [ Boolean ] 'check' Boolean phi 'over' Periods P - = and ('evaluate' phi 'over' P); + = and ('evaluate' phi 'over' P.element); // Category c1 is Category increasing1 //= { (>, >), (>=, >=), (<, >=), (<=, >), (==, >), (<>, >) }; @@ -64,7 +68,7 @@ model TrafficLightSpecification is { // Checking that the number of event occurrences at the end of a time period is lower or higher than a threshold // Option 1: without category Operator [ Boolean ] Periods P 'check count' Clock E '==' Integer n - = 'check'(('count' E 'inside' P) == n) 'over' P; + = 'check'(('count' E 'inside' P.element) == n) 'over' P; // // Option 2 (later support): with category // Operator [ Boolean ] Periods P 'check count' Clock E '==' Integer n diff --git a/resources/crml_tutorial/traffic_light/TrafficLightSpecification_articleModelicaConf2025.crml b/resources/crml_tutorial/traffic_light/TrafficLightSpecification_articleModelicaConf2025.crml new file mode 100644 index 0000000..cf7da48 --- /dev/null +++ b/resources/crml_tutorial/traffic_light/TrafficLightSpecification_articleModelicaConf2025.crml @@ -0,0 +1,54 @@ +model TrafficLightSpecification_article is + // Import of libraries + flatten {ETL, FORM_L} + union { + // List of external variables + Boolean red is external; + Boolean yellow is external; + Boolean green is external; + + Boolean operation is external; + Boolean night_mode is external; + Boolean day_mode is not night_mode; + + // Definition of requirements + // req0: "During operation, no more than one light should be on (a flashing mode could be specified later)" + Boolean{} lights is {red, yellow, green}; + Integer n_lights_on is card { filter lights (element == true) }; + + Requirement req0 is + ('during' operation) ('check anytime' (n_lights_on <= 1) ); + + // Day_mode + // req1: "After green, next step is yellow" + Requirement req1 is + (( 'after' ( green 'becomes true' ) 'before' ( yellow 'becomes true' )) while day_mode) + ('check count' (red 'becomes true') '==' 0); + + // req2: "Step green should stay active for at least 30 seconds" + Requirement req2 is + (( 'after' (green 'becomes true') 'for' 30) while day_mode) + ('ensure' green); + + // req3: "After green becomes active + 30 seconds, next step should turn yellow within 0.2 seconds" + Requirement req3 is + (( 'after' (green 'becomes true' + 30) 'for' 0.2) while day_mode) + ('check at end' yellow); + + // Night_mode + // req4: "During night, yellow should only be used" + Requirement req4 is + ('during' night_mode) + ('check count' ( (red or green) 'becomes true') '==' 0); + // req5: "During night, yellow should flash every 2 seconds" + Requirement req5a is + ('during' night_mode) + ('check count' ( yellow 'becomes true') '<>' 0); + Requirement req5b is + ('after' ( yellow 'becomes true') 'within' 2) while night_mode) + ('ensure' yellow); + Requirement req5c is + ('after' ( yellow 'becomes true') 'for' 2) while night_mode) + ('check at end' not yellow); + Requirement req5 is req5a and req5b and req5c; +}; \ No newline at end of file diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/BecomesFalse.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/BecomesFalse.mo deleted file mode 100644 index fc8ec95..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/BecomesFalse.mo +++ /dev/null @@ -1,68 +0,0 @@ -within CRML_test.ETL.BecomesFalse; -partial model BecomesFalse - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,10},{-100,-10}}))); - CRML.ETL.Connectors.ClockOutput - c_b1_becomes_false - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{-6,-6},{6,6}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent(x(start=true)) - annotation (Placement(transformation(extent={{-54,-4},{-46,4}}))); - CRML.Blocks.Logical4.Not4 not4_1 - annotation (Placement(transformation(extent={{-88,-10},{-68,10}}))); - CRML.Blocks.Events.ShowEvent showEvent_c_b1_becomes_false - annotation (Placement(transformation(extent={{60,-56},{68,-48}}))); -equation - connect(clockEvent.y, c_b1_becomes_false) annotation (Line( - points={{6.6,0},{110,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent.u, event4ToEvent.y) - annotation (Line(points={{-6.6,0},{-45.6,0}}, color={217,67,180})); - connect(event4ToEvent.u, not4_1.y) - annotation (Line(points={{-54.4,0},{-67,0}}, color={162,29,33})); - connect(b1, not4_1.u) - annotation (Line(points={{-110,0},{-89,0}}, color={0,0,0})); - connect(showEvent_c_b1_becomes_false.u, event4ToEvent.y) annotation (Line( - points={{59.6,-52},{-36,-52},{-36,0},{-45.6,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,102},{100,-98}}, - lineColor={0,0,0}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Text( - extent={{-250,170},{250,110}}, - textString="%name", - lineColor={0,0,255}), Line(points={{-80,34}, - {-50,34},{-4,34},{-50,34},{-50,34},{52,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Line(points={{-86,-52},{-50,-52},{-50,-8},{-8,-8},{-8,-54},{-8,-54}}, - color={0,0,0}), - Line( - points={{54,78},{54,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Line(points={{-8,-54},{28,-54},{28,-8},{52,-8},{52,-54},{76,-54}}, - color={0,0,0}), - Line( - points={{-8,78},{-8,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Ellipse( - extent={{44,88},{64,68}}, - lineColor={0,140,72}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Ellipse( - extent={{-18,88},{2,68}}, - lineColor={0,140,72}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid)}), Diagram( - coordinateSystem(preserveAspectRatio=false)), - Documentation(info=" -")); -end BecomesFalse; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/BecomesFalse_externals.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/BecomesFalse_externals.mo deleted file mode 100644 index 2b279dc..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/BecomesFalse_externals.mo +++ /dev/null @@ -1,23 +0,0 @@ -within CRML_test.ETL.BecomesFalse; -model BecomesFalse_externals - CRML.Blocks.Logical.BooleanTable booleanTable( - y0=false, - option_width=false, - instant={2.5,5,7.5,9}) - 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(booleanTable.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(booleanTable.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; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/BecomesFalse_verif.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/BecomesFalse_verif.mo deleted file mode 100644 index 44aa3e5..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/BecomesFalse_verif.mo +++ /dev/null @@ -1,26 +0,0 @@ -within CRML_test.ETL.BecomesFalse; -model BecomesFalse_verif - extends BecomesFalse; - BecomesFalse_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end BecomesFalse_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/package.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/package.mo deleted file mode 100644 index f578927..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package BecomesFalse -end BecomesFalse; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/package.order b/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/package.order deleted file mode 100644 index 313b301..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse/package.order +++ /dev/null @@ -1,3 +0,0 @@ -BecomesFalse -BecomesFalse_externals -BecomesFalse_verif diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/BecomesFalseInside.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/BecomesFalseInside.mo deleted file mode 100644 index dcecc94..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/BecomesFalseInside.mo +++ /dev/null @@ -1,67 +0,0 @@ -within CRML_test.ETL.BecomesFalseInside; -partial model BecomesFalseInside - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,60},{-100,40}}))); - CRML.ETL.Connectors.ClockOutput c_b1_becomes_false_inside_p1 - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - Utilities.TimeLocatorConnector P1 - annotation (Placement(transformation(extent={{-120,-60},{-100,-40}}))); - CRML.ETL.Blocks.Events.BecomesFalse becomesFalse - annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - CRML.ETL.Blocks.Clocks.Inside inside - annotation (Placement(transformation(extent={{0,-10},{20,10}}))); -equation - connect(b1, becomesFalse.b1) annotation (Line(points={{-110,50},{-80,50},{-80, - 0},{-61,0}}, color={0,0,0})); - connect(P1, inside.tl) annotation (Line(points={{-110,-50},{-80,-50},{-80,-40}, - {-20,-40},{-20,-3},{-1,-3}}, color={0,0,0})); - connect(inside.y, c_b1_becomes_false_inside_p1) annotation (Line( - points={{21,0},{110,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(becomesFalse.y, inside.u) annotation (Line( - points={{-39,0},{-6,0},{-6,3},{-1,3}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Line( - points={{28,78},{28,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Text( - extent={{-250,170},{250,110}}, - textString="%name", - lineColor={0,0,255}), Line(points={{-80,34}, - {-50,34},{-50,78},{-50,78},{-50,34},{52,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Line(points={{-86,34},{-50,34},{-50,78},{-8,78},{-8,32},{-8,34}}, - color={162,29,33}), - Ellipse( - extent={{-18,88},{2,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line(points={{-8,34},{28,34},{28,78},{52,78},{52,34},{76,34}}, - color={162,29,33}), - Ellipse( - extent={{42,88},{62,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line(points={{-90,-50},{-64,-50},{-64,-6},{16,-6},{16,-52},{84,-52}}, - color={28,108,200}), - Ellipse( - extent={{-18,4},{2,-16}}, - lineColor={0,140,72}, - fillPattern=FillPattern.Solid, - fillColor={255,255,255})}), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BecomesFalseInside; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/BecomesFalseInside_externals.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/BecomesFalseInside_externals.mo deleted file mode 100644 index 7f4c1ea..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/BecomesFalseInside_externals.mo +++ /dev/null @@ -1,48 +0,0 @@ -within CRML_test.ETL.BecomesFalseInside; -model BecomesFalseInside_externals - CRML.ETL.Connectors.Boolean4Output b1 - annotation (Placement(transformation(extent={{100,30},{120,50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-4,36},{4,44}}))); -public - CRML.Blocks.Logical.BooleanTable booleanTable2( - y0=false, - option_width=false, - instant={3.5,4.5}) - annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - CRML.ETL.Connectors.TimeLocatorOutput tl1 - annotation (Placement(transformation(extent={{100,-50},{120,-30}}))); - CRML.Blocks.Logical.BooleanTable booleanTable(option_width=false, instant={ - 2.5,5,7.5,9}) - annotation (Placement(transformation(extent={{-60,-30},{-40,-10}}))); - CRML.Blocks.Events.ShowEvent showEvent_b1 - annotation (Placement(transformation(extent={{16,-14},{24,-6}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{40,-40},{60,-20}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_3 - annotation (Placement(transformation(extent={{-4,-34},{4,-26}}))); - CRML.CompilerCompliancy.CRMLPeriodTimePeriod cRMLPeriodTimePeriod - annotation (Placement(transformation(extent={{40,-80},{60,-60}}))); - CRML.ETL.Connectors.CRMLPeriodOutput P1 - annotation (Placement(transformation(extent={{100,-90},{120,-70}}))); -equation - connect(booleanToBoolean4_1.y, b1) - annotation (Line(points={{4.4,40},{110,40}}, - color={162,29,33})); - connect(booleanTable2.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,40},{-4.4,40}}, color={217,67,180})); - connect(booleanTable.y, showEvent_b1.u) annotation (Line(points={{-39,-20},{ - -12,-20},{-12,-10},{15.6,-10}}, color={217,67,180})); - connect(booleanTable.y, booleanToBoolean4_3.u) annotation (Line(points={{-39, - -20},{-12,-20},{-12,-30},{-4.4,-30}}, color={217,67,180})); - connect(booleanToBoolean4_3.y,during. u) - annotation (Line(points={{4.4,-30},{39,-30}}, color={162,29,33})); - connect(tl1, during.y[1]) - annotation (Line(points={{110,-40},{50,-40}}, color={0,0,255})); - connect(during.y[1], cRMLPeriodTimePeriod.tl) - annotation (Line(points={{50,-40},{50,-60}}, color={0,0,255})); - connect(cRMLPeriodTimePeriod.y, P1) annotation (Line(points={{61,-70},{80,-70}, - {80,-80},{110,-80}}, color={255,170,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BecomesFalseInside_externals; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/BecomesFalseInside_verif.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/BecomesFalseInside_verif.mo deleted file mode 100644 index 61420cf..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/BecomesFalseInside_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.ETL.BecomesFalseInside; -model BecomesFalseInside_verif - extends BecomesFalseInside; - BecomesFalseInside_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - P1 =externals.tl1; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end BecomesFalseInside_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/package.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/package.mo deleted file mode 100644 index 53c1a57..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package BecomesFalseInside -end BecomesFalseInside; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/package.order b/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/package.order deleted file mode 100644 index ea67178..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside/package.order +++ /dev/null @@ -1,3 +0,0 @@ -BecomesFalseInside -BecomesFalseInside_externals -BecomesFalseInside_verif diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside_no_ext/BecomesFalseInside_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside_no_ext/BecomesFalseInside_no_ext.mo deleted file mode 100644 index d3cfacb..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside_no_ext/BecomesFalseInside_no_ext.mo +++ /dev/null @@ -1,82 +0,0 @@ -within CRML_test.ETL.BecomesFalseInside_no_ext; -model BecomesFalseInside_no_ext - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - instant={3.5,4.5}, - option_width=false) - annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-24,6},{-16,14}}))); - CRML.Blocks.Logical.BooleanConstant b3 - annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{-24,-34},{-16,-26}}))); - CRML.Blocks.Logical.BooleanConstant b4(K=false) - annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_3 - annotation (Placement(transformation(extent={{-24,-74},{-16,-66}}))); - CRML.ETL.Connectors.ClockOutput c_b2_becomes_true_inside_p1 - annotation (Placement(transformation(extent={{100,20},{120,40}}))); - CRML.ETL.Connectors.ClockOutput c_b3_becomes_true_inside_p1 - annotation (Placement(transformation(extent={{100,-20},{120,0}}))); - CRML.ETL.Connectors.ClockOutput c_b4_becomes_true_inside_p1 - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2.5,5,7.5,9}) - annotation (Placement(transformation(extent={{-180,50},{-160,70}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_4 - annotation (Placement(transformation(extent={{-124,56},{-116,64}}))); - CRML.ETL.Blocks.Events.BecomesFalseInside becomesFalseInside - annotation (Placement(transformation(extent={{0,20},{20,40}}))); - CRML.ETL.Blocks.Events.BecomesFalseInside becomesFalseInside2 - annotation (Placement(transformation(extent={{0,-20},{20,0}}))); - CRML.ETL.Blocks.Events.BecomesFalseInside becomesFalseInside1 - annotation (Placement(transformation(extent={{0,-60},{20,-40}}))); -equation - connect(b2.y, booleanToBoolean4_1.u) - annotation (Line(points={{-59,10},{-24.4,10}}, color={217,67,180})); - connect(b3.y, booleanToBoolean4_2.u) annotation (Line(points={{-59,-30},{ - -24.4,-30}}, color={217,67,180})); - connect(b4.y, booleanToBoolean4_3.u) - annotation (Line(points={{-59,-70},{-24.4,-70}}, color={217,67,180})); - connect(b1.y, booleanToBoolean4_4.u) - annotation (Line(points={{-159,60},{-124.4,60}}, color={217,67,180})); - connect(booleanToBoolean4_4.y,during. u) - annotation (Line(points={{-115.6,60},{-81,60}}, - color={162,29,33})); - connect(becomesFalseInside.y, c_b2_becomes_true_inside_p1) annotation (Line( - points={{21,30},{110,30}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(becomesFalseInside2.y, c_b3_becomes_true_inside_p1) annotation (Line( - points={{21,-10},{110,-10}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(becomesFalseInside1.y, c_b4_becomes_true_inside_p1) annotation (Line( - points={{21,-50},{110,-50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(during.y[1], becomesFalseInside.P1) - annotation (Line(points={{-70,50},{-70,25},{-1,25}}, color={0,0,255})); - connect(becomesFalseInside2.P1, becomesFalseInside.P1) annotation (Line( - points={{-1,-15},{-40,-15},{-40,25},{-1,25}}, color={0,0,255})); - connect(becomesFalseInside1.P1, becomesFalseInside.P1) annotation (Line( - points={{-1,-55},{-40,-55},{-40,25},{-1,25}}, color={0,0,255})); - connect(becomesFalseInside.b1, booleanToBoolean4_1.y) annotation (Line(points= - {{-1,35},{-8,35},{-8,10},{-15.6,10}}, color={162,29,33})); - connect(booleanToBoolean4_2.y, becomesFalseInside2.b1) annotation (Line( - points={{-15.6,-30},{-8,-30},{-8,-5},{-1,-5}}, color={162,29,33})); - connect(booleanToBoolean4_3.y, becomesFalseInside1.b1) annotation (Line( - points={{-15.6,-70},{-8,-70},{-8,-45},{-1,-45}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-250, - -100},{250,100}})), Diagram( - coordinateSystem(preserveAspectRatio=false, extent={{-250,-100},{250, - 100}}))); -end BecomesFalseInside_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside_no_ext/package.mo deleted file mode 100644 index 4b81810..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package BecomesFalseInside_no_ext -end BecomesFalseInside_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside_no_ext/package.order deleted file mode 100644 index 7dde0ce..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalseInside_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -BecomesFalseInside_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse_no_ext/BecomesFalse_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalse_no_ext/BecomesFalse_no_ext.mo deleted file mode 100644 index 5a35200..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse_no_ext/BecomesFalse_no_ext.mo +++ /dev/null @@ -1,59 +0,0 @@ -within CRML_test.ETL.BecomesFalse_no_ext; -model BecomesFalse_no_ext - CRML.Blocks.Events.ClockEvent clockEvent1 - annotation (Placement(transformation(extent={{24,44},{36,56}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent(x(start=true)) - annotation (Placement(transformation(extent={{-4,46},{4,54}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - instant={2.5,5,7.5,9}, - option_width=false) - annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-44,46},{-36,54}}))); - CRML.Blocks.Events.ClockEvent clockEvent2 - annotation (Placement(transformation(extent={{24,4},{36,16}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent1(x(start=true)) - annotation (Placement(transformation(extent={{-4,6},{4,14}}))); - CRML.Blocks.Logical.BooleanConstant b2 - annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{-44,6},{-36,14}}))); - CRML.ETL.Connectors.ClockOutput c1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.ClockOutput c2 - annotation (Placement(transformation(extent={{100,0},{120,20}}))); - CRML.Blocks.Logical4.Not4 not4_1 - annotation (Placement(transformation(extent={{-30,40},{-10,60}}))); - CRML.Blocks.Logical4.Not4 not4_2 - annotation (Placement(transformation(extent={{-30,0},{-10,20}}))); -equation - connect(clockEvent1.u, event4ToEvent.y) - annotation (Line(points={{23.4,50},{4.4,50}}, color={217,67,180})); - connect(clockEvent2.u, event4ToEvent1.y) - annotation (Line(points={{23.4,10},{4.4,10}}, color={217,67,180})); - connect(clockEvent1.y, c1) annotation (Line( - points={{36.6,50},{110,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent2.y, c2) annotation (Line( - points={{36.6,10},{110,10}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(b2.y, booleanToBoolean4_2.u) - annotation (Line(points={{-59,10},{-44.4,10}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, not4_2.u) - annotation (Line(points={{-35.6,10},{-31,10}}, color={162,29,33})); - connect(not4_2.y, event4ToEvent1.u) - annotation (Line(points={{-9,10},{-4.4,10}}, color={162,29,33})); - connect(b1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-59,50},{-44.4,50}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, not4_1.u) - annotation (Line(points={{-35.6,50},{-31,50}}, color={162,29,33})); - connect(not4_1.y, event4ToEvent.u) - annotation (Line(points={{-9,50},{-4.4,50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BecomesFalse_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesFalse_no_ext/package.mo deleted file mode 100644 index fa2d775..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse_no_ext/package.mo +++ /dev/null @@ -1,4 +0,0 @@ -within CRML_test.ETL; -package BecomesFalse_no_ext - -end BecomesFalse_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/BecomesFalse_no_ext/package.order deleted file mode 100644 index 3328ab0..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesFalse_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -BecomesFalse_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/BecomesTrue.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/BecomesTrue.mo deleted file mode 100644 index 368cc06..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/BecomesTrue.mo +++ /dev/null @@ -1,54 +0,0 @@ -within CRML_test.ETL.BecomesTrue; -partial model BecomesTrue - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,10},{-100,-10}}))); - CRML.ETL.Connectors.ClockOutput - c_b1_becomes_true - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{-6,-6},{6,6}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent - annotation (Placement(transformation(extent={{-54,-4},{-46,4}}))); -equation - connect(clockEvent.y, c_b1_becomes_true) annotation (Line( - points={{6.6,0},{110,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(b1, event4ToEvent.u) - annotation (Line(points={{-110,0},{-54.4,0}}, color={0,0,0})); - connect(clockEvent.u, event4ToEvent.y) - annotation (Line(points={{-6.6,0},{-45.6,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Text( - extent={{-250,170},{250,110}}, - textString="%name", - lineColor={0,0,255}), Line(points={{-80,34}, - {-50,34},{-50,78},{-50,78},{-50,34},{52,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Line(points={{-86,-52},{-50,-52},{-50,-8},{-8,-8},{-8,-54},{-8,-54}}, - color={0,0,0}), - Line( - points={{30,78},{30,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Ellipse( - extent={{-60,88},{-40,68}}, - lineColor={0,140,72}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Line(points={{-8,-54},{28,-54},{28,-8},{52,-8},{52,-54},{76,-54}}, - color={0,0,0}), - Ellipse( - extent={{20,88},{40,68}}, - lineColor={0,140,72}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid)}), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BecomesTrue; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/BecomesTrue_externals.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/BecomesTrue_externals.mo deleted file mode 100644 index 72b5392..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/BecomesTrue_externals.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.ETL.BecomesTrue; -model BecomesTrue_externals - CRML.Blocks.Events.EventPeriodic eventPeriodic1(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(eventPeriodic1.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(showEvent_eventPeriodic_b1.u, eventPeriodic1.y) annotation (Line( - points={{-20.4,-40},{-30,-40},{-30,0},{-39,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BecomesTrue_externals; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/BecomesTrue_verif.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/BecomesTrue_verif.mo deleted file mode 100644 index 2706894..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/BecomesTrue_verif.mo +++ /dev/null @@ -1,30 +0,0 @@ -within CRML_test.ETL.BecomesTrue; -model BecomesTrue_verif - extends BecomesTrue; - BecomesTrue_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - CRML.Blocks.Events.ShowEvent show_c_b1_becomes_true - annotation (Placement(transformation(extent={{52,-44},{60,-36}}))); -equation - // Bindings - b1 = externals.b1; - connect(show_c_b1_becomes_true.u, event4ToEvent.y) annotation (Line(points={{ - 51.6,-40},{-20,-40},{-20,0},{-45.6,0}}, color={217,67,180})); - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end BecomesTrue_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/package.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/package.mo deleted file mode 100644 index 9b9f3c9..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package BecomesTrue -end BecomesTrue; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/package.order b/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/package.order deleted file mode 100644 index d942d53..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue/package.order +++ /dev/null @@ -1,3 +0,0 @@ -BecomesTrue -BecomesTrue_externals -BecomesTrue_verif diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/BecomesTrueInside.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/BecomesTrueInside.mo deleted file mode 100644 index 9519d73..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/BecomesTrueInside.mo +++ /dev/null @@ -1,68 +0,0 @@ -within CRML_test.ETL.BecomesTrueInside; -partial model BecomesTrueInside - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,60},{-100,40}}))); - CRML.ETL.Connectors.ClockOutput - c_b1_becomes_true_inside_p1 - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - Utilities.TimeLocatorConnector P1 - annotation (Placement(transformation(extent={{-120,-60},{-100,-40}}))); - CRML.ETL.Blocks.Events.BecomesTrue becomesTrue - annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - CRML.ETL.Blocks.Clocks.Inside inside - annotation (Placement(transformation(extent={{0,-10},{20,10}}))); -equation - connect(b1, becomesTrue.b1) annotation (Line(points={{-110,50},{-80,50},{-80, - 0},{-61,0}}, color={0,0,0})); - connect(inside.u, becomesTrue.y) annotation (Line( - points={{-1,3},{-28,3},{-28,0},{-39,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(P1, inside.tl) annotation (Line(points={{-110,-50},{-80,-50},{-80,-40}, - {-20,-40},{-20,-3},{-1,-3}}, color={0,0,0})); - connect(inside.y, c_b1_becomes_true_inside_p1) annotation (Line( - points={{21,0},{110,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Line( - points={{28,78},{28,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Text( - extent={{-250,170},{250,110}}, - textString="%name", - lineColor={0,0,255}), Line(points={{-80,34}, - {-50,34},{-50,78},{-50,78},{-50,34},{52,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Line(points={{-86,34},{-50,34},{-50,78},{-8,78},{-8,32},{-8,34}}, - color={162,29,33}), - Ellipse( - extent={{-60,88},{-40,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line(points={{-8,34},{28,34},{28,78},{52,78},{52,34},{76,34}}, - color={162,29,33}), - Ellipse( - extent={{18,88},{38,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line(points={{-90,-50},{-64,-50},{-64,-6},{16,-6},{16,-52},{84,-52}}, - color={28,108,200}), - Ellipse( - extent={{-58,4},{-38,-16}}, - lineColor={0,140,72}, - fillPattern=FillPattern.Solid, - fillColor={255,255,255})}), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BecomesTrueInside; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/BecomesTrueInside_externals.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/BecomesTrueInside_externals.mo deleted file mode 100644 index 8ab3435..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/BecomesTrueInside_externals.mo +++ /dev/null @@ -1,50 +0,0 @@ -within CRML_test.ETL.BecomesTrueInside; -model BecomesTrueInside_externals - CRML.ETL.Connectors.Boolean4Output b1 - annotation (Placement(transformation(extent={{100,30},{120,50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-4,36},{4,44}}))); -public - CRML.Blocks.Logical.BooleanTable booleanTable2( - y0=false, - option_width=false, - instant={3.5,4.5}) - annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - CRML.ETL.Connectors.TimeLocatorOutput tl1 - annotation (Placement(transformation(extent={{100,-50},{120,-30}}))); - CRML.Blocks.Logical.BooleanTable booleanTable1( - y0=false, - option_width=false, - instant={2.5,5,7.5,9}) - annotation (Placement(transformation(extent={{-60,-30},{-40,-10}}))); - CRML.Blocks.Events.ShowEvent showEvent_b1 - annotation (Placement(transformation(extent={{16,-14},{24,-6}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{40,-40},{60,-20}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_3 - annotation (Placement(transformation(extent={{-4,-34},{4,-26}}))); - CRML.CompilerCompliancy.CRMLPeriodTimePeriod cRMLPeriodTimePeriod - annotation (Placement(transformation(extent={{40,-80},{60,-60}}))); - CRML.ETL.Connectors.CRMLPeriodOutput P1 - annotation (Placement(transformation(extent={{100,-80},{120,-60}}))); -equation - connect(booleanToBoolean4_1.y, b1) - annotation (Line(points={{4.4,40},{110,40}}, - color={162,29,33})); - connect(booleanTable2.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,40},{-4.4,40}}, color={217,67,180})); - connect(booleanTable1.y, showEvent_b1.u) annotation (Line(points={{-39,-20},{ - -12,-20},{-12,-10},{15.6,-10}}, color={217,67,180})); - connect(booleanTable1.y, booleanToBoolean4_3.u) annotation (Line(points={{-39, - -20},{-12,-20},{-12,-30},{-4.4,-30}}, color={217,67,180})); - connect(booleanToBoolean4_3.y,during. u) - annotation (Line(points={{4.4,-30},{39,-30}}, color={162,29,33})); - connect(tl1, during.y[1]) - annotation (Line(points={{110,-40},{50,-40}}, color={0,0,255})); - connect(during.y[1], cRMLPeriodTimePeriod.tl) - annotation (Line(points={{50,-40},{50,-60}}, color={0,0,255})); - connect(cRMLPeriodTimePeriod.y, P1) - annotation (Line(points={{61,-70},{110,-70}}, color={255,170,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BecomesTrueInside_externals; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/BecomesTrueInside_verif.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/BecomesTrueInside_verif.mo deleted file mode 100644 index c55ec43..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/BecomesTrueInside_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.ETL.BecomesTrueInside; -model BecomesTrueInside_verif - extends BecomesTrueInside; - BecomesTrueInside_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - P1 =externals.tl1; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end BecomesTrueInside_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/package.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/package.mo deleted file mode 100644 index 6176b45..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package BecomesTrueInside -end BecomesTrueInside; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/package.order b/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/package.order deleted file mode 100644 index ac47cdf..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside/package.order +++ /dev/null @@ -1,3 +0,0 @@ -BecomesTrueInside -BecomesTrueInside_externals -BecomesTrueInside_verif diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside_no_ext/BecomesTrueInside_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside_no_ext/BecomesTrueInside_no_ext.mo deleted file mode 100644 index 0ef9c0f..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside_no_ext/BecomesTrueInside_no_ext.mo +++ /dev/null @@ -1,82 +0,0 @@ -within CRML_test.ETL.BecomesTrueInside_no_ext; -model BecomesTrueInside_no_ext - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - instant={3.5,4.5}, - option_width=false) - annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-24,6},{-16,14}}))); - CRML.Blocks.Logical.BooleanConstant b3 - annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{-24,-34},{-16,-26}}))); - CRML.Blocks.Logical.BooleanConstant b4(K=false) - annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_3 - annotation (Placement(transformation(extent={{-24,-74},{-16,-66}}))); - CRML.ETL.Connectors.ClockOutput c_b2_becomes_true_inside_p1 - annotation (Placement(transformation(extent={{100,20},{120,40}}))); - CRML.ETL.Connectors.ClockOutput c_b3_becomes_true_inside_p1 - annotation (Placement(transformation(extent={{100,-20},{120,0}}))); - CRML.ETL.Connectors.ClockOutput c_b4_becomes_true_inside_p1 - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2.5,5,7.5,9}) - annotation (Placement(transformation(extent={{-180,50},{-160,70}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_4 - annotation (Placement(transformation(extent={{-124,56},{-116,64}}))); - CRML.ETL.Blocks.Events.BecomesTrueInside becomesTrueInside1 - annotation (Placement(transformation(extent={{0,20},{20,40}}))); - CRML.ETL.Blocks.Events.BecomesTrueInside becomesTrueInside2 - annotation (Placement(transformation(extent={{0,-20},{20,0}}))); - CRML.ETL.Blocks.Events.BecomesTrueInside becomesTrueInside3 - annotation (Placement(transformation(extent={{0,-60},{20,-40}}))); -equation - connect(b2.y, booleanToBoolean4_1.u) - annotation (Line(points={{-59,10},{-24.4,10}}, color={217,67,180})); - connect(b3.y, booleanToBoolean4_2.u) annotation (Line(points={{-59,-30},{ - -24.4,-30}}, color={217,67,180})); - connect(b4.y, booleanToBoolean4_3.u) - annotation (Line(points={{-59,-70},{-24.4,-70}}, color={217,67,180})); - connect(b1.y, booleanToBoolean4_4.u) - annotation (Line(points={{-159,60},{-124.4,60}}, color={217,67,180})); - connect(booleanToBoolean4_4.y,during. u) - annotation (Line(points={{-115.6,60},{-81,60}}, - color={162,29,33})); - connect(during.y[1], becomesTrueInside1.tl) - annotation (Line(points={{-70,50},{-70,25},{-1,25}}, color={0,0,255})); - connect(becomesTrueInside1.y, c_b2_becomes_true_inside_p1) annotation (Line( - points={{21,30},{110,30}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(becomesTrueInside2.y, c_b3_becomes_true_inside_p1) annotation (Line( - points={{21,-10},{110,-10}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(becomesTrueInside3.y, c_b4_becomes_true_inside_p1) annotation (Line( - points={{21,-50},{110,-50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(booleanToBoolean4_3.y, becomesTrueInside3.u) annotation (Line(points= - {{-15.6,-70},{-10,-70},{-10,-46},{-1,-46},{-1,-45}}, color={162,29,33})); - connect(booleanToBoolean4_2.y, becomesTrueInside2.u) annotation (Line(points= - {{-15.6,-30},{-8,-30},{-8,-5},{-1,-5}}, color={162,29,33})); - connect(booleanToBoolean4_1.y, becomesTrueInside1.u) annotation (Line(points= - {{-15.6,10},{-6,10},{-6,35},{-1,35}}, color={162,29,33})); - connect(becomesTrueInside2.tl, becomesTrueInside1.tl) annotation (Line(points= - {{-1,-15},{-40,-15},{-40,25},{-1,25}}, color={0,0,255})); - connect(becomesTrueInside3.tl, becomesTrueInside1.tl) annotation (Line(points= - {{-1,-55},{-40,-55},{-40,25},{-1,25}}, color={0,0,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-250, - -100},{250,100}})), Diagram( - coordinateSystem(preserveAspectRatio=false, extent={{-250,-100},{250, - 100}}))); -end BecomesTrueInside_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside_no_ext/package.mo deleted file mode 100644 index 884862a..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package BecomesTrueInside_no_ext -end BecomesTrueInside_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside_no_ext/package.order deleted file mode 100644 index f64e4ff..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrueInside_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -BecomesTrueInside_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue_no_ext/BecomesTrue_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrue_no_ext/BecomesTrue_no_ext.mo deleted file mode 100644 index d631e99..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue_no_ext/BecomesTrue_no_ext.mo +++ /dev/null @@ -1,86 +0,0 @@ -within CRML_test.ETL.BecomesTrue_no_ext; -model BecomesTrue_no_ext - CRML.Blocks.Events.ClockEvent clockEvent1 - annotation (Placement(transformation(extent={{24,44},{36,56}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent(x(start=true)) - annotation (Placement(transformation(extent={{-4,46},{4,54}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - instant={2.5,5,7.5,9}, - option_width=false) - annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-24,46},{-16,54}}))); - CRML.Blocks.Events.ShowEvent show_c1 - annotation (Placement(transformation(extent={{56,32},{64,40}}))); - CRML.Blocks.Events.ClockEvent clockEvent2 - annotation (Placement(transformation(extent={{24,4},{36,16}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent1(x(start=true)) - annotation (Placement(transformation(extent={{-4,6},{4,14}}))); - CRML.Blocks.Logical.BooleanConstant b2 - annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{-24,6},{-16,14}}))); - CRML.Blocks.Events.ShowEvent show_c2 - annotation (Placement(transformation(extent={{56,-8},{64,0}}))); - CRML.Blocks.Events.ClockEvent clockEvent3 - annotation (Placement(transformation(extent={{24,-36},{36,-24}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent2 - annotation (Placement(transformation(extent={{-4,-34},{4,-26}}))); - CRML.Blocks.Logical.BooleanConstant b3(K=false) - annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_3 - annotation (Placement(transformation(extent={{-24,-34},{-16,-26}}))); - CRML.Blocks.Events.ShowEvent show_c3 - annotation (Placement(transformation(extent={{56,-48},{64,-40}}))); - CRML.ETL.Connectors.ClockOutput c1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.ClockOutput c2 - annotation (Placement(transformation(extent={{100,0},{120,20}}))); - CRML.ETL.Connectors.ClockOutput c3 - annotation (Placement(transformation(extent={{100,-40},{120,-20}}))); -equation - connect(clockEvent1.u, event4ToEvent.y) - annotation (Line(points={{23.4,50},{4.4,50}}, color={217,67,180})); - connect(b1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-59,50},{-24.4,50}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, event4ToEvent.u) - annotation (Line(points={{-15.6,50},{-4.4,50}}, color={162,29,33})); - connect(show_c1.u, event4ToEvent.y) annotation (Line(points={{55.6,36},{12,36}, - {12,50},{4.4,50}}, color={217,67,180})); - connect(clockEvent2.u, event4ToEvent1.y) - annotation (Line(points={{23.4,10},{4.4,10}}, color={217,67,180})); - connect(b2.y, booleanToBoolean4_2.u) annotation (Line(points={{-59,10},{-24.4, - 10}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, event4ToEvent1.u) annotation (Line(points={{-15.6, - 10},{-4.4,10}}, color={162,29, - 33})); - connect(show_c2.u, event4ToEvent1.y) annotation (Line(points={{55.6,-4},{12, - -4},{12,10},{4.4,10}}, - color={217,67,180})); - connect(clockEvent3.u, event4ToEvent2.y) - annotation (Line(points={{23.4,-30},{4.4,-30}}, color={217,67,180})); - connect(b3.y, booleanToBoolean4_3.u) - annotation (Line(points={{-59,-30},{-24.4,-30}}, color={217,67,180})); - connect(booleanToBoolean4_3.y, event4ToEvent2.u) - annotation (Line(points={{-15.6,-30},{-4.4,-30}}, color={162,29,33})); - connect(show_c3.u, event4ToEvent2.y) annotation (Line(points={{55.6,-44},{12, - -44},{12,-30},{4.4,-30}}, color={217,67,180})); - connect(clockEvent1.y, c1) annotation (Line( - points={{36.6,50},{110,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent2.y, c2) annotation (Line( - points={{36.6,10},{110,10}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent3.y, c3) annotation (Line( - points={{36.6,-30},{110,-30}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BecomesTrue_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/BecomesTrue_no_ext/package.mo deleted file mode 100644 index 52ecbc2..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package BecomesTrue_no_ext -end BecomesTrue_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/BecomesTrue_no_ext/package.order deleted file mode 100644 index 5aeb596..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/BecomesTrue_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -BecomesTrue_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/CheckOver/CheckOver.mo b/resources/modelica_libraries/CRML_test/ETL/CheckOver/CheckOver.mo deleted file mode 100644 index d0c0c29..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CheckOver/CheckOver.mo +++ /dev/null @@ -1,62 +0,0 @@ -within CRML_test.ETL.CheckOver; -partial block CheckOver - Utilities.Boolean4Connector phi1 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,-10},{-100,10}}), iconTransformation( - extent={{-120,-10},{-100,10}}))); - Utilities.TimeLocatorConnector[N] P1 annotation (Placement(transformation( - extent={{-10,90},{10,110}}), iconTransformation(extent={{-10,90},{10, - 110}}))); - CRML.ETL.Connectors.Boolean4Output b_check_over - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.ETL.Requirements.CheckOver checkOver annotation( - Placement(transformation(extent = {{-10, -10}, {10, 10}}))); -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; -equation -// Text( -// extent={{-74,32},{74,-36}}, -// lineColor={0,0,0}, -// fillColor={28,108,200}, -// fillPattern=FillPattern.Solid, -// textString=boxName), - connect(checkOver.y, b_check_over) annotation( - Line(points = {{12, 0}, {110, 0}}, color = {162, 29, 33})); - connect(checkOver.tl, P1) annotation( - Line(points = {{0, 10}, {0, 100}}, color = {0, 0, 255}, thickness = 0.5)); - connect(checkOver.u, phi1) annotation( - Line(points = {{-10, 0}, {-110, 0}}, color = {162, 29, 33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - fillColor={162,29,33}, - lineThickness=5, - fillPattern=FillPattern.Solid, - borderPattern=BorderPattern.Raised, - lineColor={0,0,0}), - Rectangle( - extent={{-78,80},{82,-80}}, - lineColor={175,175,175}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Text( - extent={{-70,72},{70,44}}, - lineColor={28,108,200}, - textString="check"), - Text( - extent={{-70,18},{70,-10}}, - lineColor={28,108,200}, - textString="over")}), Diagram( - coordinateSystem(preserveAspectRatio=false)), - Documentation(info=" -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end CheckOver; diff --git a/resources/modelica_libraries/CRML_test/ETL/CheckOver/CheckOver_externals.mo b/resources/modelica_libraries/CRML_test/ETL/CheckOver/CheckOver_externals.mo deleted file mode 100644 index 18effa8..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CheckOver/CheckOver_externals.mo +++ /dev/null @@ -1,56 +0,0 @@ -within CRML_test.ETL.CheckOver; -model CheckOver_externals - inner CRML.TimeLocators.Continuous.Master master annotation( - Placement(transformation(origin = {50, -10}, extent = {{-10, -10}, {10, 10}}))); - CRML.Blocks.Logical.BooleanTable boolean4Constant1( - y0=false, - option_width=false, - instant={2,3.5}) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2.5,5}) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.Boolean4Output phi1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-20,46},{-12,54}}))); - CRML.Blocks.Logical4.And4 and4_1 - annotation (Placement(transformation(extent={{0,32},{20,52}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant3(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-34,20},{-14,40}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{-4,-54},{4,-46}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] tl1 - annotation (Placement(transformation(extent={{100,-40},{120,-20}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - CRML.ETL.Connectors.CRMLPeriodOutput P1 - annotation (Placement(transformation(extent={{100,-90},{120,-70}}))); - CRML.CompilerCompliancy.CRMLPeriodTimePeriod cRMLPeriodTimePeriod - annotation (Placement(transformation(extent={{40,-90},{60,-70}}))); - protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; -equation - connect(boolean4Constant1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{-20.4,50}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, and4_1.u1) - annotation (Line(points={{-11.6,50},{-1,50}}, color={162,29,33})); - connect(boolean4Constant3.y, and4_1.u2) annotation (Line(points={{-13,30},{-6, - 30},{-6,34},{-1,34}}, color={162,29,33})); - connect(and4_1.y, phi1) annotation (Line(points={{21,42},{66,42},{66,50},{110, - 50}}, color={162,29,33})); - connect(b1.y, booleanToBoolean4_2.u) - annotation (Line(points={{-39,-50},{-4.4,-50}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, during.u) - annotation (Line(points={{4.4,-50},{39,-50}}, color={162,29,33})); - connect(during.y, tl1) annotation (Line(points={{50,-60},{50,-64},{96,-64},{ - 96,-30},{110,-30}}, color={0,0,255})); - connect(cRMLPeriodTimePeriod.tl, during.y[1]) - annotation (Line(points={{50,-70},{50,-60}}, color={0,0,255})); - connect(cRMLPeriodTimePeriod.y, P1) - annotation (Line(points={{61,-80},{110,-80}}, color={255,170,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end CheckOver_externals; diff --git a/resources/modelica_libraries/CRML_test/ETL/CheckOver/CheckOver_verif.mo b/resources/modelica_libraries/CRML_test/ETL/CheckOver/CheckOver_verif.mo deleted file mode 100644 index 2733366..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CheckOver/CheckOver_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.ETL.CheckOver; -model CheckOver_verif - extends CheckOver; - CheckOver_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - P1[:] =externals.tl1[:]; - phi1 =externals.phi1; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end CheckOver_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/CheckOver/package.mo b/resources/modelica_libraries/CRML_test/ETL/CheckOver/package.mo deleted file mode 100644 index 027aebc..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CheckOver/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package CheckOver -end CheckOver; diff --git a/resources/modelica_libraries/CRML_test/ETL/CheckOver/package.order b/resources/modelica_libraries/CRML_test/ETL/CheckOver/package.order deleted file mode 100644 index a81f4c3..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CheckOver/package.order +++ /dev/null @@ -1,3 +0,0 @@ -CheckOver -CheckOver_externals -CheckOver_verif diff --git a/resources/modelica_libraries/CRML_test/ETL/CheckOver_no_ext/CheckOver_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/CheckOver_no_ext/CheckOver_no_ext.mo deleted file mode 100644 index 2d752f9..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CheckOver_no_ext/CheckOver_no_ext.mo +++ /dev/null @@ -1,56 +0,0 @@ -within CRML_test.ETL.CheckOver_no_ext; -model CheckOver_no_ext - import CRML_test; - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - CRML.Blocks.Logical.BooleanTable phi1( - y0=false, - option_width=false, - instant={2,3.5}) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2.5,5}) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-20,46},{-12,54}}))); - CRML.Blocks.Logical4.And4 and4_1 - annotation (Placement(transformation(extent={{0,32},{20,52}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant3(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-34,20},{-14,40}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{-4,-54},{4,-46}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - CRML.ETL.Connectors.Boolean4Output b_check_over - annotation (Placement(transformation(extent={{316,-10},{336,10}}))); - CRML.ETL.Requirements.CheckOver checkOver - annotation (Placement(transformation(extent={{180,-10},{200,10}}))); -equation - connect(phi1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{-20.4,50}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, and4_1.u1) - annotation (Line(points={{-11.6,50},{-1,50}}, color={162,29,33})); - connect(boolean4Constant3.y, and4_1.u2) annotation (Line(points={{-13,30},{-6, - 30},{-6,34},{-1,34}}, color={162,29,33})); - connect(b1.y, booleanToBoolean4_2.u) - annotation (Line(points={{-39,-50},{-4.4,-50}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, during.u) - annotation (Line(points={{4.4,-50},{39,-50}}, color={162,29,33})); - connect(checkOver.y, b_check_over) - annotation (Line(points={{201,0},{326,0}}, color={162,29,33})); - connect(during.y, checkOver.tl) annotation (Line(points={{50,-60},{50,-78},{ - 140,-78},{140,38},{190,38},{190,10}}, color={0,0,255})); - connect(and4_1.y, checkOver.u) annotation (Line(points={{21,42},{62,42},{62, - 40},{100,40},{100,0},{179,0}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-100,-100},{320,100}}, - initialScale=0.1)), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-100,-100},{320,100}}, - initialScale=0.1))); -end CheckOver_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/CheckOver_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/CheckOver_no_ext/package.mo deleted file mode 100644 index f14ef8d..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CheckOver_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package CheckOver_no_ext -end CheckOver_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/CheckOver_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/CheckOver_no_ext/package.order deleted file mode 100644 index 9370f90..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CheckOver_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -CheckOver_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/CountInside/CountInside.mo b/resources/modelica_libraries/CRML_test/ETL/CountInside/CountInside.mo deleted file mode 100644 index dd9223c..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CountInside/CountInside.mo +++ /dev/null @@ -1,102 +0,0 @@ -within CRML_test.ETL.CountInside; -partial model CountInside - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - Utilities.TimeLocatorConnector - P1 - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - Utilities.ClockConnector C1 - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - CRML.ETL.Connectors.IntegerOutput i_count_ticks_of_c1_inside_p1 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.ETL.Blocks.Clocks.Inside inside - annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - CRML.Blocks.Events.EventCounter eventCounter - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean - annotation (Placement(transformation(extent={{-4,-4},{4,4}}))); - CRML.Blocks.Logical.BooleanConstant booleanConstant(K=false) - annotation (Placement(transformation(extent={{20,-60},{40,-40}}))); -equation - connect(eventCounter.y, i_count_ticks_of_c1_inside_p1) - annotation (Line(points={{61,0},{110,0}}, color={255,127,0})); - connect(inside.y, clockToBoolean.u) annotation (Line( - points={{-39,0},{-4.8,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean.y, eventCounter.u) - annotation (Line(points={{4.4,0},{39,0}}, color={217,67,180})); - connect(inside.u, C1) annotation (Line( - points={{-61,3},{-80,3},{-80,30},{-110,30}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(inside.tl, P1) annotation (Line(points={{-61,-3},{-80,-3},{-80,-30},{ - -110,-30}}, color={0,0,255})); - connect(booleanConstant.y, eventCounter.reset) - annotation (Line(points={{41,-50},{50,-50},{50,-11}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Text( - extent={{-250,170},{250,110}}, - textString="%name", - lineColor={0,0,255}), Line(points={{-72,34}, - {-28,34},{-28,78},{-28,78},{-28,34},{74,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Ellipse( - extent={{-38,88},{-18,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line(points={{-86,-32},{-50,-32},{-50,12},{60,12},{60,-34},{88,-34}}, - color={28,108,200}), - Ellipse( - extent={{4,88},{24,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line( - points={{14,78},{14,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Ellipse( - extent={{64,88},{84,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line( - points={{74,78},{74,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Ellipse( - extent={{-82,88},{-62,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line( - points={{-72,78},{-72,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Ellipse( - extent={{-38,22},{-18,2}}, - lineColor={0,140,72}, - fillPattern=FillPattern.Solid, - fillColor={255,255,255}), - Ellipse( - extent={{4,22},{24,2}}, - lineColor={0,140,72}, - fillPattern=FillPattern.Solid, - fillColor={255,255,255}), - Line(points={{-86,-80},{-30,-80},{-30,-66},{12,-66},{12,-54},{76,-54},{ - 76,-54}}, color={244,125,35})}), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end CountInside; diff --git a/resources/modelica_libraries/CRML_test/ETL/CountInside/CountInside_externals.mo b/resources/modelica_libraries/CRML_test/ETL/CountInside/CountInside_externals.mo deleted file mode 100644 index 78d9061..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CountInside/CountInside_externals.mo +++ /dev/null @@ -1,59 +0,0 @@ -within CRML_test.ETL.CountInside; -model CountInside_externals - -public - CRML.Blocks.Logical.BooleanTable bool2( - y0=false, - option_width=false, - instant={2,3,3.5,4.5,6,7.5}) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical.BooleanTable bool1( - y0=false, - option_width=false, - instant={2.5,5}) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.TimeLocatorOutput tl1 - annotation (Placement(transformation(extent={{100,-40},{120,-20}}))); - CRML.Blocks.Events.ShowEvent showEvent_b2 - annotation (Placement(transformation(extent={{16,56},{24,64}}))); - CRML.ETL.Connectors.ClockOutput C1 - annotation (Placement(transformation(extent={{100,0},{120,20}}))); - CRML.Blocks.Events.ShowEvent showEvent_b1 - annotation (Placement(transformation(extent={{16,-44},{24,-36}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{20,0},{40,20}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{40,-70},{60,-50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-4,-64},{4,-56}}))); - inner CRML.TimeLocators.Continuous.Master master - annotation (Placement(transformation(extent={{60,60},{80,80}}))); - CRML.CompilerCompliancy.CRMLPeriodTimePeriod cRMLPeriodTimePeriod - annotation (Placement(transformation(extent={{40,-100},{60,-80}}))); - CRML.ETL.Connectors.CRMLPeriodOutput P1 - annotation (Placement(transformation(extent={{100,-100},{120,-80}}))); -equation - connect(showEvent_b2.u, bool2.y) annotation (Line(points={{15.6,60},{-10,60}, - {-10,50},{-39,50}}, color={217,67,180})); - connect(bool1.y, showEvent_b1.u) annotation (Line(points={{-39,-50},{-12,-50}, - {-12,-40},{15.6,-40}}, color={217,67,180})); - connect(clockEvent.y, C1) annotation (Line( - points={{41,10},{110,10}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent.u, bool2.y) annotation (Line(points={{19,10},{0,10},{0,50}, - {-39,50}}, color={217,67,180})); - connect(during.y[1], tl1) annotation (Line(points={{50,-70},{50,-74},{96,-74}, - {96,-30},{110,-30}}, color={0,0,255})); - connect(bool1.y, booleanToBoolean4_1.u) annotation (Line(points={{-39,-50},{ - -12,-50},{-12,-60},{-4.4,-60}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, during.u) - annotation (Line(points={{4.4,-60},{39,-60}}, color={162,29,33})); - connect(cRMLPeriodTimePeriod.y, P1) - annotation (Line(points={{61,-90},{110,-90}}, color={255,170,255})); - connect(cRMLPeriodTimePeriod.tl, during.y[1]) - annotation (Line(points={{50,-80},{50,-70}}, color={0,0,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end CountInside_externals; diff --git a/resources/modelica_libraries/CRML_test/ETL/CountInside/CountInside_verif.mo b/resources/modelica_libraries/CRML_test/ETL/CountInside/CountInside_verif.mo deleted file mode 100644 index b7b6ccc..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CountInside/CountInside_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.ETL.CountInside; -model CountInside_verif - extends CountInside; - CountInside_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - P1 =externals.tl1; - C1 = externals.C1; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end CountInside_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/CountInside/package.mo b/resources/modelica_libraries/CRML_test/ETL/CountInside/package.mo deleted file mode 100644 index 05a0fcb..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CountInside/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package CountInside -end CountInside; diff --git a/resources/modelica_libraries/CRML_test/ETL/CountInside/package.order b/resources/modelica_libraries/CRML_test/ETL/CountInside/package.order deleted file mode 100644 index f94f2da..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CountInside/package.order +++ /dev/null @@ -1,3 +0,0 @@ -CountInside -CountInside_externals -CountInside_verif diff --git a/resources/modelica_libraries/CRML_test/ETL/CountInside_no_ext/CountInside_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/CountInside_no_ext/CountInside_no_ext.mo deleted file mode 100644 index c9e3f41..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CountInside_no_ext/CountInside_no_ext.mo +++ /dev/null @@ -1,60 +0,0 @@ -within CRML_test.ETL.CountInside_no_ext; -model CountInside_no_ext - - -public - CRML.ETL.Connectors.IntegerOutput i_count_ticks_of_c1_inside_p1 - annotation (Placement(transformation(extent={{160,-10},{180,10}}))); - CRML.ETL.Blocks.Clocks.CountInside countInside - annotation (Placement(transformation(extent={{60,-10},{80,10}}))); -public - CRML.Blocks.Logical.BooleanTable bool2( - y0=false, - option_width=false, - instant={2,3,3.5,4.5,6,7.5}) - annotation (Placement(transformation(extent={{-140,30},{-120,50}}))); - CRML.Blocks.Logical.BooleanTable P1( - y0=false, - option_width=false, - instant={2.5,5}) - annotation (Placement(transformation(extent={{-140,-70},{-120,-50}}))); - CRML.Blocks.Events.ShowEvent showEvent_b2 - annotation (Placement(transformation(extent={{-64,46},{-56,54}}))); - CRML.Blocks.Events.ShowEvent showEvent_b1 - annotation (Placement(transformation(extent={{-64,-54},{-56,-46}}))); - CRML.Blocks.Events.ClockEvent c1 - annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-84,-74},{-76,-66}}))); - inner CRML.TimeLocators.Continuous.Master master - annotation (Placement(transformation(extent={{-20,50},{0,70}}))); -equation - connect(showEvent_b2.u,bool2. y) annotation (Line(points={{-64.4,50},{-90,50}, - {-90,40},{-119,40}},color={217,67,180})); - connect(P1.y, showEvent_b1.u) annotation (Line(points={{-119,-60},{-92,-60},{ - -92,-50},{-64.4,-50}}, color={217,67,180})); - connect(c1.u, bool2.y) annotation (Line(points={{-61,0},{-80,0},{-80,40},{-119, - 40}}, color={217,67,180})); - connect(P1.y, booleanToBoolean4_1.u) annotation (Line(points={{-119,-60},{-92, - -60},{-92,-70},{-84.4,-70}}, color={217,67,180})); - connect(booleanToBoolean4_1.y,during. u) - annotation (Line(points={{-75.6,-70},{-41,-70}}, - color={162,29,33})); - connect(c1.y, countInside.u) annotation (Line( - points={{-39,0},{-39,3},{59,3}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(during.y[1], countInside.tl) annotation (Line(points={{-30,-80},{-30,-86}, - {48,-86},{48,-3},{59,-3}}, color={0,0,255})); - connect(countInside.y, i_count_ticks_of_c1_inside_p1) - annotation (Line(points={{81,0},{170,0}}, color={255,127,0})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-160,-100},{160,100}}, - initialScale=0.1)), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-160,-100},{160,100}}, - initialScale=0.1))); -end CountInside_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/CountInside_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/CountInside_no_ext/package.mo deleted file mode 100644 index 0a0b7f0..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CountInside_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package CountInside_no_ext -end CountInside_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/CountInside_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/CountInside_no_ext/package.order deleted file mode 100644 index cdfa3a5..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CountInside_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -CountInside_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/CteFalse_no_ext/CteFalse_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/CteFalse_no_ext/CteFalse_no_ext.mo deleted file mode 100644 index 5420622..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CteFalse_no_ext/CteFalse_no_ext.mo +++ /dev/null @@ -1,21 +0,0 @@ -within CRML_test.ETL.CteFalse_no_ext; -model CteFalse_no_ext - import CRML; - CRML.ETL.Types.Boolean4 b_true = CRML.ETL.Types.Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = CRML.ETL.Types.Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = CRML.ETL.Types.Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = CRML.ETL.Types.Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_cte_false_true; - CRML.ETL.Types.Boolean4 b_cte_false_false; - CRML.ETL.Types.Boolean4 b_cte_false_undecided; - CRML.ETL.Types.Boolean4 b_cte_false_undefined; - CRML.Blocks.Logical4.Boolean4Constant cte_false(K=CRML.ETL.Types.Boolean4.false4); -equation - b_cte_false_true = cte_false.y; - b_cte_false_false = cte_false.y; - b_cte_false_undecided = cte_false.y; - b_cte_false_undefined = cte_false.y; - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end CteFalse_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/CteFalse_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/CteFalse_no_ext/package.mo deleted file mode 100644 index 4d744cb..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CteFalse_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package CteFalse_no_ext -end CteFalse_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/CteFalse_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/CteFalse_no_ext/package.order deleted file mode 100644 index aafbd84..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CteFalse_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -CteFalse_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/CteTrue_no_ext/CteTrue_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/CteTrue_no_ext/CteTrue_no_ext.mo deleted file mode 100644 index d9f08b0..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CteTrue_no_ext/CteTrue_no_ext.mo +++ /dev/null @@ -1,21 +0,0 @@ -within CRML_test.ETL.CteTrue_no_ext; -model CteTrue_no_ext - import CRML; - CRML.ETL.Types.Boolean4 b_true = CRML.ETL.Types.Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = CRML.ETL.Types.Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = CRML.ETL.Types.Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = CRML.ETL.Types.Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_cte_true_true; - CRML.ETL.Types.Boolean4 b_cte_true_false; - CRML.ETL.Types.Boolean4 b_cte_true_undecided; - CRML.ETL.Types.Boolean4 b_cte_true_undefined; - CRML.Blocks.Logical4.Boolean4Constant cte_true(K=CRML.ETL.Types.Boolean4.true4); -equation - b_cte_true_true = cte_true.y; - b_cte_true_false = cte_true.y; - b_cte_true_undecided = cte_true.y; - b_cte_true_undefined = cte_true.y; - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end CteTrue_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/CteTrue_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/CteTrue_no_ext/package.mo deleted file mode 100644 index e3bcc8a..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CteTrue_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package CteTrue_no_ext -end CteTrue_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/CteTrue_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/CteTrue_no_ext/package.order deleted file mode 100644 index 65d6252..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/CteTrue_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -CteTrue_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/DecideOver/DecideOver.mo b/resources/modelica_libraries/CRML_test/ETL/DecideOver/DecideOver.mo deleted file mode 100644 index ea3166e..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/DecideOver/DecideOver.mo +++ /dev/null @@ -1,71 +0,0 @@ -within CRML_test.ETL.DecideOver; -partial block DecideOver - -public - Utilities.Boolean4Connector phi1 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,-10},{-100,10}}), iconTransformation( - extent={{-120,-10},{-100,10}}))); - Utilities.TimeLocatorConnector P1 annotation (Placement(transformation( - extent={{-10,90},{10,110}}), iconTransformation(extent={{-10,90},{10, - 110}}))); - CRML.ETL.Connectors.Boolean4Output b_decide_over - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.ETL.TimeLocators.Attributes.PeriodEnd - periodEnd - annotation (Placement(transformation(extent={{-4,-12},{4,-4}}))); - CRML.Blocks.Logical4.Or4 or4_n - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4 - annotation (Placement(transformation(extent={{20,-12},{28,-4}}))); -equation - connect(periodEnd.y, booleanToBoolean4.u) - annotation (Line(points={{4.4,-8},{19.6,-8}}, color={217,67,180})); - connect(or4_n.u2, booleanToBoolean4.y) - annotation (Line(points={{39,-8},{28.4,-8}}, color={162,29,33})); - connect(or4_n.y, b_decide_over) - annotation (Line(points={{61,0},{110,0}}, color={162,29,33})); -// Text( -// extent={{-74,32},{74,-36}}, -// lineColor={0,0,0}, -// fillColor={28,108,200}, -// fillPattern=FillPattern.Solid, -// textString=boxName), - connect(or4_n.u1, phi1) annotation (Line(points={{39,8},{-20,8},{-20,0},{-110, - 0}}, color={162,29,33})); - connect(periodEnd.tl, P1) - annotation (Line(points={{0,-4},{0,100}}, color={0,0,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - fillColor={162,29,33}, - lineThickness=5, - fillPattern=FillPattern.Solid, - borderPattern=BorderPattern.Raised, - lineColor={0,0,0}), - Rectangle( - extent={{-78,80},{82,-80}}, - lineColor={175,175,175}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Text( - extent={{-70,72},{70,44}}, - lineColor={28,108,200}, - textString="decide"), - Text( - extent={{-70,18},{70,-10}}, - lineColor={28,108,200}, - textString="over")}), Diagram( - coordinateSystem(preserveAspectRatio=false)), - Documentation(info=" -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end DecideOver; diff --git a/resources/modelica_libraries/CRML_test/ETL/DecideOver/DecideOver_externals.mo b/resources/modelica_libraries/CRML_test/ETL/DecideOver/DecideOver_externals.mo deleted file mode 100644 index be85c19..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/DecideOver/DecideOver_externals.mo +++ /dev/null @@ -1,54 +0,0 @@ -within CRML_test.ETL.DecideOver; -model DecideOver_externals - -public - CRML.Blocks.Logical.BooleanTable boolean4Constant1( - y0=false, - option_width=false, - instant={2,3.5}) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2.5,5}) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.Boolean4Output phi1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-20,46},{-12,54}}))); - CRML.Blocks.Logical4.And4 and4_1 - annotation (Placement(transformation(extent={{0,32},{20,52}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant3(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-34,20},{-14,40}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{-4,-54},{4,-46}}))); - CRML.ETL.Connectors.TimeLocatorOutput tl1 - annotation (Placement(transformation(extent={{100,-40},{120,-20}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - CRML.ETL.Connectors.CRMLPeriodOutput P1 - annotation (Placement(transformation(extent={{100,-100},{120,-80}}))); - CRML.CompilerCompliancy.CRMLPeriodTimePeriod cRMLPeriodTimePeriod - annotation (Placement(transformation(extent={{40,-100},{60,-80}}))); -equation - connect(boolean4Constant1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{-20.4,50}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, and4_1.u1) - annotation (Line(points={{-11.6,50},{-1,50}}, color={162,29,33})); - connect(boolean4Constant3.y, and4_1.u2) annotation (Line(points={{-13,30},{-6, - 30},{-6,34},{-1,34}}, color={162,29,33})); - connect(and4_1.y, phi1) annotation (Line(points={{21,42},{66,42},{66,50},{110, - 50}}, color={162,29,33})); - connect(b1.y, booleanToBoolean4_2.u) - annotation (Line(points={{-39,-50},{-4.4,-50}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, during.u) - annotation (Line(points={{4.4,-50},{39,-50}}, color={162,29,33})); - connect(during.y[1], tl1) annotation (Line(points={{50,-60},{50,-64},{96,-64}, - {96,-30},{110,-30}}, color={0,0,255})); - connect(cRMLPeriodTimePeriod.y, P1) - annotation (Line(points={{61,-90},{110,-90}}, color={255,170,255})); - connect(cRMLPeriodTimePeriod.tl, during.y[1]) - annotation (Line(points={{50,-80},{50,-60}}, color={0,0,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end DecideOver_externals; diff --git a/resources/modelica_libraries/CRML_test/ETL/DecideOver/DecideOver_verif.mo b/resources/modelica_libraries/CRML_test/ETL/DecideOver/DecideOver_verif.mo deleted file mode 100644 index a7ed669..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/DecideOver/DecideOver_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.ETL.DecideOver; -model DecideOver_verif - extends DecideOver; - DecideOver_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - P1 =externals.tl1; - phi1 =externals.phi1; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end DecideOver_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/DecideOver/package.mo b/resources/modelica_libraries/CRML_test/ETL/DecideOver/package.mo deleted file mode 100644 index 7d10fc4..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/DecideOver/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package DecideOver -end DecideOver; diff --git a/resources/modelica_libraries/CRML_test/ETL/DecideOver/package.order b/resources/modelica_libraries/CRML_test/ETL/DecideOver/package.order deleted file mode 100644 index 8595ef1..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/DecideOver/package.order +++ /dev/null @@ -1,3 +0,0 @@ -DecideOver -DecideOver_externals -DecideOver_verif diff --git a/resources/modelica_libraries/CRML_test/ETL/DecideOver_no_ext/DecideOver_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/DecideOver_no_ext/DecideOver_no_ext.mo deleted file mode 100644 index 86bd55e..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/DecideOver_no_ext/DecideOver_no_ext.mo +++ /dev/null @@ -1,55 +0,0 @@ -within CRML_test.ETL.DecideOver_no_ext; -model DecideOver_no_ext - import CRML_test; - - -public - CRML.Blocks.Logical.BooleanTable phi1( - y0=false, - option_width=false, - instant={2,3.5}) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2.5,5}) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-20,46},{-12,54}}))); - CRML.Blocks.Logical4.And4 and4_1 - annotation (Placement(transformation(extent={{0,32},{20,52}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant3(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-34,20},{-14,40}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{-4,-54},{4,-46}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - CRML.ETL.Connectors.Boolean4Output b_decide_over - annotation (Placement(transformation(extent={{320,-10},{340,10}}))); - CRML.ETL.Requirements.DecideOver decideOver - annotation (Placement(transformation(extent={{160,-20},{200,20}}))); -equation - connect(phi1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{-20.4,50}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, and4_1.u1) - annotation (Line(points={{-11.6,50},{-1,50}}, color={162,29,33})); - connect(boolean4Constant3.y, and4_1.u2) annotation (Line(points={{-13,30},{-6, - 30},{-6,34},{-1,34}}, color={162,29,33})); - connect(b1.y, booleanToBoolean4_2.u) - annotation (Line(points={{-39,-50},{-4.4,-50}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, during.u) - annotation (Line(points={{4.4,-50},{39,-50}}, color={162,29,33})); - connect(decideOver.y, b_decide_over) - annotation (Line(points={{202,0},{330,0}}, color={162,29,33})); - connect(and4_1.y, decideOver.u) annotation (Line(points={{21,42},{56,42},{56,38}, - {60,38},{60,0},{158,0}}, color={162,29,33})); - connect(decideOver.tl, during.y[1]) annotation (Line(points={{180,20},{180,40}, - {120,40},{120,-70},{50,-70},{50,-60}}, color={0,0,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-100,-100},{320,100}}, - initialScale=0.1)), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-100,-100},{320,100}}, - initialScale=0.1)), - experiment(StopTime=14, __Dymola_Algorithm="Dassl")); -end DecideOver_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/DecideOver_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/DecideOver_no_ext/package.mo deleted file mode 100644 index f4ba2b7..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/DecideOver_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package DecideOver_no_ext -end DecideOver_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/DecideOver_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/DecideOver_no_ext/package.order deleted file mode 100644 index 1812f9a..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/DecideOver_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -DecideOver_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/EvaluateOver.mo b/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/EvaluateOver.mo deleted file mode 100644 index c064bfa..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/EvaluateOver.mo +++ /dev/null @@ -1,90 +0,0 @@ -within CRML_test.ETL.EvaluateOver; -partial block EvaluateOver - -public - Utilities.Boolean4Connector phi1 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,-10},{-100,10}}), iconTransformation( - extent={{-120,-10},{-100,10}}))); - Utilities.TimeLocatorConnector P1 annotation (Placement(transformation( - extent={{-10,90},{10,110}}), iconTransformation(extent={{-10,90},{10, - 110}}))); - CRML.ETL.Connectors.Boolean4Output b_evaluate_over - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - IntegrateUndefined integrateUndefined - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Requirements.DecideOver decideOver - annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant(K=CRML.ETL.Types.Boolean4.false4) - annotation (Placement(transformation(extent={{-20,40},{0,60}}))); - CRML.Blocks.Events.EventFilter eventFilter - annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4 - annotation (Placement(transformation(extent={{6,-4},{14,4}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent - annotation (Placement(transformation(extent={{-44,4},{-36,12}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent1 - annotation (Placement(transformation(extent={{-44,-24},{-36,-16}}))); -equation -// Text( -// extent={{-74,32},{74,-36}}, -// lineColor={0,0,0}, -// fillColor={28,108,200}, -// fillPattern=FillPattern.Solid, -// textString=boxName), - connect(decideOver.u, phi1) - annotation (Line(points={{-81,0},{-110,0}}, color={162,29,33})); - connect(eventFilter.y, booleanToBoolean4.u) - annotation (Line(points={{1,0},{5.6,0}}, color={217,67,180})); - connect(decideOver.y, event4ToEvent.u) annotation (Line(points={{-59,0},{-50,0}, - {-50,8},{-44.4,8}}, color={162,29,33})); - connect(event4ToEvent1.u, phi1) annotation (Line(points={{-44.4,-20},{-90,-20}, - {-90,0},{-110,0}}, color={162,29,33})); - connect(event4ToEvent1.y, eventFilter.u) annotation (Line(points={{-35.6,-20}, - {-26,-20},{-26,0},{-21,0}}, color={217,67,180})); - connect(event4ToEvent.y, eventFilter.cond) - annotation (Line(points={{-35.6,8},{-21,8}}, color={217,67,180})); - connect(decideOver.tl, P1) annotation (Line(points={{-70,10},{-70,80},{0,80}, - {0,100}}, color={0,0,255})); - connect(integrateUndefined.tl, P1) annotation (Line(points={{50,10},{50,80},{ - 0,80},{0,100}}, color={0,0,255})); - connect(boolean4Constant.y, integrateUndefined.a) annotation (Line(points={{1, - 50},{20,50},{20,8},{39,8}}, color={162,29,33})); - connect(booleanToBoolean4.y, integrateUndefined.u) - annotation (Line(points={{14.4,0},{39,0}}, color={162,29,33})); - connect(integrateUndefined.y, b_evaluate_over) - annotation (Line(points={{61,0},{110,0}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - fillColor={162,29,33}, - lineThickness=5, - fillPattern=FillPattern.Solid, - borderPattern=BorderPattern.Raised, - lineColor={0,0,0}), - Rectangle( - extent={{-78,80},{82,-80}}, - lineColor={175,175,175}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Text( - extent={{-70,72},{70,44}}, - lineColor={28,108,200}, - textString="Check"), - Text( - extent={{-70,18},{70,-10}}, - lineColor={28,108,200}, - textString="at end")}), Diagram( - coordinateSystem(preserveAspectRatio=false)), - Documentation(info=" -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end EvaluateOver; diff --git a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/EvaluateOver_externals.mo b/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/EvaluateOver_externals.mo deleted file mode 100644 index 10bf011..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/EvaluateOver_externals.mo +++ /dev/null @@ -1,55 +0,0 @@ -within CRML_test.ETL.EvaluateOver; -model EvaluateOver_externals - - -public - CRML.Blocks.Logical.BooleanTable boolean4Constant1( - y0=false, - option_width=false, - instant={2,3.5}) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2.5,5}) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.Boolean4Output phi1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-20,46},{-12,54}}))); - CRML.Blocks.Logical4.And4 and4_1 - annotation (Placement(transformation(extent={{0,32},{20,52}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant3(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-34,20},{-14,40}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{-4,-54},{4,-46}}))); - CRML.ETL.Connectors.TimeLocatorOutput tl1 - annotation (Placement(transformation(extent={{100,-40},{120,-20}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - CRML.ETL.Connectors.CRMLPeriodOutput P1 - annotation (Placement(transformation(extent={{100,-90},{120,-70}}))); - CRML.CompilerCompliancy.CRMLPeriodTimePeriod cRMLPeriodTimePeriod - annotation (Placement(transformation(extent={{40,-90},{60,-70}}))); -equation - connect(boolean4Constant1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{-20.4,50}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, and4_1.u1) - annotation (Line(points={{-11.6,50},{-1,50}}, color={162,29,33})); - connect(boolean4Constant3.y, and4_1.u2) annotation (Line(points={{-13,30},{-6, - 30},{-6,34},{-1,34}}, color={162,29,33})); - connect(and4_1.y, phi1) annotation (Line(points={{21,42},{66,42},{66,50},{110, - 50}}, color={162,29,33})); - connect(b1.y, booleanToBoolean4_2.u) - annotation (Line(points={{-39,-50},{-4.4,-50}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, during.u) - annotation (Line(points={{4.4,-50},{39,-50}}, color={162,29,33})); - connect(during.y[1], tl1) annotation (Line(points={{50,-60},{50,-64},{96,-64}, - {96,-30},{110,-30}}, color={0,0,255})); - connect(cRMLPeriodTimePeriod.tl, during.y[1]) - annotation (Line(points={{50,-70},{50,-60}}, color={0,0,255})); - connect(cRMLPeriodTimePeriod.y, P1) - annotation (Line(points={{61,-80},{110,-80}}, color={255,170,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end EvaluateOver_externals; diff --git a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/EvaluateOver_verif.mo b/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/EvaluateOver_verif.mo deleted file mode 100644 index dedef8d..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/EvaluateOver_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.ETL.EvaluateOver; -model EvaluateOver_verif - extends EvaluateOver; - EvaluateOver_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - P1 =externals.tl1; - phi1 =externals.phi1; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end EvaluateOver_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/IntegrateUndefined.mo b/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/IntegrateUndefined.mo deleted file mode 100644 index 64c925d..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/IntegrateUndefined.mo +++ /dev/null @@ -1,65 +0,0 @@ -within CRML_test.ETL.EvaluateOver; -block IntegrateUndefined - import CRML.ETL.Types.Boolean4; - -protected - Boolean4 x(start=Boolean4.undefined, fixed=true); - Boolean4 d; - Boolean4 c; - Boolean4 v; - Boolean timePeriod(start=false, fixed=true) = tl.timePeriod; - Boolean not_timePeriod(start=true, fixed=true) = not tl.timePeriod; - Boolean sync1(start=false, fixed=true); - Boolean sync2(start=false, fixed=true); - -public - CRML.ETL.Connectors.Boolean4Input u(start=Boolean4.false4, fixed=true) - annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - CRML.ETL.Connectors.Boolean4Output y - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.ETL.Connectors.TimeLocatorInput tl - annotation (Placement(transformation(extent={{-10,90},{10,110}}))); -public - CRML.ETL.Connectors.Boolean4Input a - annotation (Placement(transformation(extent={{-120,70},{-100,90}}))); - // Not taken into account in this version (set to undefined by default) -equation - - /* Compute the decision event d */ - d = CRML.Blocks.Logical4.or4(Boolean4.true4, CRML.ETL.Types.cvBooleanToBoolean4(edge( - not_timePeriod))); - - /* Determine whether the change of the condition u happens at the same instant as the start of the time period tl */ - sync1 = u <> pre(u) and edge(timePeriod); - - /* Determine whether the change of the condition u happens at the same instant as the end of the time period tl */ - sync2 = u <> pre(u) and edge(not_timePeriod); - - /* Compute the condition c from the condition u within the bounds of the time period tl */ - c = if (tl.isLeftBoundaryIncluded and edge(sync1)) or (not tl.isRightBoundaryIncluded and edge(sync2)) then pre(u) else u; - - /* Compute the integral of c over the time period tl, taking into account the fact - that the same time thread tl may accomodate several non-overlapping time periods */ - v = if timePeriod or edge(not_timePeriod) then - CRML.ETL.Evaluator.TemporalOperators.mul4(d, c) else Boolean4.undefined; - x = if edge(timePeriod) then CRML.Blocks.Logical4.and4(pre(x), v) else - CRML.ETL.Evaluator.TemporalOperators.add4(pre(x), v); - - /* The output y is the value of the integral of c until the current time */ - y = x; - - annotation (Placement(transformation(extent={{100,-90},{120,-70}})), - Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - fillColor={255,213,170}, - lineThickness=5, - fillPattern=FillPattern.Solid, - borderPattern=BorderPattern.Raised, - lineColor={0,0,0}), Text( - extent={{-76,54},{74,-50}}, - lineColor={0,0,0}, - fontName="Symbol", - textString="")}), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end IntegrateUndefined; diff --git a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/package.mo b/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/package.mo deleted file mode 100644 index faf2ea3..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package EvaluateOver -end EvaluateOver; diff --git a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/package.order b/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/package.order deleted file mode 100644 index 7a9b230..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver/package.order +++ /dev/null @@ -1,4 +0,0 @@ -EvaluateOver -EvaluateOver_externals -EvaluateOver_verif -IntegrateUndefined diff --git a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver_no_ext/EvaluateOver_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/EvaluateOver_no_ext/EvaluateOver_no_ext.mo deleted file mode 100644 index 11421ea..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver_no_ext/EvaluateOver_no_ext.mo +++ /dev/null @@ -1,56 +0,0 @@ -within CRML_test.ETL.EvaluateOver_no_ext; -model EvaluateOver_no_ext - import CRML_test; - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - CRML.Blocks.Logical.BooleanTable phi1( - y0=false, - option_width=false, - instant={2,3.5}) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2.5,5}) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-20,46},{-12,54}}))); - CRML.Blocks.Logical4.And4 and4_1 - annotation (Placement(transformation(extent={{0,32},{20,52}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant3(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-34,20},{-14,40}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{-4,-54},{4,-46}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - CRML.ETL.Connectors.Boolean4Output b_evaluate_over - annotation (Placement(transformation(extent={{316,-10},{336,10}}))); - CRML.ETL.Requirements.EvaluateOver evaluateOver - annotation (Placement(transformation(extent={{160,-10},{180,10}}))); -equation - connect(phi1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{-20.4,50}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, and4_1.u1) - annotation (Line(points={{-11.6,50},{-1,50}}, color={162,29,33})); - connect(boolean4Constant3.y, and4_1.u2) annotation (Line(points={{-13,30},{-6, - 30},{-6,34},{-1,34}}, color={162,29,33})); - connect(b1.y, booleanToBoolean4_2.u) - annotation (Line(points={{-39,-50},{-4.4,-50}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, during.u) - annotation (Line(points={{4.4,-50},{39,-50}}, color={162,29,33})); - connect(and4_1.y, evaluateOver.u) annotation (Line(points={{21,42},{78,42},{ - 78,0},{159,0}}, color={162,29,33})); - connect(during.y[1], evaluateOver.tl) annotation (Line(points={{50,-60},{50, - -80},{140,-80},{140,20},{170,20},{170,10}}, color={0,0,255})); - connect(evaluateOver.y, b_evaluate_over) - annotation (Line(points={{181,0},{326,0}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-100,-100},{320,100}}, - initialScale=0.1)), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-100,-100},{320,100}}, - initialScale=0.1))); -end EvaluateOver_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/EvaluateOver_no_ext/package.mo deleted file mode 100644 index d6801b8..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package EvaluateOver_no_ext -end EvaluateOver_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/EvaluateOver_no_ext/package.order deleted file mode 100644 index b090072..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/EvaluateOver_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -EvaluateOver_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/Id_no_ext/Id_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/Id_no_ext/Id_no_ext.mo deleted file mode 100644 index 7e4f1c6..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Id_no_ext/Id_no_ext.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.ETL.Id_no_ext; -model Id_no_ext - import CRML.ETL.Types.Boolean4; - CRML.ETL.Types.Boolean4 b_true = Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_id_true; - CRML.ETL.Types.Boolean4 b_id_false; - CRML.ETL.Types.Boolean4 b_id_undecided; - CRML.ETL.Types.Boolean4 b_id_undefined; -equation - b_id_true = b_true; - b_id_false = b_false; - b_id_undecided = b_undecided; - b_id_undefined = b_undefined; - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end Id_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Id_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/Id_no_ext/package.mo deleted file mode 100644 index f02d347..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Id_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package Id_no_ext -end Id_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Id_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/Id_no_ext/package.order deleted file mode 100644 index 14a00af..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Id_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -Id_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/Implies/Implies.mo b/resources/modelica_libraries/CRML_test/ETL/Implies/Implies.mo deleted file mode 100644 index 51c17fc..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Implies/Implies.mo +++ /dev/null @@ -1,13 +0,0 @@ -within CRML_test.ETL.Implies; -partial model Implies - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.Boolean4Connector b2 - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - Utilities.Boolean4Connector b1_implies_b2 - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); -equation - b1_implies_b2 = CRML.Blocks.Logical4.implies4(b1, b2); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end Implies; diff --git a/resources/modelica_libraries/CRML_test/ETL/Implies/Implies_externals.mo b/resources/modelica_libraries/CRML_test/ETL/Implies/Implies_externals.mo deleted file mode 100644 index ef90b3a..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Implies/Implies_externals.mo +++ /dev/null @@ -1,18 +0,0 @@ -within CRML_test.ETL.Implies; -model Implies_externals - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant1(K=CRML.ETL.Types.Boolean4.true4) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant2(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.Boolean4Output b1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.Boolean4Output b2 - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); -equation - connect(boolean4Constant1.y, b1) - annotation (Line(points={{-39,50},{110,50}}, color={162,29,33})); - connect(boolean4Constant2.y, b2) - annotation (Line(points={{-39,-50},{110,-50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end Implies_externals; diff --git a/resources/modelica_libraries/CRML_test/ETL/Implies/Implies_verif.mo b/resources/modelica_libraries/CRML_test/ETL/Implies/Implies_verif.mo deleted file mode 100644 index 294b2a8..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Implies/Implies_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.ETL.Implies; -model Implies_verif - extends Implies; - Implies_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - b2 = externals.b2; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end Implies_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/Implies/package.mo b/resources/modelica_libraries/CRML_test/ETL/Implies/package.mo deleted file mode 100644 index aa99a45..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Implies/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package Implies -end Implies; diff --git a/resources/modelica_libraries/CRML_test/ETL/Implies/package.order b/resources/modelica_libraries/CRML_test/ETL/Implies/package.order deleted file mode 100644 index a3c2991..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Implies/package.order +++ /dev/null @@ -1,3 +0,0 @@ -Implies -Implies_externals -Implies_verif diff --git a/resources/modelica_libraries/CRML_test/ETL/Implies_no_ext/Implies_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/Implies_no_ext/Implies_no_ext.mo deleted file mode 100644 index 287a15d..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Implies_no_ext/Implies_no_ext.mo +++ /dev/null @@ -1,47 +0,0 @@ -within CRML_test.ETL.Implies_no_ext; -model Implies_no_ext - import CRML.ETL.Types.Boolean4; - CRML.ETL.Types.Boolean4 b_true = Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_true_implies_true; - CRML.ETL.Types.Boolean4 b_true_implies_false; - CRML.ETL.Types.Boolean4 b_true_implies_undecided; - CRML.ETL.Types.Boolean4 b_true_implies_undefined; - CRML.ETL.Types.Boolean4 b_false_implies_true; - CRML.ETL.Types.Boolean4 b_false_implies_false; - CRML.ETL.Types.Boolean4 b_false_implies_undecided; - CRML.ETL.Types.Boolean4 b_false_implies_undefined; - CRML.ETL.Types.Boolean4 b_undecided_implies_true; - CRML.ETL.Types.Boolean4 b_undecided_implies_false; - CRML.ETL.Types.Boolean4 b_undecided_implies_undecided; - CRML.ETL.Types.Boolean4 b_undecided_implies_undefined; - CRML.ETL.Types.Boolean4 b_undefined_implies_true; - CRML.ETL.Types.Boolean4 b_undefined_implies_false; - CRML.ETL.Types.Boolean4 b_undefined_implies_undecided; - CRML.ETL.Types.Boolean4 b_undefined_implies_undefined; -equation - b_true_implies_true = CRML.Blocks.Logical4.implies4(b_true, b_true); - b_true_implies_false = CRML.Blocks.Logical4.implies4(b_true, b_false); - b_true_implies_undecided = CRML.Blocks.Logical4.implies4(b_true, b_undecided); - b_true_implies_undefined = CRML.Blocks.Logical4.implies4(b_true, b_undefined); - - b_false_implies_true = CRML.Blocks.Logical4.implies4(b_false, b_true); - b_false_implies_false = CRML.Blocks.Logical4.implies4(b_false, b_false); - b_false_implies_undecided = CRML.Blocks.Logical4.implies4(b_false, b_undecided); - b_false_implies_undefined = CRML.Blocks.Logical4.implies4(b_false, b_undefined); - - b_undecided_implies_true = CRML.Blocks.Logical4.implies4(b_undecided, b_true); - b_undecided_implies_false = CRML.Blocks.Logical4.implies4(b_undecided, b_false); - b_undecided_implies_undecided = CRML.Blocks.Logical4.implies4(b_undecided, b_undecided); - b_undecided_implies_undefined = CRML.Blocks.Logical4.implies4(b_undecided, b_undefined); - - b_undefined_implies_true = CRML.Blocks.Logical4.implies4(b_undefined, b_true); - b_undefined_implies_false = CRML.Blocks.Logical4.implies4(b_undefined, b_false); - b_undefined_implies_undecided = CRML.Blocks.Logical4.implies4(b_undefined, b_undecided); - b_undefined_implies_undefined = CRML.Blocks.Logical4.implies4(b_undefined, b_undefined); - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end Implies_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Implies_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/Implies_no_ext/package.mo deleted file mode 100644 index 3c0bfc9..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Implies_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package Implies_no_ext -end Implies_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Implies_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/Implies_no_ext/package.order deleted file mode 100644 index 601e57f..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Implies_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -Implies_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/Increasing1_no_ext/Increasing1_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/Increasing1_no_ext/Increasing1_no_ext.mo deleted file mode 100644 index c9c7b40..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Increasing1_no_ext/Increasing1_no_ext.mo +++ /dev/null @@ -1,36 +0,0 @@ -within CRML_test.ETL.Increasing1_no_ext; -model Increasing1_no_ext - Integer x1 = 3; - Integer x2 = 7; - Integer x3 = 7; - - CRML.ETL.Types.Boolean4 b_increasing1_on_strictly_greater_1; - CRML.ETL.Types.Boolean4 b_increasing1_on_strictly_greater_2; - CRML.ETL.Types.Boolean4 b_increasing1_on_greater_or_equal_1; - CRML.ETL.Types.Boolean4 b_increasing1_on_greater_or_equal_2; - CRML.ETL.Types.Boolean4 b_increasing1_on_strictly_less_1; - CRML.ETL.Types.Boolean4 b_increasing1_on_strictly_less_2; - CRML.ETL.Types.Boolean4 b_increasing1_on_less_or_equal_1; - CRML.ETL.Types.Boolean4 b_increasing1_on_less_or_equal_2; - CRML.ETL.Types.Boolean4 b_increasing1_on_equal_1; - CRML.ETL.Types.Boolean4 b_increasing1_on_equal_2; - CRML.ETL.Types.Boolean4 b_increasing1_on_different_1; - CRML.ETL.Types.Boolean4 b_increasing1_on_different_2; - -equation - b_increasing1_on_strictly_greater_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 > x2); - b_increasing1_on_strictly_greater_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 > x1); - b_increasing1_on_greater_or_equal_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 >= x2); - b_increasing1_on_greater_or_equal_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 >= x1); - b_increasing1_on_strictly_less_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 >= x2); - b_increasing1_on_strictly_less_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 >= x1); - b_increasing1_on_less_or_equal_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 > x2); - b_increasing1_on_less_or_equal_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 > x1); - b_increasing1_on_equal_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 > x2); - b_increasing1_on_equal_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 > x3); - b_increasing1_on_different_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 > x2); - b_increasing1_on_different_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 > x3); - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end Increasing1_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Increasing1_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/Increasing1_no_ext/package.mo deleted file mode 100644 index f793c20..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Increasing1_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package Increasing1_no_ext -end Increasing1_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Increasing1_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/Increasing1_no_ext/package.order deleted file mode 100644 index e62bbf1..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Increasing1_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -Increasing1_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/Increasing2_no_ext/Increasing2_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/Increasing2_no_ext/Increasing2_no_ext.mo deleted file mode 100644 index 9cefd04..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Increasing2_no_ext/Increasing2_no_ext.mo +++ /dev/null @@ -1,36 +0,0 @@ -within CRML_test.ETL.Increasing2_no_ext; -model Increasing2_no_ext - Integer x1 = 3; - Integer x2 = 7; - Integer x3 = 7; - - CRML.ETL.Types.Boolean4 b_increasing2_on_strictly_greater_1; - CRML.ETL.Types.Boolean4 b_increasing2_on_strictly_greater_2; - CRML.ETL.Types.Boolean4 b_increasing2_on_greater_or_equal_1; - CRML.ETL.Types.Boolean4 b_increasing2_on_greater_or_equal_2; - CRML.ETL.Types.Boolean4 b_increasing2_on_strictly_less_1; - CRML.ETL.Types.Boolean4 b_increasing2_on_strictly_less_2; - CRML.ETL.Types.Boolean4 b_increasing2_on_less_or_equal_1; - CRML.ETL.Types.Boolean4 b_increasing2_on_less_or_equal_2; - CRML.ETL.Types.Boolean4 b_increasing2_on_equal_1; - CRML.ETL.Types.Boolean4 b_increasing2_on_equal_2; - CRML.ETL.Types.Boolean4 b_increasing2_on_different_1; - CRML.ETL.Types.Boolean4 b_increasing2_on_different_2; - -equation - b_increasing2_on_strictly_greater_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 > x2); - b_increasing2_on_strictly_greater_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 > x1); - b_increasing2_on_greater_or_equal_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 >= x2); - b_increasing2_on_greater_or_equal_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 >= x1); - b_increasing2_on_strictly_less_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 >= x2); - b_increasing2_on_strictly_less_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 >= x1); - b_increasing2_on_less_or_equal_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 > x2); - b_increasing2_on_less_or_equal_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 > x1); - b_increasing2_on_equal_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 == x2); - b_increasing2_on_equal_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 == x3); - b_increasing2_on_different_1 = CRML.ETL.Types.cvBooleanToBoolean4(x1 <> x2); - b_increasing2_on_different_2 = CRML.ETL.Types.cvBooleanToBoolean4(x2 <> x3); - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end Increasing2_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Increasing2_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/Increasing2_no_ext/package.mo deleted file mode 100644 index df2e008..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Increasing2_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package Increasing2_no_ext -end Increasing2_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Increasing2_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/Increasing2_no_ext/package.order deleted file mode 100644 index 87a8620..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Increasing2_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -Increasing2_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/Inside/Inside.mo b/resources/modelica_libraries/CRML_test/ETL/Inside/Inside.mo deleted file mode 100644 index 22230e3..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Inside/Inside.mo +++ /dev/null @@ -1,98 +0,0 @@ -within CRML_test.ETL.Inside; -partial model Inside - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - CRML.Blocks.Events.EventFilter eventFilter - annotation (Placement(transformation(extent={{-12,-10},{8,10}}))); - CRML.ETL.TimeLocators.Attributes.PeriodTimePeriod - periodTimePeriod - annotation (Placement(transformation(extent={{-84,-44},{-76,-36}}))); - CRML.ETL.Connectors.ClockOutput c_filtered_ticks_of_c1_inside_p1 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.Blocks.Events.ClockEvent - eventClock - annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Utilities.ClockConnector C1 - annotation (Placement(transformation(extent={{-120,20},{-100,40}}))); - Utilities.TimeLocatorConnector P1 - annotation (Placement(transformation(extent={{-120,-40},{-100,-20}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean - annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); -equation - connect(c_filtered_ticks_of_c1_inside_p1, eventClock.y) annotation (Line( - points={{110,0},{81,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(periodTimePeriod.tl, P1) annotation (Line(points={{-80,-36},{-80,-30}, - {-110,-30}}, color={0,0,255})); - connect(C1, clockToBoolean.u) - annotation (Line(points={{-110,30},{-62,30}}, color={0,0,0})); - connect(periodTimePeriod.y, eventFilter.cond) annotation (Line(points={{-75.6, - -40},{-20,-40},{-20,8},{-13,8}}, color={217,67,180})); - connect(eventFilter.u, clockToBoolean.y) annotation (Line(points={{-13,0},{ - -26,0},{-26,30},{-39,30}}, color={217,67,180})); - connect(eventFilter.y, eventClock.u) - annotation (Line(points={{9,0},{59,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Text( - extent={{-250,170},{250,110}}, - textString="%name", - lineColor={0,0,255}), Line(points={{-72,34}, - {-28,34},{-28,78},{-28,78},{-28,34},{74,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Ellipse( - extent={{-38,88},{-18,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line(points={{-86,-52},{-50,-52},{-50,-8},{60,-8},{60,-54},{88,-54}}, - color={0,0,0}), - Ellipse( - extent={{4,88},{24,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line( - points={{14,78},{14,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Ellipse( - extent={{64,88},{84,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line( - points={{74,78},{74,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Ellipse( - extent={{-82,88},{-62,68}}, - lineColor={0,140,72}, - fillColor={0,140,72}, - fillPattern=FillPattern.Solid), - Line( - points={{-72,78},{-72,34}}, - color={0,140,72}, - pattern=LinePattern.Dot), - Ellipse( - extent={{-38,2},{-18,-18}}, - lineColor={0,0,0}, - fillColor={0,0,0}, - fillPattern=FillPattern.Solid), - Ellipse( - extent={{4,2},{24,-18}}, - lineColor={0,0,0}, - fillColor={0,0,0}, - fillPattern=FillPattern.Solid)}), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end Inside; diff --git a/resources/modelica_libraries/CRML_test/ETL/Inside/Inside_externals.mo b/resources/modelica_libraries/CRML_test/ETL/Inside/Inside_externals.mo deleted file mode 100644 index fc89835..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Inside/Inside_externals.mo +++ /dev/null @@ -1,74 +0,0 @@ -within CRML_test.ETL.Inside; -model Inside_externals - -public - CRML.Blocks.Logical.BooleanTable bool2( - y0=false, - option_width=false, - instant={2,3,3.5,4.5,6,7.5}) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical.BooleanTable bool1( - y0=false, - option_width=false, - instant={2.5,5}) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.TimeLocatorOutput tl1 - annotation (Placement(transformation(extent={{100,-40},{120,-20}}))); - CRML.Blocks.Events.ShowEvent showEvent_b2 - annotation (Placement(transformation(extent={{16,56},{24,64}}))); - CRML.ETL.Connectors.ClockOutput clock1 - annotation (Placement(transformation(extent={{100,0},{120,20}}))); - CRML.Blocks.Events.ShowEvent showEvent_b1 - annotation (Placement(transformation(extent={{16,-44},{24,-36}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{20,0},{40,20}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{40,-70},{60,-50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-4,-64},{4,-56}}))); - inner CRML.TimeLocators.Continuous.Master master - annotation (Placement(transformation(extent={{60,60},{80,80}}))); - CRML.CompilerCompliancy.CRMLPeriodTimePeriod cRMLPeriodTimePeriod - annotation (Placement(transformation(extent={{40,-100},{60,-80}}))); - CRML.ETL.Connectors.CRMLPeriodOutput P1 - annotation (Placement(transformation(extent={{100,-90},{120,-70}}))); - CRML.CompilerCompliancy.CRMLClockClock cRMLClockClock - annotation (Placement(transformation(extent={{60,30},{80,50}}))); - CRML.ETL.Connectors.CRMLClockOutput C1 annotation (Placement(transformation( - extent={{100,30},{120,50}}), iconTransformation(extent={{100,30},{120, - 50}}))); -equation - connect(showEvent_b2.u, bool2.y) annotation (Line(points={{15.6,60},{-10,60}, - {-10,50},{-39,50}}, color={217,67,180})); - connect(bool1.y, showEvent_b1.u) annotation (Line(points={{-39,-50},{-12,-50}, - {-12,-40},{15.6,-40}}, color={217,67,180})); - connect(clockEvent.y, clock1) annotation (Line( - points={{41,10},{110,10}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent.u, bool2.y) annotation (Line(points={{19,10},{0,10},{0,50}, - {-39,50}}, color={217,67,180})); - connect(during.y[1], tl1) annotation (Line(points={{50,-70},{50,-74},{96,-74}, - {96,-30},{110,-30}}, color={0,0,255})); - connect(bool1.y, booleanToBoolean4_1.u) annotation (Line(points={{-39,-50},{ - -12,-50},{-12,-60},{-4.4,-60}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, during.u) - annotation (Line(points={{4.4,-60},{39,-60}}, color={162,29,33})); - connect(cRMLPeriodTimePeriod.y, P1) annotation (Line(points={{61,-90},{94,-90}, - {94,-80},{110,-80}}, color={255,170,255})); - connect(cRMLPeriodTimePeriod.tl, during.y[1]) - annotation (Line(points={{50,-80},{50,-70}}, color={0,0,255})); - connect(clockEvent.y, cRMLClockClock.c) annotation (Line( - points={{41,10},{54,10},{54,40},{59,40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(cRMLClockClock.y, C1) annotation (Line( - points={{81,40},{110,40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end Inside_externals; diff --git a/resources/modelica_libraries/CRML_test/ETL/Inside/Inside_verif.mo b/resources/modelica_libraries/CRML_test/ETL/Inside/Inside_verif.mo deleted file mode 100644 index d75372c..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Inside/Inside_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.ETL.Inside; -model Inside_verif - extends Inside; - Inside_externals externals - annotation (Placement(transformation(extent={{-200,20},{-140,80}}))); -equation - // Bindings - C1 =externals.clock1; - P1 =externals.tl1; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end Inside_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/Inside/package.mo b/resources/modelica_libraries/CRML_test/ETL/Inside/package.mo deleted file mode 100644 index c55311c..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Inside/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package Inside -end Inside; diff --git a/resources/modelica_libraries/CRML_test/ETL/Inside/package.order b/resources/modelica_libraries/CRML_test/ETL/Inside/package.order deleted file mode 100644 index 141c57f..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Inside/package.order +++ /dev/null @@ -1,3 +0,0 @@ -Inside -Inside_externals -Inside_verif diff --git a/resources/modelica_libraries/CRML_test/ETL/Inside_no_ext/Inside_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/Inside_no_ext/Inside_no_ext.mo deleted file mode 100644 index e84287b..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Inside_no_ext/Inside_no_ext.mo +++ /dev/null @@ -1,67 +0,0 @@ -within CRML_test.ETL.Inside_no_ext; -model Inside_no_ext - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2,3,3.5,4.5,6,7.5}) - annotation (Placement(transformation(extent={{-100,30},{-80,50}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2.5,5}) - annotation (Placement(transformation(extent={{-100,-50},{-80,-30}}))); - CRML.ETL.Connectors.ClockOutput c_filtered_ticks_of_c1_inside_p1 - annotation (Placement(transformation(extent={{160,-10},{180,10}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{-38,30},{-18,50}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{0,-50},{20,-30}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-36,-44},{-28,-36}}))); - inner CRML.TimeLocators.Continuous.Master master - annotation (Placement(transformation(extent={{60,60},{80,80}}))); - CRML.ETL.Blocks.Clocks.Inside inside - annotation (Placement(transformation(extent={{80,-10},{100,10}}))); - CRML.ETL.Connectors.TimeLocatorOutput P1 - annotation (Placement(transformation(extent={{160,-70},{180,-50}}))); - CRML.ETL.Connectors.ClockOutput C1 - annotation (Placement(transformation(extent={{160,30},{180,50}}))); -equation - connect(booleanToBoolean4_1.y,during. u) - annotation (Line(points={{-27.6,-40},{-1,-40}}, - color={162,29,33})); - connect(clockEvent.u, b2.y) - annotation (Line(points={{-39,40},{-79,40}}, color={217,67,180})); - connect(b1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-79,-40},{-36.4,-40}}, color={217,67,180})); - connect(c_filtered_ticks_of_c1_inside_p1, inside.y) annotation (Line( - points={{170,0},{101,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent.y, inside.u) annotation (Line( - points={{-17,40},{12,40},{12,3},{79,3}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(during.y[1], inside.tl) annotation (Line(points={{10,-50},{10,-66},{ - 66,-66},{66,-3},{79,-3}}, color={0,0,255})); - connect(during.y[1], P1) annotation (Line(points={{10,-50},{10,-66},{66,-66}, - {66,-60},{170,-60}}, color={0,0,255})); - connect(clockEvent.y, C1) annotation (Line( - points={{-17,40},{170,40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-160,-100},{160,100}}, - initialScale=0.1)), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-160,-100},{160,100}}, - initialScale=0.1))); -end Inside_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Inside_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/Inside_no_ext/package.mo deleted file mode 100644 index 38c7c91..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Inside_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package Inside_no_ext -end Inside_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Inside_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/Inside_no_ext/package.order deleted file mode 100644 index 4b5b517..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Inside_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -Inside_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateOr/TemplateOr.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateOr/TemplateOr.mo deleted file mode 100644 index 8f59702..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateOr/TemplateOr.mo +++ /dev/null @@ -1,13 +0,0 @@ -within CRML_test.ETL.TemplateOr; -partial model TemplateOr - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.Boolean4Connector b2 - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - Utilities.Boolean4Connector b1_or_b2 - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); -equation - b1_or_b2 = CRML.Blocks.Logical4.or4(b1, b2); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end TemplateOr; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateOr/TemplateOr_externals.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateOr/TemplateOr_externals.mo deleted file mode 100644 index 471855a..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateOr/TemplateOr_externals.mo +++ /dev/null @@ -1,18 +0,0 @@ -within CRML_test.ETL.TemplateOr; -model TemplateOr_externals - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant1(K=CRML.ETL.Types.Boolean4.true4) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant2(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.Boolean4Output b1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.Boolean4Output b2 - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); -equation - connect(boolean4Constant1.y, b1) - annotation (Line(points={{-39,50},{110,50}}, color={162,29,33})); - connect(boolean4Constant2.y, b2) - annotation (Line(points={{-39,-50},{110,-50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end TemplateOr_externals; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateOr/TemplateOr_verif.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateOr/TemplateOr_verif.mo deleted file mode 100644 index a264d8d..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateOr/TemplateOr_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.ETL.TemplateOr; -model TemplateOr_verif - extends TemplateOr; - TemplateOr_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - b2 = externals.b2; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end TemplateOr_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateOr/package.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateOr/package.mo deleted file mode 100644 index 583025b..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateOr/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package TemplateOr -end TemplateOr; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateOr/package.order b/resources/modelica_libraries/CRML_test/ETL/TemplateOr/package.order deleted file mode 100644 index fdd019d..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateOr/package.order +++ /dev/null @@ -1,3 +0,0 @@ -TemplateOr -TemplateOr_externals -TemplateOr_verif diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateOr_no_ext/TemplateOr_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateOr_no_ext/TemplateOr_no_ext.mo deleted file mode 100644 index 17ae7e8..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateOr_no_ext/TemplateOr_no_ext.mo +++ /dev/null @@ -1,47 +0,0 @@ -within CRML_test.ETL.TemplateOr_no_ext; -model TemplateOr_no_ext - import CRML.ETL.Types.Boolean4; - CRML.ETL.Types.Boolean4 b_true = Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_true_or_true; - CRML.ETL.Types.Boolean4 b_true_or_false; - CRML.ETL.Types.Boolean4 b_true_or_undecided; - CRML.ETL.Types.Boolean4 b_true_or_undefined; - CRML.ETL.Types.Boolean4 b_false_or_true; - CRML.ETL.Types.Boolean4 b_false_or_false; - CRML.ETL.Types.Boolean4 b_false_or_undecided; - CRML.ETL.Types.Boolean4 b_false_or_undefined; - CRML.ETL.Types.Boolean4 b_undecided_or_true; - CRML.ETL.Types.Boolean4 b_undecided_or_false; - CRML.ETL.Types.Boolean4 b_undecided_or_undecided; - CRML.ETL.Types.Boolean4 b_undecided_or_undefined; - CRML.ETL.Types.Boolean4 b_undefined_or_true; - CRML.ETL.Types.Boolean4 b_undefined_or_false; - CRML.ETL.Types.Boolean4 b_undefined_or_undecided; - CRML.ETL.Types.Boolean4 b_undefined_or_undefined; -equation - b_true_or_true = CRML.Blocks.Logical4.or4(b_true, b_true); - b_true_or_false = CRML.Blocks.Logical4.or4(b_true, b_false); - b_true_or_undecided = CRML.Blocks.Logical4.or4(b_true, b_undecided); - b_true_or_undefined = CRML.Blocks.Logical4.or4(b_true, b_undefined); - - b_false_or_true = CRML.Blocks.Logical4.or4(b_false, b_true); - b_false_or_false = CRML.Blocks.Logical4.or4(b_false, b_false); - b_false_or_undecided = CRML.Blocks.Logical4.or4(b_false, b_undecided); - b_false_or_undefined = CRML.Blocks.Logical4.or4(b_false, b_undefined); - - b_undecided_or_true = CRML.Blocks.Logical4.or4(b_undecided, b_true); - b_undecided_or_false = CRML.Blocks.Logical4.or4(b_undecided, b_false); - b_undecided_or_undecided = CRML.Blocks.Logical4.or4(b_undecided, b_undecided); - b_undecided_or_undefined = CRML.Blocks.Logical4.or4(b_undecided, b_undefined); - - b_undefined_or_true = CRML.Blocks.Logical4.or4(b_undefined, b_true); - b_undefined_or_false = CRML.Blocks.Logical4.or4(b_undefined, b_false); - b_undefined_or_undecided = CRML.Blocks.Logical4.or4(b_undefined, b_undecided); - b_undefined_or_undefined = CRML.Blocks.Logical4.or4(b_undefined, b_undefined); - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end TemplateOr_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateOr_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateOr_no_ext/package.mo deleted file mode 100644 index 669d4cf..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateOr_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package TemplateOr_no_ext -end TemplateOr_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateOr_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/TemplateOr_no_ext/package.order deleted file mode 100644 index 6f4610f..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateOr_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -TemplateOr_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateXor/TemplateXor.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateXor/TemplateXor.mo deleted file mode 100644 index 6717c17..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateXor/TemplateXor.mo +++ /dev/null @@ -1,13 +0,0 @@ -within CRML_test.ETL.TemplateXor; -partial model TemplateXor - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.Boolean4Connector b2 - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - Utilities.Boolean4Connector b1_xor_b2 - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); -equation - b1_xor_b2 = CRML.Blocks.Logical4.xor4(b1, b2); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end TemplateXor; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateXor/TemplateXor_externals.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateXor/TemplateXor_externals.mo deleted file mode 100644 index 907feff..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateXor/TemplateXor_externals.mo +++ /dev/null @@ -1,18 +0,0 @@ -within CRML_test.ETL.TemplateXor; -model TemplateXor_externals - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant1(K=CRML.ETL.Types.Boolean4.true4) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant2(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.Boolean4Output b1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.Boolean4Output b2 - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); -equation - connect(boolean4Constant1.y, b1) - annotation (Line(points={{-39,50},{110,50}}, color={162,29,33})); - connect(boolean4Constant2.y, b2) - annotation (Line(points={{-39,-50},{110,-50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end TemplateXor_externals; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateXor/TemplateXor_verif.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateXor/TemplateXor_verif.mo deleted file mode 100644 index 226b524..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateXor/TemplateXor_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.ETL.TemplateXor; -model TemplateXor_verif - extends TemplateXor; - TemplateXor_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - b2 = externals.b2; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end TemplateXor_verif; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateXor/package.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateXor/package.mo deleted file mode 100644 index 1401ebf..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateXor/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package TemplateXor -end TemplateXor; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateXor/package.order b/resources/modelica_libraries/CRML_test/ETL/TemplateXor/package.order deleted file mode 100644 index 87605fb..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateXor/package.order +++ /dev/null @@ -1,3 +0,0 @@ -TemplateXor -TemplateXor_externals -TemplateXor_verif diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateXor_no_ext/TemplateXor_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateXor_no_ext/TemplateXor_no_ext.mo deleted file mode 100644 index 0b1a18e..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateXor_no_ext/TemplateXor_no_ext.mo +++ /dev/null @@ -1,47 +0,0 @@ -within CRML_test.ETL.TemplateXor_no_ext; -model TemplateXor_no_ext - import CRML.ETL.Types.Boolean4; - CRML.ETL.Types.Boolean4 b_true = Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_true_xor_true; - CRML.ETL.Types.Boolean4 b_true_xor_false; - CRML.ETL.Types.Boolean4 b_true_xor_undecided; - CRML.ETL.Types.Boolean4 b_true_xor_undefined; - CRML.ETL.Types.Boolean4 b_false_xor_true; - CRML.ETL.Types.Boolean4 b_false_xor_false; - CRML.ETL.Types.Boolean4 b_false_xor_undecided; - CRML.ETL.Types.Boolean4 b_false_xor_undefined; - CRML.ETL.Types.Boolean4 b_undecided_xor_true; - CRML.ETL.Types.Boolean4 b_undecided_xor_false; - CRML.ETL.Types.Boolean4 b_undecided_xor_undecided; - CRML.ETL.Types.Boolean4 b_undecided_xor_undefined; - CRML.ETL.Types.Boolean4 b_undefined_xor_true; - CRML.ETL.Types.Boolean4 b_undefined_xor_false; - CRML.ETL.Types.Boolean4 b_undefined_xor_undecided; - CRML.ETL.Types.Boolean4 b_undefined_xor_undefined; -equation - b_true_xor_true = CRML.Blocks.Logical4.xor4(b_true, b_true); - b_true_xor_false = CRML.Blocks.Logical4.xor4(b_true, b_false); - b_true_xor_undecided = CRML.Blocks.Logical4.xor4(b_true, b_undecided); - b_true_xor_undefined = CRML.Blocks.Logical4.xor4(b_true, b_undefined); - - b_false_xor_true = CRML.Blocks.Logical4.xor4(b_false, b_true); - b_false_xor_false = CRML.Blocks.Logical4.xor4(b_false, b_false); - b_false_xor_undecided = CRML.Blocks.Logical4.xor4(b_false, b_undecided); - b_false_xor_undefined = CRML.Blocks.Logical4.xor4(b_false, b_undefined); - - b_undecided_xor_true = CRML.Blocks.Logical4.xor4(b_undecided, b_true); - b_undecided_xor_false = CRML.Blocks.Logical4.xor4(b_undecided, b_false); - b_undecided_xor_undecided = CRML.Blocks.Logical4.xor4(b_undecided, b_undecided); - b_undecided_xor_undefined = CRML.Blocks.Logical4.xor4(b_undecided, b_undefined); - - b_undefined_xor_true = CRML.Blocks.Logical4.xor4(b_undefined, b_true); - b_undefined_xor_false = CRML.Blocks.Logical4.xor4(b_undefined, b_false); - b_undefined_xor_undecided = CRML.Blocks.Logical4.xor4(b_undefined, b_undecided); - b_undefined_xor_undefined = CRML.Blocks.Logical4.xor4(b_undefined, b_undefined); - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end TemplateXor_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateXor_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/TemplateXor_no_ext/package.mo deleted file mode 100644 index 1896262..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateXor_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package TemplateXor_no_ext -end TemplateXor_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/TemplateXor_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/TemplateXor_no_ext/package.order deleted file mode 100644 index ac2c096..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/TemplateXor_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -TemplateXor_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/Varying1_no_ext/Varying1_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/Varying1_no_ext/Varying1_no_ext.mo deleted file mode 100644 index c077f25..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Varying1_no_ext/Varying1_no_ext.mo +++ /dev/null @@ -1,23 +0,0 @@ -within CRML_test.ETL.Varying1_no_ext; -model Varying1_no_ext - import CRML.ETL.Types.Boolean4; - CRML.ETL.Types.Boolean4 b_true = Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_varying1_on_id_true; - CRML.ETL.Types.Boolean4 b_varying1_on_id_false; - CRML.ETL.Types.Boolean4 b_varying1_on_id_undecided; - CRML.ETL.Types.Boolean4 b_varying1_on_id_undefined; - - CRML.Blocks.Logical4.Boolean4Constant cte_false(K=CRML.ETL.Types.Boolean4.false4); - -equation - b_varying1_on_id_true = cte_false.y; - b_varying1_on_id_false = cte_false.y; - b_varying1_on_id_undecided = cte_false.y; - b_varying1_on_id_undefined = cte_false.y; - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end Varying1_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Varying1_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/Varying1_no_ext/package.mo deleted file mode 100644 index 32b6335..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Varying1_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package Varying1_no_ext -end Varying1_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Varying1_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/Varying1_no_ext/package.order deleted file mode 100644 index 239070e..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Varying1_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -Varying1_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/Varying2_no_ext/Varying2_no_ext.mo b/resources/modelica_libraries/CRML_test/ETL/Varying2_no_ext/Varying2_no_ext.mo deleted file mode 100644 index a0408b8..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Varying2_no_ext/Varying2_no_ext.mo +++ /dev/null @@ -1,23 +0,0 @@ -within CRML_test.ETL.Varying2_no_ext; -model Varying2_no_ext - import CRML.ETL.Types.Boolean4; - CRML.ETL.Types.Boolean4 b_true = Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_varying2_on_id_true; - CRML.ETL.Types.Boolean4 b_varying2_on_id_false; - CRML.ETL.Types.Boolean4 b_varying2_on_id_undecided; - CRML.ETL.Types.Boolean4 b_varying2_on_id_undefined; - - CRML.Blocks.Logical4.Boolean4Constant cte_true(K=CRML.ETL.Types.Boolean4.true4); - -equation - b_varying2_on_id_true = cte_true.y; - b_varying2_on_id_false = cte_true.y; - b_varying2_on_id_undecided = cte_true.y; - b_varying2_on_id_undefined = cte_true.y; - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end Varying2_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Varying2_no_ext/package.mo b/resources/modelica_libraries/CRML_test/ETL/Varying2_no_ext/package.mo deleted file mode 100644 index 6d9bc61..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Varying2_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.ETL; -package Varying2_no_ext -end Varying2_no_ext; diff --git a/resources/modelica_libraries/CRML_test/ETL/Varying2_no_ext/package.order b/resources/modelica_libraries/CRML_test/ETL/Varying2_no_ext/package.order deleted file mode 100644 index c75638a..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/Varying2_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -Varying2_no_ext diff --git a/resources/modelica_libraries/CRML_test/ETL/package.mo b/resources/modelica_libraries/CRML_test/ETL/package.mo deleted file mode 100644 index af3c0eb..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/package.mo +++ /dev/null @@ -1,19 +0,0 @@ -within CRML_test; -package ETL -annotation (Icon(graphics={ - Rectangle( - lineColor={200,200,200}, - fillColor={248,248,248}, - fillPattern=FillPattern.HorizontalCylinder, - extent={{-100,-100},{100,100}}, - radius=25.0), Text( - extent={{-42,38},{44,-30}}, - lineColor={0,0,0}, - fontName="Symbol", - textString=""), - Rectangle( - lineColor={128,128,128}, - fillPattern=FillPattern.None, - extent={{-100,-100},{100,100}}, - radius=25.0)})); -end ETL; diff --git a/resources/modelica_libraries/CRML_test/ETL/package.order b/resources/modelica_libraries/CRML_test/ETL/package.order deleted file mode 100644 index 535eafb..0000000 --- a/resources/modelica_libraries/CRML_test/ETL/package.order +++ /dev/null @@ -1,31 +0,0 @@ -BecomesFalse -BecomesFalse_no_ext -BecomesFalseInside -BecomesFalseInside_no_ext -BecomesTrue -BecomesTrue_no_ext -BecomesTrueInside -BecomesTrueInside_no_ext -CheckOver -CheckOver_no_ext -CountInside -CountInside_no_ext -CteFalse_no_ext -CteTrue_no_ext -DecideOver -DecideOver_no_ext -EvaluateOver -EvaluateOver_no_ext -Id_no_ext -Implies -Implies_no_ext -Increasing1_no_ext -Increasing2_no_ext -Inside -Inside_no_ext -TemplateOr -TemplateOr_no_ext -TemplateXor -TemplateXor_no_ext -Varying1_no_ext -Varying2_no_ext diff --git a/resources/modelica_libraries/CRML_test/Examples/TrafficLight/Spec.mo b/resources/modelica_libraries/CRML_test/Examples/TrafficLight/Spec.mo deleted file mode 100644 index d6fb481..0000000 --- a/resources/modelica_libraries/CRML_test/Examples/TrafficLight/Spec.mo +++ /dev/null @@ -1,127 +0,0 @@ -within CRML_test.Examples.TrafficLight; - -model Spec - CRML.TimeLocators.Continuous.AfterBefore afterBefore annotation( - Placement(transformation(extent = {{-40, 64}, {-20, 84}}))); - CRML.Requirements.CheckCountEqual checkInPCount(threshold = 0) annotation( - Placement(transformation(extent = {{-40, 24}, {-20, 44}}))); - CRML.TimeLocators.Continuous.AfterFor afterFor annotation( - Placement(transformation(extent = {{-40, -40}, {-20, -20}}))); - CRML.Blocks.Math.Constant const(k = 30) annotation( - Placement(transformation(extent = {{-80, -60}, {-60, -40}}))); - CRML.Requirements.Ensure checkBoolean annotation( - Placement(transformation(extent = {{-40, -80}, {-20, -60}}))); - CRML.TimeLocators.Continuous.AfterFor When annotation( - Placement(transformation(extent = {{100, 70}, {120, 90}}))); - CRML.Blocks.Math.Constant const1(k = 0.2) annotation( - Placement(transformation(extent = {{20, 14}, {40, 34}}))); - CRML.Requirements.CheckAtEnd checkInPCount1 annotation( - Placement(transformation(extent = {{100, 0}, {120, 20}}))); - CRML.Blocks.Math.Constant const2(k = 30) annotation( - Placement(transformation(extent = {{22, 50}, {42, 70}}))); - CRML.ETL.Connectors.BooleanInput red "External Boolean variable" annotation( - Placement(transformation(extent = {{-120, 70}, {-100, 90}}))); - CRML.ETL.Connectors.BooleanInput green annotation( - Placement(transformation(extent = {{-120, -90}, {-100, -70}}))); - CRML.ETL.Connectors.BooleanInput yellow "Boolean condition" annotation( - Placement(transformation(extent = {{-120, -10}, {-100, 10}}))); - CRML.Blocks.Logical4.ShowBoolean4 show_req1 annotation( - Placement(transformation(extent = {{-8, 20}, {14, 48}}))); - CRML.Blocks.Logical4.ShowBoolean4 show_req2 annotation( - Placement(transformation(extent = {{-10, -82}, {14, -58}}))); - CRML.Blocks.Logical4.ShowBoolean4 show_req3 annotation( - Placement(transformation(origin = {-2, 14}, extent = {{140, -2}, {162, 22}}))); - CRML.Blocks.Logical4.And4 and4_1 annotation( - Placement(transformation(extent = {{20, -58}, {40, -38}}))); - CRML.Blocks.Logical4.And4 and4_2 annotation( - Placement(transformation(extent = {{112, -50}, {132, -30}}))); - CRML.Blocks.Logical4.ShowBoolean4 show_req annotation( - Placement(transformation(extent = {{138, -52}, {160, -28}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 annotation( - Placement(transformation(extent = {{-84, 76}, {-76, 84}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 annotation( - Placement(transformation(extent = {{-84, 62}, {-76, 70}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_3 annotation( - Placement(transformation(extent = {{-84, -84}, {-76, -76}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_4 annotation( - Placement(transformation(extent = {{-84, -4}, {-76, 4}}))); - CRML.Blocks.Events.EventDelay booleanDelay annotation( - Placement(transformation(extent = {{58, 70}, {78, 90}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_5 annotation( - Placement(transformation(extent = {{84, 76}, {92, 84}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent annotation( - Placement(transformation(extent = {{42, 76}, {50, 84}}))); - CRML.ETL.Connectors.Boolean4Output req1 annotation( - Placement(transformation(origin = {170, 60}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin = {170, 60}, extent = {{-10, -10}, {10, 10}}))); - CRML.ETL.Connectors.Boolean4Output req2 annotation( - Placement(transformation(origin = {170, 0}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin = {170, 0}, extent = {{-10, -10}, {10, 10}}))); - CRML.ETL.Connectors.Boolean4Output req3 annotation( - Placement(transformation(origin = {170, -60}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin = {170, -60}, extent = {{-10, -10}, {10, 10}}))); -equation - connect(afterBefore.y, checkInPCount.tl) annotation( - Line(points = {{-30, 64}, {-30, 44}}, color = {0, 0, 255})); - connect(const.y, afterFor.duration) annotation( - Line(points = {{-59, -50}, {-50, -50}, {-50, -38}, {-41, -38}}, color = {0, 0, 0})); - connect(afterFor.y, checkBoolean.tl) annotation( - Line(points = {{-30, -40}, {-30, -60}}, color = {0, 0, 255})); - connect(const1.y, When.duration) annotation( - Line(points = {{41, 24}, {90, 24}, {90, 72}, {99, 72}}, color = {0, 0, 0})); - connect(checkInPCount.y, show_req1.u) annotation( - Line(points = {{-19, 34}, {-8.55, 34}}, color = {162, 29, 33})); - connect(checkBoolean.y, show_req2.u) annotation( - Line(points = {{-19, -70}, {-10.6, -70}}, color = {162, 29, 33})); - connect(checkBoolean.y, and4_1.u2) annotation( - Line(points = {{-19, -70}, {-16, -70}, {-16, -56}, {19, -56}}, color = {162, 29, 33})); - connect(checkInPCount.y, and4_1.u1) annotation( - Line(points = {{-19, 34}, {-16, 34}, {-16, -40}, {19, -40}}, color = {162, 29, 33})); - connect(and4_2.y, show_req.u) annotation( - Line(points = {{133, -40}, {137.45, -40}}, color = {162, 29, 33})); - connect(and4_1.y, and4_2.u2) annotation( - Line(points = {{41, -48}, {111, -48}}, color = {162, 29, 33})); - connect(checkInPCount.u, booleanToBoolean4_1.y) annotation( - Line(points = {{-41, 34}, {-72, 34}, {-72, 80}, {-75.6, 80}}, color = {162, 29, 33})); - connect(booleanToBoolean4_1.u, red) annotation( - Line(points = {{-84.4, 80}, {-110, 80}}, color = {217, 67, 180})); - connect(yellow, booleanToBoolean4_2.u) annotation( - Line(points = {{-110, 0}, {-94, 0}, {-94, 66}, {-84.4, 66}}, color = {217, 67, 180})); - connect(booleanToBoolean4_2.y, afterBefore.u2) annotation( - Line(points = {{-75.6, 66}, {-41, 66}}, color = {162, 29, 33})); - connect(green, booleanToBoolean4_3.u) annotation( - Line(points = {{-110, -80}, {-84.4, -80}}, color = {217, 67, 180})); - connect(booleanToBoolean4_3.y, checkBoolean.u) annotation( - Line(points = {{-75.6, -80}, {-52, -80}, {-52, -70}, {-41, -70}}, color = {162, 29, 33})); - connect(booleanToBoolean4_3.y, afterFor.u) annotation( - Line(points = {{-75.6, -80}, {-52, -80}, {-52, -30}, {-41, -30}}, color = {162, 29, 33})); - connect(booleanToBoolean4_3.y, afterBefore.u1) annotation( - Line(points = {{-75.6, -80}, {-52, -80}, {-52, 74}, {-41, 74}}, color = {162, 29, 33})); - connect(checkInPCount1.u, booleanToBoolean4_4.y) annotation( - Line(points = {{99, 10}, {90, 10}, {90, 0}, {-75.6, 0}}, color = {162, 29, 33})); - connect(booleanToBoolean4_4.u, yellow) annotation( - Line(points = {{-84.4, 0}, {-110, 0}}, color = {217, 67, 180})); - connect(When.y, checkInPCount1.tl) annotation( - Line(points = {{110, 70}, {110, 20}}, color = {0, 0, 255})); - connect(const2.y, booleanDelay.delay) annotation( - Line(points = {{43, 60}, {50, 60}, {50, 72}, {57, 72}}, color = {0, 0, 0})); - connect(checkInPCount1.y, show_req3.u) annotation( - Line(points = {{121, 10}, {129, 10}, {129, 24}, {137, 24}}, color = {162, 29, 33})); - connect(checkInPCount1.y, and4_2.u1) annotation( - Line(points = {{121, 10}, {128, 10}, {128, -22}, {98, -22}, {98, -32}, {111, -32}}, color = {162, 29, 33})); - connect(booleanDelay.y, booleanToBoolean4_5.u) annotation( - Line(points = {{79, 80}, {83.6, 80}}, color = {217, 67, 180})); - connect(booleanToBoolean4_5.y, When.u) annotation( - Line(points = {{92.4, 80}, {99, 80}}, color = {162, 29, 33})); - connect(event4ToEvent.y, booleanDelay.u) annotation( - Line(points = {{50.4, 80}, {57, 80}}, color = {217, 67, 180})); - connect(booleanToBoolean4_3.y, event4ToEvent.u) annotation( - Line(points = {{-75.6, -80}, {-52, -80}, {-52, 88}, {28, 88}, {28, 80}, {41.6, 80}}, color = {162, 29, 33})); - connect(checkInPCount.y, req1) annotation( - Line(points = {{-18, 34}, {-10, 34}, {-10, 100}, {140, 100}, {140, 60}, {170, 60}}, color = {162, 29, 33})); - connect(checkBoolean.y, req2) annotation( - Line(points = {{-18, -70}, {-12, -70}, {-12, -20}, {140, -20}, {140, 0}, {170, 0}}, color = {162, 29, 33})); - connect(checkInPCount1.y, req3) annotation( - Line(points = {{122, 10}, {128, 10}, {128, -22}, {98, -22}, {98, -60}, {170, -60}}, color = {162, 29, 33})); - annotation( - Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {160, 100}}), graphics = {Rectangle(origin = {30, 0},lineColor = {28, 108, 200}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, extent = {{-130, 100}, {130, -100}}), Ellipse(origin = {32, 0},lineColor = {238, 46, 47}, fillColor = {238, 46, 47}, fillPattern = FillPattern.Solid, extent = {{-20, 98}, {20, 58}}), Ellipse(origin = {32, 0},lineColor = {244, 125, 35}, fillColor = {244, 125, 35}, fillPattern = FillPattern.Solid, extent = {{-20, 18}, {20, -20}}), Ellipse(origin = {32, 0},lineColor = {0, 140, 72}, fillColor = {0, 140, 72}, fillPattern = FillPattern.Solid, extent = {{-20, -60}, {20, -98}}), Text(textColor = {28, 108, 200}, extent = {{-92, 126}, {90, 108}}, textString = "%name")}), - Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {160, 100}}), graphics = {Rectangle(lineColor = {28, 108, 200}, fillColor = {255, 255, 170}, fillPattern = FillPattern.Solid, extent = {{-86, -16}, {-14, -94}}), Rectangle(lineColor = {28, 108, 200}, fillColor = {255, 255, 170}, fillPattern = FillPattern.Solid, extent = {{-86, 96}, {-14, -10}}), Text(textColor = {28, 108, 200}, extent = {{-72, -2}, {-30, -6}}, textString = "After green, next step is yellow"), Text(textColor = {28, 108, 200}, extent = {{-82, -82}, {-16, -94}}, textString = "Step green should stay active for at least 30 seconds"), Rectangle(lineColor = {28, 108, 200}, fillColor = {255, 255, 170}, fillPattern = FillPattern.Solid, extent = {{16, 96}, {134, -16}}), Text(textColor = {28, 108, 200}, extent = {{24, -4}, {76, -8}}, textString = "After green becomes active + 30 seconds,"), Text(textColor = {28, 108, 200}, extent = {{25, -8}, {81, -14}}, textString = "next step should turn yellow within 0.2 seconds"), Text(textColor = {28, 108, 200}, extent = {{-126, 100}, {-96, 92}}, textString = "red"), Text(textColor = {28, 108, 200}, extent = {{-126, -58}, {-96, -66}}, textString = "green"), Text(textColor = {28, 108, 200}, extent = {{-126, 22}, {-96, 14}}, textString = "yellow"), Text(textColor = {28, 108, 200}, extent = {{-84, 96}, {-58, 86}}, textString = "req1"), Text(textColor = {28, 108, 200}, extent = {{28, 96}, {54, 86}}, textString = "req3"), Text(textColor = {28, 108, 200}, extent = {{-84, -18}, {-58, -28}}, textString = "req2")}), - experiment(StopTime = 100)); -end Spec; diff --git a/resources/modelica_libraries/CRML_test/Examples/TrafficLight/Spec_externals.mo b/resources/modelica_libraries/CRML_test/Examples/TrafficLight/Spec_externals.mo deleted file mode 100644 index 85c9662..0000000 --- a/resources/modelica_libraries/CRML_test/Examples/TrafficLight/Spec_externals.mo +++ /dev/null @@ -1,55 +0,0 @@ -within CRML_test.Examples.TrafficLight; - -model Spec_externals - Modelica.Blocks.Sources.RealExpression greenObserver(y = phys.greenLamp.i) annotation( - Placement(transformation(extent = {{56, 10}, {30, 30}}))); - Modelica.Blocks.Logical.GreaterEqualThreshold oGreen(threshold = 9) annotation( - Placement(transformation(extent = {{12, 16}, {4, 24}}))); - Modelica.Blocks.Sources.RealExpression yellowObservor(y = phys.yellowLamp.i) annotation( - Placement(transformation(extent = {{56, 30}, {30, 50}}))); - Modelica.Blocks.Logical.GreaterEqualThreshold oYellow(threshold = 9) annotation( - Placement(transformation(extent = {{12, 36}, {4, 44}}))); - Modelica.Blocks.Sources.RealExpression redObserver(y = phys.redLamp.i) annotation( - Placement(transformation(extent = {{56, 50}, {30, 70}}))); - CRML.Examples.TrafficLight.Log2 log annotation( - Placement(transformation(extent = {{148, 30}, {128, 50}}))); - Modelica.Blocks.Logical.GreaterEqualThreshold oRed(threshold = 9) annotation( - Placement(transformation(extent = {{12, 56}, {4, 64}}))); - CRML.Examples.TrafficLight.Phys1 phys annotation( - Placement(transformation(extent = {{108, 30}, {88, 50}}))); - Modelica.Blocks.Sources.BooleanExpression green_active(y = oGreen.y) annotation( - Placement(transformation(extent = {{-30, 10}, {-50, 30}}))); - Modelica.Blocks.Sources.BooleanExpression yellow_active(y = oYellow.y) annotation( - Placement(transformation(extent = {{-30, 30}, {-50, 50}}))); - Modelica.Blocks.Sources.BooleanExpression red_active(y = oRed.y) annotation( - Placement(transformation(extent = {{-30, 50}, {-50, 70}}))); - Modelica.Blocks.Interfaces.BooleanOutput red annotation( - Placement(transformation(origin = {-72, 60}, extent = {{10, -10}, {-10, 10}}), iconTransformation(origin = {-110, 60}, extent = {{-10, -10}, {10, 10}}))); - Modelica.Blocks.Interfaces.BooleanOutput yellow annotation( - Placement(transformation(origin = {-72, 40}, extent = {{10, -10}, {-10, 10}}), iconTransformation(origin = {-110, 0}, extent = {{-10, -10}, {10, 10}}))); - Modelica.Blocks.Interfaces.BooleanOutput green annotation( - Placement(transformation(origin = {-72, 20}, extent = {{10, -10}, {-10, 10}}), iconTransformation(origin = {-110, -60}, extent = {{-10, -10}, {10, 10}}))); -equation - connect(greenObserver.y, oGreen.u) annotation( - Line(points = {{28.7, 20}, {12.8, 20}}, color = {0, 0, 127})); - connect(yellowObservor.y, oYellow.u) annotation( - Line(points = {{28.7, 40}, {12.8, 40}}, color = {0, 0, 127})); - connect(redObserver.y, oRed.u) annotation( - Line(points = {{28.7, 60}, {12.8, 60}}, color = {0, 0, 127})); - connect(phys.green, log.y_green) annotation( - Line(points = {{109, 32}, {114, 32}, {114, 32}, {118, 32}, {118, 32}, {127, 32}}, color = {217, 67, 180})); - connect(phys.yellow, log.y_yellow) annotation( - Line(points = {{109, 40}, {127, 40}}, color = {217, 67, 180})); - connect(phys.red, log.y_red) annotation( - Line(points = {{109, 48}, {114, 48}, {114, 48}, {118, 48}, {118, 48}, {127, 48}}, color = {217, 67, 180})); - connect(red_active.y, red) annotation( - Line(points = {{-50, 60}, {-72, 60}}, color = {255, 0, 255})); - connect(yellow_active.y, yellow) annotation( - Line(points = {{-50, 40}, {-72, 40}}, color = {255, 0, 255})); - connect(green_active.y, green) annotation( - Line(points = {{-50, 20}, {-72, 20}}, color = {255, 0, 255})); - annotation( - Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}})), - Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}}), graphics = {Rectangle(lineColor = {28, 108, 200}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, extent = {{-150, 90}, {172, -30}}), Rectangle(lineColor = {28, 108, 200}, fillColor = {170, 255, 213}, fillPattern = FillPattern.Solid, extent = {{80, 80}, {158, 0}}), Text(textColor = {28, 108, 200}, extent = {{84, 14}, {156, 4}}, textString = "Behavioral model"), Rectangle(lineColor = {28, 108, 200}, fillColor = {170, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-4, 80}, {60, 0}}), Text(textColor = {28, 108, 200}, extent = {{-10, 12}, {64, 4}}, textString = "Observation model"), Text(textColor = {28, 108, 200}, extent = {{116, 64}, {156, 56}}, textString = "I&C"), Text(textColor = {28, 108, 200}, extent = {{80, 64}, {120, 56}}, textString = "Physical"), Rectangle(lineColor = {28, 108, 200}, fillColor = {255, 213, 170}, fillPattern = FillPattern.Solid, extent = {{-54, 80}, {-26, 0}}), Text(textColor = {28, 108, 200}, extent = {{-76, 12}, {-4, 4}}, textString = "Bindings"), Text(textColor = {28, 108, 200}, extent = {{-66, -8}, {78, -26}}, textString = "Model for computing externals")}), - experiment(StopTime = 100)); -end Spec_externals; diff --git a/resources/modelica_libraries/CRML_test/Examples/TrafficLight/Spec_verif.mo b/resources/modelica_libraries/CRML_test/Examples/TrafficLight/Spec_verif.mo deleted file mode 100644 index 4f00294..0000000 --- a/resources/modelica_libraries/CRML_test/Examples/TrafficLight/Spec_verif.mo +++ /dev/null @@ -1,61 +0,0 @@ -within CRML_test.Examples.TrafficLight; - -model Spec_verif - Modelica.Blocks.Sources.RealExpression greenObserver(y = phys.greenLamp.i) annotation( - Placement(transformation(extent = {{56, 10}, {30, 30}}))); - Modelica.Blocks.Logical.GreaterEqualThreshold oGreen(threshold = 9) annotation( - Placement(transformation(extent = {{12, 16}, {4, 24}}))); - Modelica.Blocks.Sources.RealExpression yellowObservor(y = phys.yellowLamp.i) annotation( - Placement(transformation(extent = {{56, 30}, {30, 50}}))); - Modelica.Blocks.Logical.GreaterEqualThreshold oYellow(threshold = 9) annotation( - Placement(transformation(extent = {{12, 36}, {4, 44}}))); - Modelica.Blocks.Sources.RealExpression redObserver(y = phys.redLamp.i) annotation( - Placement(transformation(extent = {{56, 50}, {30, 70}}))); - CRML.Examples.TrafficLight.Log2 log annotation( - Placement(transformation(extent = {{148, 30}, {128, 50}}))); - Modelica.Blocks.Logical.GreaterEqualThreshold oRed(threshold = 9) annotation( - Placement(transformation(extent = {{12, 56}, {4, 64}}))); - CRML.Examples.TrafficLight.Phys1 phys annotation( - Placement(transformation(extent = {{108, 30}, {88, 50}}))); - Modelica.Blocks.Sources.BooleanExpression green_active(y = oGreen.y) annotation( - Placement(transformation(extent = {{-30, 10}, {-50, 30}}))); - Modelica.Blocks.Sources.BooleanExpression yellow_active(y = oYellow.y) annotation( - Placement(transformation(extent = {{-30, 30}, {-50, 50}}))); - Modelica.Blocks.Sources.BooleanExpression red_active(y = oRed.y) annotation( - Placement(transformation(extent = {{-30, 50}, {-50, 70}}))); - Modelica.Blocks.Interfaces.BooleanOutput red annotation( - Placement(transformation(origin = {-72, 60}, extent = {{10, -10}, {-10, 10}}, rotation = -0), iconTransformation(origin = {-68, 58}, extent = {{-10, -10}, {10, 10}}))); - Modelica.Blocks.Interfaces.BooleanOutput yellow annotation( - Placement(transformation(origin = {-72, 40}, extent = {{10, -10}, {-10, 10}}), iconTransformation(origin = {-58, 68}, extent = {{-10, -10}, {10, 10}}))); - Modelica.Blocks.Interfaces.BooleanOutput green annotation( - Placement(transformation(origin = {-72, 20}, extent = {{10, -10}, {-10, 10}}), iconTransformation(origin = {-48, 78}, extent = {{-10, -10}, {10, 10}}))); - Spec spec annotation( - Placement(transformation(origin = {-110, 40}, extent = {{13, -10}, {-13, 10}}, rotation = -0))); -equation - // Bindings - spec.red = red; - spec.green = green; - spec.yellow = yellow; - connect(greenObserver.y, oGreen.u) annotation( - Line(points = {{28.7, 20}, {12.8, 20}}, color = {0, 0, 127})); - connect(yellowObservor.y, oYellow.u) annotation( - Line(points = {{28.7, 40}, {12.8, 40}}, color = {0, 0, 127})); - connect(redObserver.y, oRed.u) annotation( - Line(points = {{28.7, 60}, {12.8, 60}}, color = {0, 0, 127})); - connect(phys.green, log.y_green) annotation( - Line(points = {{109, 32}, {114, 32}, {114, 32}, {118, 32}, {118, 32}, {127, 32}}, color = {217, 67, 180})); - connect(phys.yellow, log.y_yellow) annotation( - Line(points = {{109, 40}, {127, 40}}, color = {217, 67, 180})); - connect(phys.red, log.y_red) annotation( - Line(points = {{109, 48}, {114, 48}, {114, 48}, {118, 48}, {118, 48}, {127, 48}}, color = {217, 67, 180})); - connect(red_active.y, red) annotation( - Line(points = {{-50, 60}, {-72, 60}}, color = {255, 0, 255})); - connect(yellow_active.y, yellow) annotation( - Line(points = {{-50, 40}, {-72, 40}}, color = {255, 0, 255})); - connect(green_active.y, green) annotation( - Line(points = {{-50, 20}, {-72, 20}}, color = {255, 0, 255})); - annotation( - Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-160, -40}, {180, 100}}), graphics = {Rectangle(extent = {{-160, 100}, {180, -40}}, lineColor = {28, 108, 200}), Line(points = {{-40, 28}, {0, -30}, {62, 96}}, color = {0, 127, 0}, smooth = Smooth.None, thickness = 1)}), - Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-160, -40}, {180, 100}}), graphics = {Rectangle(lineColor = {28, 108, 200}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, extent = {{-150, 90}, {172, -30}}), Rectangle(lineColor = {28, 108, 200}, fillColor = {170, 255, 213}, fillPattern = FillPattern.Solid, extent = {{80, 80}, {158, 0}}), Text(textColor = {28, 108, 200}, extent = {{84, 14}, {156, 4}}, textString = "Behavioral model"), Rectangle(lineColor = {28, 108, 200}, fillColor = {170, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-4, 80}, {60, 0}}), Text(textColor = {28, 108, 200}, extent = {{-10, 12}, {64, 4}}, textString = "Observation model"), Text(textColor = {28, 108, 200}, extent = {{116, 64}, {156, 56}}, textString = "I&C"), Text(textColor = {28, 108, 200}, extent = {{80, 64}, {120, 56}}, textString = "Physical"), Rectangle(lineColor = {28, 108, 200}, fillColor = {255, 213, 170}, fillPattern = FillPattern.Solid, extent = {{-54, 80}, {-26, 0}}), Text(textColor = {28, 108, 200}, extent = {{-76, 12}, {-4, 4}}, textString = "Bindings"), Text(textColor = {28, 108, 200}, extent = {{-66, -8}, {78, -26}}, textString = "Model for computing externals")}), - experiment(StopTime = 100)); -end Spec_verif; diff --git a/resources/modelica_libraries/CRML_test/Examples/TrafficLight/package.mo b/resources/modelica_libraries/CRML_test/Examples/TrafficLight/package.mo deleted file mode 100644 index 277dc1b..0000000 --- a/resources/modelica_libraries/CRML_test/Examples/TrafficLight/package.mo +++ /dev/null @@ -1,4 +0,0 @@ -within CRML_test.Examples; - -package TrafficLight -end TrafficLight; diff --git a/resources/modelica_libraries/CRML_test/Examples/TrafficLight/package.order b/resources/modelica_libraries/CRML_test/Examples/TrafficLight/package.order deleted file mode 100644 index d731db0..0000000 --- a/resources/modelica_libraries/CRML_test/Examples/TrafficLight/package.order +++ /dev/null @@ -1,3 +0,0 @@ -Spec -Spec_externals -Spec_verif diff --git a/resources/modelica_libraries/CRML_test/Examples/package.mo b/resources/modelica_libraries/CRML_test/Examples/package.mo deleted file mode 100644 index 1f19cd2..0000000 --- a/resources/modelica_libraries/CRML_test/Examples/package.mo +++ /dev/null @@ -1,7 +0,0 @@ -within CRML_test; - -package Examples - annotation( - Diagram(graphics), - Icon(graphics = {Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Text(extent = {{-42, 38}, {44, -30}}, textString = "", fontName = "Symbol"), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Examples; diff --git a/resources/modelica_libraries/CRML_test/Examples/package.order b/resources/modelica_libraries/CRML_test/Examples/package.order deleted file mode 100644 index 1a142bd..0000000 --- a/resources/modelica_libraries/CRML_test/Examples/package.order +++ /dev/null @@ -1 +0,0 @@ -TrafficLight diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore.mo b/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore.mo deleted file mode 100644 index 8de3f7e..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore.mo +++ /dev/null @@ -1,69 +0,0 @@ -within CRML_test.FORML.AfterBefore; -block AfterBefore -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; - CRML.ETL.Connectors.WhileOutput tl1 = tl; -public - CRML.ETL.Connectors.ClockInput ck1 "Boolean4 condition" annotation( - Placement(transformation(extent = {{-120, 30}, {-100, 50}}), iconTransformation(extent = {{-120, 30}, {-100, 50}}))); - CRML.ETL.Connectors.WhileInput tl annotation( - Placement(transformation(extent = {{-10, 90}, {10, 110}}), iconTransformation(extent = {{-10, 90}, {10, 110}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_before_b2 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.ETL.TimeLocators.Periods periods(leftBoundaryIncluded = false, rightBoundaryIncluded = false) annotation( - Placement(transformation(extent = {{-10, -10}, {10, 10}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck1 annotation( - Placement(transformation(extent = {{-80, 30}, {-60, 50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck1 annotation( - Placement(transformation(extent = {{-44, 36}, {-36, 44}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck2 annotation( - Placement(transformation(extent = {{-80, -50}, {-60, -30}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck2 annotation( - Placement(transformation(extent = {{-44, -44}, {-36, -36}}))); - -public - CRML.ETL.Connectors.ClockInput ck2 "Boolean4 condition" annotation( - Placement(transformation(extent={{-120,-50},{-100,-30}}), iconTransformation(extent={{-120, - -50},{-100,-30}}))); -equation - if (cardinality(tl) == 0) then - tl.timePeriod = true; - tl.clock = CRML.ETL.Types.Boolean4.true4; - tl.isLeftBoundaryIncluded = true; - tl.isRightBoundaryIncluded = true; - end if; - connect(ck1, clockToBoolean_ck1.u) annotation( - Line(points = {{-110, 40}, {-82, 40}}, color = {175, 175, 175}, pattern = LinePattern.Dot, thickness = 0.5)); - connect(clockToBoolean_ck1.y, booleanToBoolean4_ck1.u) annotation( - Line(points = {{-59, 40}, {-44.4, 40}}, color = {255, 0, 255})); - connect(booleanToBoolean4_ck1.y, periods.u1) annotation( - Line(points = {{-35.6, 40}, {-20, 40}, {-20, 0}, {-11, 0}}, color = {162, 29, 33})); - connect(clockToBoolean_ck2.y, booleanToBoolean4_ck2.u) annotation( - Line(points = {{-59, -40}, {-44.4, -40}}, color = {255, 0, 255})); - connect(booleanToBoolean4_ck2.y, periods.u2) annotation( - Line(points = {{-35.6, -40}, {-20, -40}, {-20, -8}, {-11, -8}}, color = {162, 29, 33})); - connect(periods.y, p_after_b1_before_b2) annotation (Line(points={{0,-10},{0,-20}, - {80,-20},{80,0},{110,0}}, color={0,0,255})); - connect(tl1, periods.tl) annotation( - Line(points = {{0, 100}, {0, 10}}, color = {0, 0, 255})); - connect(clockToBoolean_ck2.u, ck2) annotation (Line( - points={{-82,-40},{-110,-40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation( - Icon(coordinateSystem(preserveAspectRatio = false), graphics = {Rectangle(fillColor = {85, 170, 255}, fillPattern = FillPattern.Solid, lineThickness = 5, borderPattern = BorderPattern.Raised, extent = {{-100, 100}, {100, -100}}), Rectangle(lineColor = {175, 175, 175}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-70, 30}, {70, -52}}), Line(points = {{-50, -34}, {-50, -12}}, pattern = LinePattern.Dash), Line(points = {{-48, -12}, {52, -12}}, pattern = LinePattern.Dash), Line(points = {{52, -12}, {52, -34}}, pattern = LinePattern.Dash), Line(points = {{-62, -34}, {58, -34}}, color = {175, 175, 175}), Line(points = {{-50, -12}, {-50, 10}}, pattern = LinePattern.Dash), Rectangle(fillColor = {175, 175, 175}, fillPattern = FillPattern.Solid, extent = {{22, 2}, {52, -12}}), Line(points = {{-50, 10}, {22, 10}}, pattern = LinePattern.Dash), Line(points = {{22, 10}, {22, -12}}, pattern = LinePattern.Dash), Line(points = {{22, -12}, {20, -10}}, pattern = LinePattern.Dash), Line(points = {{22, -12}, {24, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, -12}, {-52, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, -12}, {-48, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, 30}, {-70, 30}, {-70, -52}, {-50, -52}}), Line(points = {{50, 30}, {70, 30}, {70, -52}, {50, -52}}), Text(textColor = {175, 175, 175}, extent = {{-28, -10}, {22, -34}}, textString = "%u"), Text(extent = {{-78, 86}, {76, 38}}, textString = "after before")}), - Diagram(coordinateSystem(preserveAspectRatio = false)), - Documentation(info = " -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end AfterBefore; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore2.mo b/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore2.mo deleted file mode 100644 index db552b0..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore2.mo +++ /dev/null @@ -1,96 +0,0 @@ -within CRML_test.FORML.AfterBefore; -block AfterBefore2 - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - CRML.ETL.Connectors.WhileOutput tl1 = tl; - -public - CRML.ETL.Connectors.ClockInput ck1 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,30},{-100,50}}), iconTransformation(extent={{-120,30}, - {-100,50}}))); - CRML.ETL.Connectors.WhileInput tl annotation (Placement( - transformation(extent={{-10,90},{10,110}}), iconTransformation(extent={ - {-10,90},{10,110}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_before_b2 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); -public - CRML.ETL.Connectors.ClockInput ck2 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,-50},{-100,-30}}), iconTransformation( - extent={{-120,-50},{-100,-30}}))); - CRML.TimeLocators.Continuous.AfterBefore - afterBefore - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck1 - annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck1 - annotation (Placement(transformation(extent={{-44,36},{-36,44}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck2 - annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck2 - annotation (Placement(transformation(extent={{-44,-44},{-36,-36}}))); -equation - if (cardinality(tl) == 0) then - tl.timePeriod = true; - tl.clock = CRML.ETL.Types.Boolean4.true4; - tl.isLeftBoundaryIncluded = true; - tl.isRightBoundaryIncluded = true; - end if; - - connect(ck1, clockToBoolean_ck1.u) annotation (Line( - points={{-110,40},{-110,40},{-110,40},{-82,40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean_ck1.y, booleanToBoolean4_ck1.u) - annotation (Line(points={{-59,40},{-44.4,40}}, color={255,0,255})); - connect(booleanToBoolean4_ck1.y, afterBefore.u1) annotation (Line(points={{-35.6, - 40},{-20,40},{-20,0},{-11,0}}, color={162,29,33})); - connect(ck2, clockToBoolean_ck2.u) annotation (Line( - points={{-110,-40},{-82,-40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean_ck2.y, booleanToBoolean4_ck2.u) - annotation (Line(points={{-59,-40},{-44.4,-40}}, color={255,0,255})); - connect(booleanToBoolean4_ck2.y, afterBefore.u2) annotation (Line(points={{-35.6, - -40},{-20,-40},{-20,-8},{-11,-8}}, color={162,29,33})); - connect(afterBefore.y, p_after_b1_before_b2) annotation (Line(points={{0,-10}, - {0,-20},{80,-20},{80,0},{110,0}}, color={0,0,255})); - connect(tl1, afterBefore.tl) - annotation (Line(points={{0,100},{0,10}}, color={0,0,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle(extent={{-100, - 100},{100,-100}}, fillColor = {85, 170, 255}, lineThickness = 5, fillPattern = FillPattern.Solid, borderPattern = BorderPattern.Raised, lineColor = {0, 0, 0}), Rectangle(extent={{-70,30}, - {70,-52}}, lineColor = {175, 175, 175}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid), Line(points={{-50,-34}, - {-50,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-48,-12}, - {52,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{52,-12}, - {52,-34}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-62,-34}, - {58,-34}}, color = {175, 175, 175}), Line(points={{-50,-12}, - {-50,10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Rectangle(extent={{22,2},{ - 52,-12}}, lineColor = {0, 0, 0}, fillColor = {175, 175, 175}, fillPattern = FillPattern.Solid), Line(points={{-50,10}, - {22,10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,10}, - {22,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,-12}, - {20,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,-12}, - {24,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,-12}, - {-52,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,-12}, - {-48,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,30}, - {-70,30},{-70,-52},{-50,-52}}, color = {0, 0, 0}), Line(points={{50,30}, - {70,30},{70,-52},{50,-52}}, color = {0, 0, 0}), Text(extent={{-28,-10}, - {22,-34}}, lineColor = {175, 175, 175}, pattern = LinePattern.Dash, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, textString = "%u"), Text(extent={{-78,86}, - {76,38}}, lineColor = {0, 0, 0}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, textString = "after before")}), - Diagram( - coordinateSystem(preserveAspectRatio=false)), - Documentation(info=" -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end AfterBefore2; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore_externals.mo b/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore_externals.mo deleted file mode 100644 index be4f972..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore_externals.mo +++ /dev/null @@ -1,43 +0,0 @@ -within CRML_test.FORML.AfterBefore; -model AfterBefore_externals - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - CRML.ETL.Connectors.ClockOutput ck1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.ClockOutput ck2 - annotation (Placement(transformation(extent={{100,-80},{120,-60}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-6,54},{6,66}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-6,-66},{6,-54}}))); -equation - connect(b1.y, clockEvent_1.u) - annotation (Line(points={{-39,60},{-6.6,60}}, color={217,67,180})); - connect(clockEvent_1.y, ck1) annotation (Line( - points={{6.6,60},{40,60},{40,50},{110,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(b2.y, clockEvent_2.u) - annotation (Line(points={{-39,-60},{-6.6,-60}}, color={217,67,180})); - connect(clockEvent_2.y, ck2) annotation (Line( - points={{6.6,-60},{40,-60},{40,-70},{110,-70}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end AfterBefore_externals; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore_verif.mo b/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore_verif.mo deleted file mode 100644 index 3e7cc59..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore_verif.mo +++ /dev/null @@ -1,21 +0,0 @@ -within CRML_test.FORML.AfterBefore; -model AfterBefore_verif - AfterBefore_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - AfterBefore afterBefore - annotation (Placement(transformation(extent={{0,0},{20,20}}))); -equation - // Bindings - externals.ck1 = afterBefore.ck1; - externals.ck2 = afterBefore.ck2; - annotation (Icon(graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent={{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points={{-36,60},{64,0},{-36,-60},{-36,60}})})); -end AfterBefore_verif; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore_verif2.mo b/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore_verif2.mo deleted file mode 100644 index 479b951..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/AfterBefore_verif2.mo +++ /dev/null @@ -1,22 +0,0 @@ -within CRML_test.FORML.AfterBefore; -model AfterBefore_verif2 - - AfterBefore_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - AfterBefore2 afterBefore2 - annotation (Placement(transformation(extent={{-26,16},{-6,36}}))); -equation - // Bindings - externals.ck1 = afterBefore2.ck1; - externals.ck2 = afterBefore2.ck2; - annotation (Icon(graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent={{-100,-102},{100,98}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points={{-36,58},{64,-2},{-36,-62},{-36,58}})})); -end AfterBefore_verif2; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/package.mo b/resources/modelica_libraries/CRML_test/FORML/AfterBefore/package.mo deleted file mode 100644 index cbdced7..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.FORML; -package AfterBefore -end AfterBefore; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/package.order b/resources/modelica_libraries/CRML_test/FORML/AfterBefore/package.order deleted file mode 100644 index 0aa4531..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterBefore/package.order +++ /dev/null @@ -1,5 +0,0 @@ -AfterBefore -AfterBefore2 -AfterBefore_externals -AfterBefore_verif -AfterBefore_verif2 diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/AfterBefore_no_ext.mo b/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/AfterBefore_no_ext.mo deleted file mode 100644 index 2faefc0..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/AfterBefore_no_ext.mo +++ /dev/null @@ -1,42 +0,0 @@ -within CRML_test.FORML.AfterBefore_no_ext; -model AfterBefore_no_ext -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-26,24},{-14,36}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-26,-56},{-14,-44}}))); - AfterBefore.AfterBefore afterBefore - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_until_b2 - annotation (Placement(transformation(extent={{92,-10},{112,10}}))); -equation - - connect(b1.y,clockEvent_1. u) - annotation (Line(points={{-59,30},{-26.6,30}},color={217,67,180})); - connect(b2.y,clockEvent_2. u) - annotation (Line(points={{-59,-50},{-26.6,-50}},color={217,67,180})); - connect(clockEvent_2.y, afterBefore.ck2) annotation (Line( - points={{-13.4,-50},{34,-50},{34,-4},{39,-4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent_1.y, afterBefore.ck1) annotation (Line( - points={{-13.4,30},{34,30},{34,4},{39,4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(afterBefore.p_after_b1_before_b2, p_after_b1_until_b2) - annotation (Line(points={{61,0},{102,0}}, color={0,0,255})); -end AfterBefore_no_ext; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/AfterBefore_no_ext2.mo b/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/AfterBefore_no_ext2.mo deleted file mode 100644 index b12cda8..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/AfterBefore_no_ext2.mo +++ /dev/null @@ -1,42 +0,0 @@ -within CRML_test.FORML.AfterBefore_no_ext; -model AfterBefore_no_ext2 -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-26,24},{-14,36}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-26,-56},{-14,-44}}))); - AfterBefore.AfterBefore2 afterBefore2_1 - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_until_b2 - annotation (Placement(transformation(extent={{92,-10},{112,10}}))); -equation - - connect(b1.y,clockEvent_1. u) - annotation (Line(points={{-59,30},{-26.6,30}},color={217,67,180})); - connect(b2.y,clockEvent_2. u) - annotation (Line(points={{-59,-50},{-26.6,-50}},color={217,67,180})); - connect(clockEvent_2.y, afterBefore2_1.ck2) annotation (Line( - points={{-13.4,-50},{34,-50},{34,-4},{39,-4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent_1.y, afterBefore2_1.ck1) annotation (Line( - points={{-13.4,30},{34,30},{34,4},{39,4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(afterBefore2_1.p_after_b1_before_b2, p_after_b1_until_b2) - annotation (Line(points={{61,0},{102,0}}, color={0,0,255})); -end AfterBefore_no_ext2; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/package.mo b/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/package.mo deleted file mode 100644 index fa39504..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.FORML; -package AfterBefore_no_ext -end AfterBefore_no_ext; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/package.order b/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/package.order deleted file mode 100644 index 558f001..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterBefore_no_ext/package.order +++ /dev/null @@ -1,2 +0,0 @@ -AfterBefore_no_ext -AfterBefore_no_ext2 diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor2.mo b/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor2.mo deleted file mode 100644 index 37ddad9..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor2.mo +++ /dev/null @@ -1,85 +0,0 @@ -within CRML_test.FORML.AfterFor; -block AfterFor2 - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - CRML.ETL.Connectors.WhileOutput tl1 = tl; - -public - CRML.ETL.Connectors.ClockInput ck1 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,30},{-100,50}}), iconTransformation(extent={{-120,30}, - {-100,50}}))); - CRML.ETL.Connectors.WhileInput tl annotation (Placement( - transformation(extent={{-10,90},{10,110}}), iconTransformation(extent={ - {-10,90},{10,110}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_for_d1 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); -public - CRML.ETL.Connectors.RealInput d1 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,-50},{-100,-30}}), iconTransformation( - extent={{-120,-50},{-100,-30}}))); - CRML.TimeLocators.Continuous.AfterFor - afterFor - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck1 - annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck1 - annotation (Placement(transformation(extent={{-44,36},{-36,44}}))); -equation - if (cardinality(tl) == 0) then - tl.timePeriod = true; - tl.clock = CRML.ETL.Types.Boolean4.true4; - tl.isLeftBoundaryIncluded = true; - tl.isRightBoundaryIncluded = true; - end if; - - connect(ck1, clockToBoolean_ck1.u) annotation (Line( - points={{-110,40},{-110,40},{-110,40},{-82,40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean_ck1.y, booleanToBoolean4_ck1.u) - annotation (Line(points={{-59,40},{-44.4,40}}, color={255,0,255})); - connect(afterFor.y, p_after_b1_for_d1) annotation (Line(points={{0,-10},{0,-20}, - {80,-20},{80,0},{110,0}}, color={0,0,255})); - connect(tl1, afterFor.tl) - annotation (Line(points={{0,100},{0,10}}, color={0,0,255})); - connect(booleanToBoolean4_ck1.y, afterFor.u) annotation (Line(points={{-35.6, - 40},{-16,40},{-16,0},{-11,0}}, color={162,29,33})); - connect(d1, afterFor.duration) annotation (Line(points={{-110,-40},{-16,-40}, - {-16,-8},{-11,-8}}, color={0,0,0})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle(extent={{-100, - 100},{100,-100}}, fillColor = {85, 170, 255}, lineThickness = 5, fillPattern = FillPattern.Solid, borderPattern = BorderPattern.Raised, lineColor = {0, 0, 0}), Rectangle(extent={{-70,30}, - {70,-52}}, lineColor = {175, 175, 175}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid), Line(points={{-50,-34}, - {-50,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-48,-12}, - {52,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{52,-12}, - {52,-34}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-62,-34}, - {58,-34}}, color = {175, 175, 175}), Line(points={{-50,-12}, - {-50,10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Rectangle(extent={{22,2},{ - 52,-12}}, lineColor = {0, 0, 0}, fillColor = {175, 175, 175}, fillPattern = FillPattern.Solid), Line(points={{-50,10}, - {22,10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,10}, - {22,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,-12}, - {20,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,-12}, - {24,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,-12}, - {-52,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,-12}, - {-48,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,30}, - {-70,30},{-70,-52},{-50,-52}}, color = {0, 0, 0}), Line(points={{50,30}, - {70,30},{70,-52},{50,-52}}, color = {0, 0, 0}), Text(extent={{-28,-10}, - {22,-34}}, lineColor = {175, 175, 175}, pattern = LinePattern.Dash, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, textString = "%u"), Text(extent={{-78,86}, - {76,38}}, lineColor = {0, 0, 0}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, textString = "after before")}), - Diagram( - coordinateSystem(preserveAspectRatio=false)), - Documentation(info=" -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end AfterFor2; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_externals.mo b/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_externals.mo deleted file mode 100644 index a841b6a..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_externals.mo +++ /dev/null @@ -1,33 +0,0 @@ -within CRML_test.FORML.AfterFor; -model AfterFor_externals - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5}) - annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); - CRML.Blocks.Math.Constant duration(k=3) - annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - CRML.ETL.Connectors.ClockOutput ck1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.RealOutput d1 - annotation (Placement(transformation(extent={{100,-80},{120,-60}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-6,54},{6,66}}))); -equation - connect(b1.y, clockEvent_1.u) - annotation (Line(points={{-39,60},{-6.6,60}}, color={217,67,180})); - connect(clockEvent_1.y, ck1) annotation (Line( - points={{6.6,60},{40,60},{40,50},{110,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(duration.y, d1) annotation (Line(points={{-39,-60},{94,-60},{94,-70}, - {110,-70}}, color={0,0,0})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end AfterFor_externals; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_verif.mo b/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_verif.mo deleted file mode 100644 index 7fe13c0..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_verif.mo +++ /dev/null @@ -1,21 +0,0 @@ -within CRML_test.FORML.AfterFor; -model AfterFor_verif - AfterFor_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - AfterFor_wip afterFor - annotation (Placement(transformation(extent={{0,0},{20,20}}))); -equation - // Bindings - externals.ck1 =afterFor.ck1; - externals.d1 = afterFor.ck2; - annotation (Icon(graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent={{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points={{-36,60},{64,0},{-36,-60},{-36,60}})})); -end AfterFor_verif; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_verif2.mo b/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_verif2.mo deleted file mode 100644 index 09e4357..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_verif2.mo +++ /dev/null @@ -1,23 +0,0 @@ -within CRML_test.FORML.AfterFor; -model AfterFor_verif2 - - AfterFor_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - AfterFor2 afterFor2 - annotation (Placement(transformation(extent={{-26,16},{-6,36}}))); -equation - // Bindings - externals.ck1 =afterFor2.ck1; - externals.d1 = afterFor2.d1; - annotation (Icon(graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent={{-100,-102},{100,98}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points={{-36,58},{64,-2},{-36,-62},{-36,58}})}), experiment( - StopTime=100, __Dymola_Algorithm="Dassl")); -end AfterFor_verif2; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_wip.mo b/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_wip.mo deleted file mode 100644 index 7223fec..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterFor/AfterFor_wip.mo +++ /dev/null @@ -1,69 +0,0 @@ -within CRML_test.FORML.AfterFor; -block AfterFor_wip -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; - CRML.ETL.Connectors.WhileOutput tl1 = tl; -public - CRML.ETL.Connectors.ClockInput ck1 "Boolean4 condition" annotation( - Placement(transformation(extent = {{-120, 30}, {-100, 50}}), iconTransformation(extent = {{-120, 30}, {-100, 50}}))); - CRML.ETL.Connectors.WhileInput tl annotation( - Placement(transformation(extent = {{-10, 90}, {10, 110}}), iconTransformation(extent = {{-10, 90}, {10, 110}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_for_d1 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.ETL.TimeLocators.Periods periods(leftBoundaryIncluded = false, rightBoundaryIncluded = false) annotation( - Placement(transformation(extent = {{-10, -10}, {10, 10}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck1 annotation( - Placement(transformation(extent = {{-80, 30}, {-60, 50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck1 annotation( - Placement(transformation(extent = {{-44, 36}, {-36, 44}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck2 annotation( - Placement(transformation(extent = {{-80, -50}, {-60, -30}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck2 annotation( - Placement(transformation(extent = {{-44, -44}, {-36, -36}}))); - -public - CRML.ETL.Connectors.ClockInput ck2 "Boolean4 condition" annotation( - Placement(transformation(extent={{-120,-50},{-100,-30}}), iconTransformation(extent={{-120, - -50},{-100,-30}}))); -equation - if (cardinality(tl) == 0) then - tl.timePeriod = true; - tl.clock = CRML.ETL.Types.Boolean4.true4; - tl.isLeftBoundaryIncluded = true; - tl.isRightBoundaryIncluded = true; - end if; - connect(ck1, clockToBoolean_ck1.u) annotation( - Line(points = {{-110, 40}, {-82, 40}}, color = {175, 175, 175}, pattern = LinePattern.Dot, thickness = 0.5)); - connect(clockToBoolean_ck1.y, booleanToBoolean4_ck1.u) annotation( - Line(points = {{-59, 40}, {-44.4, 40}}, color = {255, 0, 255})); - connect(booleanToBoolean4_ck1.y, periods.u1) annotation( - Line(points = {{-35.6, 40}, {-20, 40}, {-20, 0}, {-11, 0}}, color = {162, 29, 33})); - connect(clockToBoolean_ck2.y, booleanToBoolean4_ck2.u) annotation( - Line(points = {{-59, -40}, {-44.4, -40}}, color = {255, 0, 255})); - connect(booleanToBoolean4_ck2.y, periods.u2) annotation( - Line(points = {{-35.6, -40}, {-20, -40}, {-20, -8}, {-11, -8}}, color = {162, 29, 33})); - connect(periods.y, p_after_b1_for_d1) annotation (Line(points={{0,-10},{0,-20}, - {80,-20},{80,0},{110,0}}, color={0,0,255})); - connect(tl1, periods.tl) annotation( - Line(points = {{0, 100}, {0, 10}}, color = {0, 0, 255})); - connect(clockToBoolean_ck2.u, ck2) annotation (Line( - points={{-82,-40},{-110,-40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation( - Icon(coordinateSystem(preserveAspectRatio = false), graphics = {Rectangle(fillColor = {85, 170, 255}, fillPattern = FillPattern.Solid, lineThickness = 5, borderPattern = BorderPattern.Raised, extent = {{-100, 100}, {100, -100}}), Rectangle(lineColor = {175, 175, 175}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-70, 30}, {70, -52}}), Line(points = {{-50, -34}, {-50, -12}}, pattern = LinePattern.Dash), Line(points = {{-48, -12}, {52, -12}}, pattern = LinePattern.Dash), Line(points = {{52, -12}, {52, -34}}, pattern = LinePattern.Dash), Line(points = {{-62, -34}, {58, -34}}, color = {175, 175, 175}), Line(points = {{-50, -12}, {-50, 10}}, pattern = LinePattern.Dash), Rectangle(fillColor = {175, 175, 175}, fillPattern = FillPattern.Solid, extent = {{22, 2}, {52, -12}}), Line(points = {{-50, 10}, {22, 10}}, pattern = LinePattern.Dash), Line(points = {{22, 10}, {22, -12}}, pattern = LinePattern.Dash), Line(points = {{22, -12}, {20, -10}}, pattern = LinePattern.Dash), Line(points = {{22, -12}, {24, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, -12}, {-52, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, -12}, {-48, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, 30}, {-70, 30}, {-70, -52}, {-50, -52}}), Line(points = {{50, 30}, {70, 30}, {70, -52}, {50, -52}}), Text(textColor = {175, 175, 175}, extent = {{-28, -10}, {22, -34}}, textString = "%u"), Text(extent = {{-78, 86}, {76, 38}}, textString = "after before")}), - Diagram(coordinateSystem(preserveAspectRatio = false)), - Documentation(info = " -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end AfterFor_wip; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterFor/package.mo b/resources/modelica_libraries/CRML_test/FORML/AfterFor/package.mo deleted file mode 100644 index f8b61c1..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterFor/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.FORML; -package AfterFor -end AfterFor; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterFor/package.order b/resources/modelica_libraries/CRML_test/FORML/AfterFor/package.order deleted file mode 100644 index bb9892d..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterFor/package.order +++ /dev/null @@ -1,5 +0,0 @@ -AfterFor_wip -AfterFor2 -AfterFor_externals -AfterFor_verif -AfterFor_verif2 diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/AfterFor_no_ext2.mo b/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/AfterFor_no_ext2.mo deleted file mode 100644 index 0306c5d..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/AfterFor_no_ext2.mo +++ /dev/null @@ -1,33 +0,0 @@ -within CRML_test.FORML.AfterFor_no_ext; -model AfterFor_no_ext2 -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; -public - AfterFor.AfterFor2 afterFor2 - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_for_d1 - annotation (Placement(transformation(extent={{92,-10},{112,10}}))); -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5}) - annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - CRML.Blocks.Math.Constant duration(k=3) - annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-26,54},{-14,66}}))); -equation - - connect(afterFor2.p_after_b1_for_d1, p_after_b1_for_d1) - annotation (Line(points={{61,0},{102,0}}, color={0,0,255})); - connect(b1.y,clockEvent_1. u) - annotation (Line(points={{-59,60},{-26.6,60}},color={217,67,180})); - connect(clockEvent_1.y, afterFor2.ck1) annotation (Line( - points={{-13.4,60},{12,60},{12,4},{39,4},{39,4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(duration.y, afterFor2.d1) annotation (Line(points={{-59,-60},{34,-60}, - {34,-4},{39,-4}}, color={0,0,0})); -end AfterFor_no_ext2; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/AfterFor_no_ext_wip.mo b/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/AfterFor_no_ext_wip.mo deleted file mode 100644 index 88d771c..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/AfterFor_no_ext_wip.mo +++ /dev/null @@ -1,31 +0,0 @@ -within CRML_test.FORML.AfterFor_no_ext; -model AfterFor_no_ext_wip -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; -public - AfterFor.AfterFor_wip afterFor - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_for_d1 - annotation (Placement(transformation(extent={{92,-10},{112,10}}))); -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5}) - annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - CRML.Blocks.Math.Constant duration(k=3) - annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-26,54},{-14,66}}))); -equation - - connect(afterFor.p_after_b1_for_d1, p_after_b1_for_d1) - annotation (Line(points={{61,0},{102,0}}, color={0,0,255})); - connect(b1.y,clockEvent_1. u) - annotation (Line(points={{-59,60},{-26.6,60}},color={217,67,180})); - connect(clockEvent_1.y, afterFor.ck1) annotation (Line( - points={{-13.4,60},{18,60},{18,0},{39,0},{39,4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); -end AfterFor_no_ext_wip; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/package.mo b/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/package.mo deleted file mode 100644 index b39ada5..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.FORML; -package AfterFor_no_ext -end AfterFor_no_ext; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/package.order b/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/package.order deleted file mode 100644 index 9b27688..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterFor_no_ext/package.order +++ /dev/null @@ -1,2 +0,0 @@ -AfterFor_no_ext_wip -AfterFor_no_ext2 diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil.mo b/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil.mo deleted file mode 100644 index 0d4583b..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil.mo +++ /dev/null @@ -1,69 +0,0 @@ -within CRML_test.FORML.AfterUntil; -block AfterUntil -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; - CRML.ETL.Connectors.WhileOutput tl1 = tl; -public - CRML.ETL.Connectors.ClockInput ck1 "Boolean4 condition" annotation( - Placement(transformation(extent = {{-120, 30}, {-100, 50}}), iconTransformation(extent = {{-120, 30}, {-100, 50}}))); - CRML.ETL.Connectors.WhileInput tl annotation( - Placement(transformation(extent = {{-10, 90}, {10, 110}}), iconTransformation(extent = {{-10, 90}, {10, 110}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_until_b2 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); -public - CRML.ETL.Connectors.ClockInput ck2 "Boolean4 condition" annotation( - Placement(transformation(extent = {{-120, -50}, {-100, -30}}), iconTransformation(extent={{-120, - -50},{-100,-30}}))); - CRML.ETL.TimeLocators.Periods periods(leftBoundaryIncluded = false, - rightBoundaryIncluded=true) annotation( - Placement(transformation(extent = {{-10, -10}, {10, 10}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck1 annotation( - Placement(transformation(extent = {{-80, 30}, {-60, 50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck1 annotation( - Placement(transformation(extent = {{-44, 36}, {-36, 44}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck2 annotation( - Placement(transformation(extent = {{-80, -50}, {-60, -30}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck2 annotation( - Placement(transformation(extent = {{-44, -44}, {-36, -36}}))); - -equation - if (cardinality(tl) == 0) then - tl.timePeriod = true; - tl.clock = CRML.ETL.Types.Boolean4.true4; - tl.isLeftBoundaryIncluded = true; - tl.isRightBoundaryIncluded = true; - end if; - connect(ck1, clockToBoolean_ck1.u) annotation( - Line(points = {{-110, 40}, {-82, 40}}, color = {175, 175, 175}, pattern = LinePattern.Dot, thickness = 0.5)); - connect(clockToBoolean_ck1.y, booleanToBoolean4_ck1.u) annotation( - Line(points = {{-59, 40}, {-44.4, 40}}, color = {255, 0, 255})); - connect(booleanToBoolean4_ck1.y, periods.u1) annotation( - Line(points = {{-35.6, 40}, {-20, 40}, {-20, 0}, {-11, 0}}, color = {162, 29, 33})); - connect(ck2, clockToBoolean_ck2.u) annotation( - Line(points = {{-110, -40}, {-82, -40}}, color = {175, 175, 175}, pattern = LinePattern.Dot, thickness = 0.5)); - connect(clockToBoolean_ck2.y, booleanToBoolean4_ck2.u) annotation( - Line(points = {{-59, -40}, {-44.4, -40}}, color = {255, 0, 255})); - connect(booleanToBoolean4_ck2.y, periods.u2) annotation( - Line(points = {{-35.6, -40}, {-20, -40}, {-20, -8}, {-11, -8}}, color = {162, 29, 33})); - connect(periods.y, p_after_b1_until_b2) annotation (Line(points={{0,-10},{0,-20}, - {80,-20},{80,0},{110,0}}, color={0,0,255})); - connect(tl1, periods.tl) annotation( - Line(points = {{0, 100}, {0, 10}}, color = {0, 0, 255})); - annotation( - Icon(coordinateSystem(preserveAspectRatio = false), graphics = {Rectangle(fillColor = {85, 170, 255}, fillPattern = FillPattern.Solid, lineThickness = 5, borderPattern = BorderPattern.Raised, extent = {{-100, 100}, {100, -100}}), Rectangle(lineColor = {175, 175, 175}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-70, 30}, {70, -52}}), Line(points = {{-50, -34}, {-50, -12}}, pattern = LinePattern.Dash), Line(points = {{-48, -12}, {52, -12}}, pattern = LinePattern.Dash), Line(points = {{52, -12}, {52, -34}}, pattern = LinePattern.Dash), Line(points = {{-62, -34}, {58, -34}}, color = {175, 175, 175}), Line(points = {{-50, -12}, {-50, 10}}, pattern = LinePattern.Dash), Rectangle(fillColor = {175, 175, 175}, fillPattern = FillPattern.Solid, extent = {{22, 2}, {52, -12}}), Line(points = {{-50, 10}, {22, 10}}, pattern = LinePattern.Dash), Line(points = {{22, 10}, {22, -12}}, pattern = LinePattern.Dash), Line(points = {{22, -12}, {20, -10}}, pattern = LinePattern.Dash), Line(points = {{22, -12}, {24, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, -12}, {-52, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, -12}, {-48, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, 30}, {-70, 30}, {-70, -52}, {-50, -52}}), Line(points = {{50, 30}, {70, 30}, {70, -52}, {50, -52}}), Text(textColor = {175, 175, 175}, extent = {{-28, -10}, {22, -34}}, textString = "%u"), Text(extent = {{-78, 86}, {76, 38}}, - textString="after until", - textColor={0,0,0})}), - Diagram(coordinateSystem(preserveAspectRatio = false)), - Documentation(info = " -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end AfterUntil; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil_externals.mo b/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil_externals.mo deleted file mode 100644 index 8bb6f74..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil_externals.mo +++ /dev/null @@ -1,43 +0,0 @@ -within CRML_test.FORML.AfterUntil; -model AfterUntil_externals - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - CRML.ETL.Connectors.ClockOutput ck1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.ClockOutput ck2 - annotation (Placement(transformation(extent={{100,-80},{120,-60}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-6,54},{6,66}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-6,-66},{6,-54}}))); -equation - connect(b1.y, clockEvent_1.u) - annotation (Line(points={{-39,60},{-6.6,60}}, color={217,67,180})); - connect(clockEvent_1.y, ck1) annotation (Line( - points={{6.6,60},{40,60},{40,50},{110,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(b2.y, clockEvent_2.u) - annotation (Line(points={{-39,-60},{-6.6,-60}}, color={217,67,180})); - connect(clockEvent_2.y, ck2) annotation (Line( - points={{6.6,-60},{40,-60},{40,-70},{110,-70}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end AfterUntil_externals; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil_verif.mo b/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil_verif.mo deleted file mode 100644 index d2e5fee..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil_verif.mo +++ /dev/null @@ -1,24 +0,0 @@ -within CRML_test.FORML.AfterUntil; -model AfterUntil_verif - AfterUntil_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - AfterUntil afterUntil - annotation (Placement(transformation(extent={{0,0},{20,20}}))); -equation - // Bindings - externals.ck1 =afterUntil.ck1; - externals.ck2 =afterUntil.ck2; - annotation (Icon(graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent={{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points={{-36,60},{64,0},{-36,-60},{-36,60}})}), experiment( - StopTime=20, - __Dymola_fixedstepsize=0.1, - __Dymola_Algorithm="Dassl")); -end AfterUntil_verif; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil_verif2.mo b/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil_verif2.mo deleted file mode 100644 index cd9ca8a..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntil_verif2.mo +++ /dev/null @@ -1,22 +0,0 @@ -within CRML_test.FORML.AfterUntil; -model AfterUntil_verif2 - - AfterUntil_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - AfterUntill2 afterUntil2 - annotation (Placement(transformation(extent={{-26,16},{-6,36}}))); -equation - // Bindings - externals.ck1 =afterUntil2.ck1; - externals.ck2 =afterUntil2.ck2; - annotation (Icon(graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent={{-100,-102},{100,98}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points={{-36,58},{64,-2},{-36,-62},{-36,58}})})); -end AfterUntil_verif2; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntill2.mo b/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntill2.mo deleted file mode 100644 index 0ff44ef..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/AfterUntill2.mo +++ /dev/null @@ -1,96 +0,0 @@ -within CRML_test.FORML.AfterUntil; -block AfterUntill2 - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - CRML.ETL.Connectors.WhileOutput tl1 = tl; - -public - CRML.ETL.Connectors.ClockInput ck1 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,30},{-100,50}}), iconTransformation(extent={{-120,30}, - {-100,50}}))); - CRML.ETL.Connectors.WhileInput tl annotation (Placement( - transformation(extent={{-10,90},{10,110}}), iconTransformation(extent={ - {-10,90},{10,110}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_until_b2 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); -public - CRML.ETL.Connectors.ClockInput ck2 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,-50},{-100,-30}}), iconTransformation( - extent={{-120,-50},{-100,-30}}))); - CRML.TimeLocators.Continuous.AfterUntil - afterUntil - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck1 - annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck1 - annotation (Placement(transformation(extent={{-44,36},{-36,44}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck2 - annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck2 - annotation (Placement(transformation(extent={{-44,-44},{-36,-36}}))); -equation - if (cardinality(tl) == 0) then - tl.timePeriod = true; - tl.clock = CRML.ETL.Types.Boolean4.true4; - tl.isLeftBoundaryIncluded = true; - tl.isRightBoundaryIncluded = true; - end if; - - connect(ck1, clockToBoolean_ck1.u) annotation (Line( - points={{-110,40},{-110,40},{-110,40},{-82,40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean_ck1.y, booleanToBoolean4_ck1.u) - annotation (Line(points={{-59,40},{-44.4,40}}, color={255,0,255})); - connect(booleanToBoolean4_ck1.y, afterUntil.u1) annotation (Line(points={{-35.6, - 40},{-20,40},{-20,0},{-11,0}}, color={162,29,33})); - connect(ck2, clockToBoolean_ck2.u) annotation (Line( - points={{-110,-40},{-82,-40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean_ck2.y, booleanToBoolean4_ck2.u) - annotation (Line(points={{-59,-40},{-44.4,-40}}, color={255,0,255})); - connect(booleanToBoolean4_ck2.y, afterUntil.u2) annotation (Line(points={{-35.6, - -40},{-20,-40},{-20,-8},{-11,-8}}, color={162,29,33})); - connect(afterUntil.y, p_after_b1_until_b2) annotation (Line(points={{0,-10},{ - 0,-20},{80,-20},{80,0},{110,0}}, color={0,0,255})); - connect(tl1, afterUntil.tl) - annotation (Line(points={{0,100},{0,10}}, color={0,0,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle(extent={{-100, - 100},{100,-100}}, fillColor = {85, 170, 255}, lineThickness = 5, fillPattern = FillPattern.Solid, borderPattern = BorderPattern.Raised, lineColor = {0, 0, 0}), Rectangle(extent={{-70,30}, - {70,-52}}, lineColor = {175, 175, 175}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid), Line(points={{-50,-34}, - {-50,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-48,-12}, - {52,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{52,-12}, - {52,-34}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-62,-34}, - {58,-34}}, color = {175, 175, 175}), Line(points={{-50,-12}, - {-50,10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Rectangle(extent={{22,2},{ - 52,-12}}, lineColor = {0, 0, 0}, fillColor = {175, 175, 175}, fillPattern = FillPattern.Solid), Line(points={{-50,10}, - {22,10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,10}, - {22,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,-12}, - {20,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,-12}, - {24,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,-12}, - {-52,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,-12}, - {-48,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,30}, - {-70,30},{-70,-52},{-50,-52}}, color = {0, 0, 0}), Line(points={{50,30}, - {70,30},{70,-52},{50,-52}}, color = {0, 0, 0}), Text(extent={{-28,-10}, - {22,-34}}, lineColor = {175, 175, 175}, pattern = LinePattern.Dash, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, textString = "%u"), Text(extent={{-78,86}, - {76,38}}, lineColor={0,0,0}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, - textString="after until")}), Diagram( - coordinateSystem(preserveAspectRatio=false)), - Documentation(info=" -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end AfterUntill2; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/package.mo b/resources/modelica_libraries/CRML_test/FORML/AfterUntil/package.mo deleted file mode 100644 index 0aa04c3..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.FORML; -package AfterUntil -end AfterUntil; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/package.order b/resources/modelica_libraries/CRML_test/FORML/AfterUntil/package.order deleted file mode 100644 index 7b71aaf..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterUntil/package.order +++ /dev/null @@ -1,5 +0,0 @@ -AfterUntil -AfterUntill2 -AfterUntil_externals -AfterUntil_verif -AfterUntil_verif2 diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/AfterUntil_no_ext.mo b/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/AfterUntil_no_ext.mo deleted file mode 100644 index aedbc21..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/AfterUntil_no_ext.mo +++ /dev/null @@ -1,42 +0,0 @@ -within CRML_test.FORML.AfterUntil_no_ext; -model AfterUntil_no_ext -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-26,24},{-14,36}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-26,-56},{-14,-44}}))); - AfterUntil.AfterUntil afterUntil - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_until_b2 - annotation (Placement(transformation(extent={{92,-10},{112,10}}))); -equation - - connect(b1.y,clockEvent_1. u) - annotation (Line(points={{-59,30},{-26.6,30}},color={217,67,180})); - connect(b2.y,clockEvent_2. u) - annotation (Line(points={{-59,-50},{-26.6,-50}},color={217,67,180})); - connect(clockEvent_2.y, afterUntil.ck2) annotation (Line( - points={{-13.4,-50},{34,-50},{34,-4},{39,-4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent_1.y, afterUntil.ck1) annotation (Line( - points={{-13.4,30},{34,30},{34,4},{39,4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(afterUntil.p_after_b1_until_b2, p_after_b1_until_b2) - annotation (Line(points={{61,0},{102,0}}, color={0,0,255})); -end AfterUntil_no_ext; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/AfterUntil_no_ext2.mo b/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/AfterUntil_no_ext2.mo deleted file mode 100644 index 2c05e42..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/AfterUntil_no_ext2.mo +++ /dev/null @@ -1,42 +0,0 @@ -within CRML_test.FORML.AfterUntil_no_ext; -model AfterUntil_no_ext2 -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-26,24},{-14,36}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-26,-56},{-14,-44}}))); - AfterUntil.AfterUntill2 afterUntill2_1 - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_after_b1_until_b2 - annotation (Placement(transformation(extent={{92,-10},{112,10}}))); -equation - - connect(b1.y,clockEvent_1. u) - annotation (Line(points={{-59,30},{-26.6,30}},color={217,67,180})); - connect(b2.y,clockEvent_2. u) - annotation (Line(points={{-59,-50},{-26.6,-50}},color={217,67,180})); - connect(clockEvent_1.y, afterUntill2_1.ck1) annotation (Line( - points={{-13.4,30},{34,30},{34,4},{39,4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent_2.y, afterUntill2_1.ck2) annotation (Line( - points={{-13.4,-50},{34,-50},{34,-4},{39,-4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(afterUntill2_1.p_after_b1_until_b2, p_after_b1_until_b2) - annotation (Line(points={{61,0},{102,0}}, color={0,0,255})); -end AfterUntil_no_ext2; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/package.mo b/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/package.mo deleted file mode 100644 index 451b69e..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.FORML; -package AfterUntil_no_ext -end AfterUntil_no_ext; diff --git a/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/package.order b/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/package.order deleted file mode 100644 index 226f9d7..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/AfterUntil_no_ext/package.order +++ /dev/null @@ -1,2 +0,0 @@ -AfterUntil_no_ext -AfterUntil_no_ext2 diff --git a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/CheckAtEnd.mo b/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/CheckAtEnd.mo deleted file mode 100644 index 3fa98fb..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/CheckAtEnd.mo +++ /dev/null @@ -1,73 +0,0 @@ -within CRML_test.FORML.CheckAtEnd; -block CheckAtEnd - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - CRML.ETL.Connectors.Boolean4Input u "Boolean4 condition" annotation ( - Placement(transformation(extent={{-120,-10},{-100,10}}), - iconTransformation(extent={{-120,-10},{-100,10}}))); - CRML.ETL.Connectors.TimeLocatorInput[N] tl annotation (Placement( - transformation(extent={{-10,90},{10,110}}), iconTransformation(extent={ - {-10,90},{10,110}}))); - CRML.ETL.Connectors.Boolean4Output y - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.Blocks.Logical4.And4_n and4(N=N) - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.Blocks.Routing.Boolean4Replicator boolean4Replicator(nout=N) - annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - EvaluateAtEnd [N] evaluateAtEnd - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); -equation - connect(u, boolean4Replicator.u) - annotation (Line(points={{-110,0},{-62,0}}, color={162,29,33})); - connect(and4.y, y) - annotation (Line(points={{61,0},{110,0}}, color={162,29,33})); -// Text( -// extent={{-74,32},{74,-36}}, -// lineColor={0,0,0}, -// fillColor={28,108,200}, -// fillPattern=FillPattern.Solid, -// textString=boxName), - connect(evaluateAtEnd.tl, tl) - annotation (Line(points={{0,10},{0,100}}, color={0,0,255})); - connect(evaluateAtEnd.u, boolean4Replicator.y) - annotation (Line(points={{-11,0},{-39,0}}, color={162,29,33})); - connect(evaluateAtEnd.y, and4.u) - annotation (Line(points={{11,0},{39,0}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - fillColor={162,29,33}, - lineThickness=5, - fillPattern=FillPattern.Solid, - borderPattern=BorderPattern.Raised, - lineColor={0,0,0}), - Rectangle( - extent={{-78,80},{82,-80}}, - lineColor={175,175,175}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Text( - extent={{-70,72},{70,44}}, - lineColor={28,108,200}, - textString="check"), - Text( - extent={{-70,18},{70,-10}}, - lineColor={28,108,200}, - textString="at end")}), Diagram( - coordinateSystem(preserveAspectRatio=false)), - Documentation(info=" -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end CheckAtEnd; diff --git a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/CheckAtEnd_externals.mo b/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/CheckAtEnd_externals.mo deleted file mode 100644 index 8a6729c..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/CheckAtEnd_externals.mo +++ /dev/null @@ -1,49 +0,0 @@ -within CRML_test.FORML.CheckAtEnd; -model CheckAtEnd_externals - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - CRML.Blocks.Logical.BooleanTable boolean4Constant1( - y0=false, - option_width=false, - instant={2,3.5}) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2.5,5}) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.Boolean4Output u - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{-20,46},{-12,54}}))); - CRML.Blocks.Logical4.And4 and4_1 - annotation (Placement(transformation(extent={{0,32},{20,52}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant3(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-34,20},{-14,40}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{-4,-54},{4,-46}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] P1 - annotation (Placement(transformation(extent={{100,-80},{120,-60}}))); - CRML.TimeLocators.Continuous.During during - annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); -equation - connect(boolean4Constant1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{-20.4,50}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, and4_1.u1) - annotation (Line(points={{-11.6,50},{-1,50}}, color={162,29,33})); - connect(boolean4Constant3.y, and4_1.u2) annotation (Line(points={{-13,30},{-6, - 30},{-6,34},{-1,34}}, color={162,29,33})); - connect(and4_1.y, u) annotation (Line(points={{21,42},{66,42},{66,50},{110,50}}, - color={162,29,33})); - connect(b1.y, booleanToBoolean4_2.u) - annotation (Line(points={{-39,-50},{-4.4,-50}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, during.u) - annotation (Line(points={{4.4,-50},{39,-50}}, color={162,29,33})); - connect(during.y, P1) annotation (Line(points={{50,-60},{84,-60},{84,-70},{110, - -70}}, color={0,0,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end CheckAtEnd_externals; diff --git a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/CheckAtEnd_verif.mo b/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/CheckAtEnd_verif.mo deleted file mode 100644 index a668574..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/CheckAtEnd_verif.mo +++ /dev/null @@ -1,32 +0,0 @@ -within CRML_test.FORML.CheckAtEnd; -model CheckAtEnd_verif - CheckAtEnd_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - CRML.Requirements.CheckAtEnd checkAtEnd - annotation (Placement(transformation(extent={{-50,-10},{-30,10}}))); - CRML.ETL.Connectors.Boolean4Output b_check_at_end - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); -equation - // Bindings - checkAtEnd.u = externals.u; - checkAtEnd.tl[:] = externals.P1[:]; - connect(checkAtEnd.y, b_check_at_end) - annotation (Line(points={{-29,0},{110,0}}, color={162,29,33})); - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end CheckAtEnd_verif; diff --git a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/EvaluateAtEnd.mo b/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/EvaluateAtEnd.mo deleted file mode 100644 index 15baf47..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/EvaluateAtEnd.mo +++ /dev/null @@ -1,92 +0,0 @@ -within CRML_test.FORML.CheckAtEnd; -block EvaluateAtEnd - -public - CRML.ETL.Connectors.Boolean4Input u "Boolean4 condition" annotation ( - Placement(transformation(extent={{-120,-10},{-100,10}}), - iconTransformation(extent={{-120,-10},{-100,10}}))); - CRML.ETL.Connectors.TimeLocatorInput tl annotation (Placement(transformation( - extent={{-10,90},{10,110}}), iconTransformation(extent={{-10,90},{10, - 110}}))); - CRML.ETL.Connectors.Boolean4Output y - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML_test.ETL.EvaluateOver.IntegrateUndefined integrateUndefined - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Requirements.DecideOver decideOver - annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant(K=CRML.ETL.Types.Boolean4.false4) - annotation (Placement(transformation(extent={{-20,40},{0,60}}))); - CRML.Blocks.Events.EventFilter eventFilter - annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4 - annotation (Placement(transformation(extent={{6,-4},{14,4}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent - annotation (Placement(transformation(extent={{-44,4},{-36,12}}))); - CRML.Blocks.Events.Event4ToEvent event4ToEvent1 - annotation (Placement(transformation(extent={{-44,-24},{-36,-16}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant1 - annotation (Placement(transformation(extent={{-100,40},{-80,60}}))); -equation -// Text( -// extent={{-74,32},{74,-36}}, -// lineColor={0,0,0}, -// fillColor={28,108,200}, -// fillPattern=FillPattern.Solid, -// textString=boxName), - connect(eventFilter.y, booleanToBoolean4.u) - annotation (Line(points={{1,0},{5.6,0}}, color={217,67,180})); - connect(decideOver.y, event4ToEvent.u) annotation (Line(points={{-59,0},{-50,0}, - {-50,8},{-44.4,8}}, color={162,29,33})); - connect(event4ToEvent1.u, u) annotation (Line(points={{-44.4,-20},{-90,-20},{-90, - 0},{-110,0}}, color={162,29,33})); - connect(event4ToEvent1.y, eventFilter.u) annotation (Line(points={{-35.6,-20}, - {-26,-20},{-26,0},{-21,0}}, color={217,67,180})); - connect(event4ToEvent.y, eventFilter.cond) - annotation (Line(points={{-35.6,8},{-21,8}}, color={217,67,180})); - connect(decideOver.tl,tl) annotation (Line(points={{-70,10},{-70,80},{0,80}, - {0,100}}, color={0,0,255})); - connect(integrateUndefined.tl,tl) annotation (Line(points={{50,10},{50,80},{ - 0,80},{0,100}}, color={0,0,255})); - connect(boolean4Constant.y, integrateUndefined.a) annotation (Line(points={{1, - 50},{20,50},{20,8},{39,8}}, color={162,29,33})); - connect(booleanToBoolean4.y, integrateUndefined.u) - annotation (Line(points={{14.4,0},{39,0}}, color={162,29,33})); - connect(integrateUndefined.y, y) - annotation (Line(points={{61,0},{110,0}}, color={162,29,33})); - connect(boolean4Constant1.y, decideOver.u) annotation (Line(points={{-79,50}, - {-74,50},{-74,14},{-88,14},{-88,0},{-81,0}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - fillColor={162,29,33}, - lineThickness=5, - fillPattern=FillPattern.Solid, - borderPattern=BorderPattern.Raised, - lineColor={0,0,0}), - Rectangle( - extent={{-78,80},{82,-80}}, - lineColor={175,175,175}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Text( - extent={{-70,72},{70,44}}, - lineColor={28,108,200}, - textString="evaluate"), - Text( - extent={{-70,18},{70,-10}}, - lineColor={28,108,200}, - textString="at end")}), Diagram( - coordinateSystem(preserveAspectRatio=false)), - Documentation(info=" -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end EvaluateAtEnd; diff --git a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/package.mo b/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/package.mo deleted file mode 100644 index 8602a38..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.FORML; -package CheckAtEnd -end CheckAtEnd; diff --git a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/package.order b/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/package.order deleted file mode 100644 index c6f3eaf..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/CheckAtEnd/package.order +++ /dev/null @@ -1,4 +0,0 @@ -CheckAtEnd -CheckAtEnd_externals -CheckAtEnd_verif -EvaluateAtEnd diff --git a/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore.mo b/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore.mo deleted file mode 100644 index 94fdb21..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore.mo +++ /dev/null @@ -1,71 +0,0 @@ -within CRML_test.FORML.FromBefore; -block FromBefore -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; - CRML.ETL.Connectors.WhileOutput tl1 = tl; -public - CRML.ETL.Connectors.ClockInput ck1 "Boolean4 condition" annotation( - Placement(transformation(extent = {{-120, 30}, {-100, 50}}), iconTransformation(extent = {{-120, 30}, {-100, 50}}))); - CRML.ETL.Connectors.WhileInput tl annotation( - Placement(transformation(extent = {{-10, 90}, {10, 110}}), iconTransformation(extent = {{-10, 90}, {10, 110}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_from_b1_before_b2 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.ETL.TimeLocators.Periods periods(leftBoundaryIncluded=true, rightBoundaryIncluded = false) annotation( - Placement(transformation(extent = {{-10, -10}, {10, 10}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck1 annotation( - Placement(transformation(extent = {{-80, 30}, {-60, 50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck1 annotation( - Placement(transformation(extent = {{-44, 36}, {-36, 44}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck2 annotation( - Placement(transformation(extent = {{-80, -50}, {-60, -30}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck2 annotation( - Placement(transformation(extent = {{-44, -44}, {-36, -36}}))); - -public - CRML.ETL.Connectors.ClockInput ck2 "Boolean4 condition" annotation( - Placement(transformation(extent={{-120,-50},{-100,-30}}), iconTransformation(extent={{-120, - -50},{-100,-30}}))); -equation - if (cardinality(tl) == 0) then - tl.timePeriod = true; - tl.clock = CRML.ETL.Types.Boolean4.true4; - tl.isLeftBoundaryIncluded = true; - tl.isRightBoundaryIncluded = true; - end if; - connect(ck1, clockToBoolean_ck1.u) annotation( - Line(points = {{-110, 40}, {-82, 40}}, color = {175, 175, 175}, pattern = LinePattern.Dot, thickness = 0.5)); - connect(clockToBoolean_ck1.y, booleanToBoolean4_ck1.u) annotation( - Line(points = {{-59, 40}, {-44.4, 40}}, color = {255, 0, 255})); - connect(booleanToBoolean4_ck1.y, periods.u1) annotation( - Line(points = {{-35.6, 40}, {-20, 40}, {-20, 0}, {-11, 0}}, color = {162, 29, 33})); - connect(clockToBoolean_ck2.y, booleanToBoolean4_ck2.u) annotation( - Line(points = {{-59, -40}, {-44.4, -40}}, color = {255, 0, 255})); - connect(booleanToBoolean4_ck2.y, periods.u2) annotation( - Line(points = {{-35.6, -40}, {-20, -40}, {-20, -8}, {-11, -8}}, color = {162, 29, 33})); - connect(periods.y, p_from_b1_before_b2) annotation (Line(points={{0,-10},{0,-20}, - {80,-20},{80,0},{110,0}}, color={0,0,255})); - connect(tl1, periods.tl) annotation( - Line(points = {{0, 100}, {0, 10}}, color = {0, 0, 255})); - connect(clockToBoolean_ck2.u, ck2) annotation (Line( - points={{-82,-40},{-110,-40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation( - Icon(coordinateSystem(preserveAspectRatio = false), graphics = {Rectangle(fillColor = {85, 170, 255}, fillPattern = FillPattern.Solid, lineThickness = 5, borderPattern = BorderPattern.Raised, extent = {{-100, 100}, {100, -100}}), Rectangle(lineColor = {175, 175, 175}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-70, 30}, {70, -52}}), Line(points = {{-50, -34}, {-50, -12}}, pattern = LinePattern.Dash), Line(points = {{-48, -12}, {52, -12}}, pattern = LinePattern.Dash), Line(points = {{52, -12}, {52, -34}}, pattern = LinePattern.Dash), Line(points = {{-62, -34}, {58, -34}}, color = {175, 175, 175}), Line(points = {{-50, -12}, {-50, 10}}, pattern = LinePattern.Dash), Rectangle(fillColor = {175, 175, 175}, fillPattern = FillPattern.Solid, extent = {{22, 2}, {52, -12}}), Line(points = {{-50, 10}, {22, 10}}, pattern = LinePattern.Dash), Line(points = {{22, 10}, {22, -12}}, pattern = LinePattern.Dash), Line(points = {{22, -12}, {20, -10}}, pattern = LinePattern.Dash), Line(points = {{22, -12}, {24, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, -12}, {-52, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, -12}, {-48, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, 30}, {-70, 30}, {-70, -52}, {-50, -52}}), Line(points = {{50, 30}, {70, 30}, {70, -52}, {50, -52}}), Text(textColor = {175, 175, 175}, extent = {{-28, -10}, {22, -34}}, textString = "%u"), Text(extent = {{-78, 86}, {76, 38}}, - textString="from before", - textColor={0,0,0})}), - Diagram(coordinateSystem(preserveAspectRatio = false)), - Documentation(info = " -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end FromBefore; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore2.mo b/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore2.mo deleted file mode 100644 index 787cb2e..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore2.mo +++ /dev/null @@ -1,96 +0,0 @@ -within CRML_test.FORML.FromBefore; -block FromBefore2 - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - CRML.ETL.Connectors.WhileOutput tl1 = tl; - -public - CRML.ETL.Connectors.ClockInput ck1 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,30},{-100,50}}), iconTransformation(extent={{-120,30}, - {-100,50}}))); - CRML.ETL.Connectors.WhileInput tl annotation (Placement( - transformation(extent={{-10,90},{10,110}}), iconTransformation(extent={ - {-10,90},{10,110}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_from_b1_before_b2 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); -public - CRML.ETL.Connectors.ClockInput ck2 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,-50},{-100,-30}}), iconTransformation( - extent={{-120,-50},{-100,-30}}))); - CRML.TimeLocators.Continuous.FromBefore - fromBefore - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck1 - annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck1 - annotation (Placement(transformation(extent={{-44,36},{-36,44}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck2 - annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck2 - annotation (Placement(transformation(extent={{-44,-44},{-36,-36}}))); -equation - if (cardinality(tl) == 0) then - tl.timePeriod = true; - tl.clock = CRML.ETL.Types.Boolean4.true4; - tl.isLeftBoundaryIncluded = true; - tl.isRightBoundaryIncluded = true; - end if; - - connect(ck1, clockToBoolean_ck1.u) annotation (Line( - points={{-110,40},{-110,40},{-110,40},{-82,40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean_ck1.y, booleanToBoolean4_ck1.u) - annotation (Line(points={{-59,40},{-44.4,40}}, color={255,0,255})); - connect(booleanToBoolean4_ck1.y, fromBefore.u1) annotation (Line(points={{-35.6, - 40},{-20,40},{-20,0},{-11,0}}, color={162,29,33})); - connect(ck2, clockToBoolean_ck2.u) annotation (Line( - points={{-110,-40},{-82,-40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean_ck2.y, booleanToBoolean4_ck2.u) - annotation (Line(points={{-59,-40},{-44.4,-40}}, color={255,0,255})); - connect(booleanToBoolean4_ck2.y, fromBefore.u2) annotation (Line(points={{-35.6, - -40},{-20,-40},{-20,-8},{-11,-8}}, color={162,29,33})); - connect(fromBefore.y, p_from_b1_before_b2) annotation (Line(points={{0,-10},{ - 0,-20},{80,-20},{80,0},{110,0}}, color={0,0,255})); - connect(tl1, fromBefore.tl) - annotation (Line(points={{0,100},{0,10}}, color={0,0,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle(extent={{-100, - 100},{100,-100}}, fillColor = {85, 170, 255}, lineThickness = 5, fillPattern = FillPattern.Solid, borderPattern = BorderPattern.Raised, lineColor = {0, 0, 0}), Rectangle(extent={{-70,30}, - {70,-52}}, lineColor = {175, 175, 175}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid), Line(points={{-50,-34}, - {-50,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-48,-12}, - {52,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{52,-12}, - {52,-34}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-62,-34}, - {58,-34}}, color = {175, 175, 175}), Line(points={{-50,-12}, - {-50,10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Rectangle(extent={{22,2},{ - 52,-12}}, lineColor = {0, 0, 0}, fillColor = {175, 175, 175}, fillPattern = FillPattern.Solid), Line(points={{-50,10}, - {22,10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,10}, - {22,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,-12}, - {20,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,-12}, - {24,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,-12}, - {-52,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,-12}, - {-48,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,30}, - {-70,30},{-70,-52},{-50,-52}}, color = {0, 0, 0}), Line(points={{50,30}, - {70,30},{70,-52},{50,-52}}, color = {0, 0, 0}), Text(extent={{-28,-10}, - {22,-34}}, lineColor = {175, 175, 175}, pattern = LinePattern.Dash, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, textString = "%u"), Text(extent={{-78,86}, - {76,38}}, lineColor={0,0,0}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, - textString="from before")}), Diagram( - coordinateSystem(preserveAspectRatio=false)), - Documentation(info=" -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end FromBefore2; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore_externals.mo b/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore_externals.mo deleted file mode 100644 index 3a4902e..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore_externals.mo +++ /dev/null @@ -1,43 +0,0 @@ -within CRML_test.FORML.FromBefore; -model FromBefore_externals - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - CRML.ETL.Connectors.ClockOutput ck1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.ClockOutput ck2 - annotation (Placement(transformation(extent={{100,-80},{120,-60}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-6,54},{6,66}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-6,-66},{6,-54}}))); -equation - connect(b1.y, clockEvent_1.u) - annotation (Line(points={{-39,60},{-6.6,60}}, color={217,67,180})); - connect(clockEvent_1.y, ck1) annotation (Line( - points={{6.6,60},{40,60},{40,50},{110,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(b2.y, clockEvent_2.u) - annotation (Line(points={{-39,-60},{-6.6,-60}}, color={217,67,180})); - connect(clockEvent_2.y, ck2) annotation (Line( - points={{6.6,-60},{40,-60},{40,-70},{110,-70}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end FromBefore_externals; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore_verif.mo b/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore_verif.mo deleted file mode 100644 index 8ff6182..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore_verif.mo +++ /dev/null @@ -1,21 +0,0 @@ -within CRML_test.FORML.FromBefore; -model FromBefore_verif - FromBefore_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - FromBefore fromBefore - annotation (Placement(transformation(extent={{0,0},{20,20}}))); -equation - // Bindings - externals.ck1 =fromBefore.ck1; - externals.ck2 =fromBefore.ck2; - annotation (Icon(graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent={{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points={{-36,60},{64,0},{-36,-60},{-36,60}})})); -end FromBefore_verif; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore_verif2.mo b/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore_verif2.mo deleted file mode 100644 index 767ad1a..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromBefore/FromBefore_verif2.mo +++ /dev/null @@ -1,22 +0,0 @@ -within CRML_test.FORML.FromBefore; -model FromBefore_verif2 - - FromBefore_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - FromBefore2 fromBefore2 - annotation (Placement(transformation(extent={{-26,16},{-6,36}}))); -equation - // Bindings - externals.ck1 =fromBefore2.ck1; - externals.ck2 =fromBefore2.ck2; - annotation (Icon(graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent={{-100,-102},{100,98}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points={{-36,58},{64,-2},{-36,-62},{-36,58}})})); -end FromBefore_verif2; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromBefore/package.mo b/resources/modelica_libraries/CRML_test/FORML/FromBefore/package.mo deleted file mode 100644 index cf974fe..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromBefore/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.FORML; -package FromBefore -end FromBefore; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromBefore/package.order b/resources/modelica_libraries/CRML_test/FORML/FromBefore/package.order deleted file mode 100644 index 472beef..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromBefore/package.order +++ /dev/null @@ -1,5 +0,0 @@ -FromBefore -FromBefore2 -FromBefore_externals -FromBefore_verif -FromBefore_verif2 diff --git a/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/FromBefore_no_ext.mo b/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/FromBefore_no_ext.mo deleted file mode 100644 index 3bd6028..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/FromBefore_no_ext.mo +++ /dev/null @@ -1,42 +0,0 @@ -within CRML_test.FORML.FromBefore_no_ext; -model FromBefore_no_ext -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-26,24},{-14,36}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-26,-56},{-14,-44}}))); - FromBefore.FromBefore fromBefore - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_from_b1_before_b2 - annotation (Placement(transformation(extent={{92,-10},{112,10}}))); -equation - - connect(b1.y,clockEvent_1. u) - annotation (Line(points={{-59,30},{-26.6,30}},color={217,67,180})); - connect(b2.y,clockEvent_2. u) - annotation (Line(points={{-59,-50},{-26.6,-50}},color={217,67,180})); - connect(clockEvent_2.y, fromBefore.ck2) annotation (Line( - points={{-13.4,-50},{34,-50},{34,-4},{39,-4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent_1.y, fromBefore.ck1) annotation (Line( - points={{-13.4,30},{34,30},{34,4},{39,4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(fromBefore.p_from_b1_before_b2, p_from_b1_before_b2) - annotation (Line(points={{61,0},{102,0}}, color={0,0,255})); -end FromBefore_no_ext; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/FromBefore_no_ext2.mo b/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/FromBefore_no_ext2.mo deleted file mode 100644 index e32a55c..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/FromBefore_no_ext2.mo +++ /dev/null @@ -1,42 +0,0 @@ -within CRML_test.FORML.FromBefore_no_ext; -model FromBefore_no_ext2 -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-26,24},{-14,36}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-26,-56},{-14,-44}}))); - FromBefore.FromBefore2 fromBefore2_1 - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_from_b1_before_b2 - annotation (Placement(transformation(extent={{92,-10},{112,10}}))); -equation - - connect(b1.y,clockEvent_1. u) - annotation (Line(points={{-59,30},{-26.6,30}},color={217,67,180})); - connect(b2.y,clockEvent_2. u) - annotation (Line(points={{-59,-50},{-26.6,-50}},color={217,67,180})); - connect(clockEvent_1.y, fromBefore2_1.ck1) annotation (Line( - points={{-13.4,30},{34,30},{34,4},{39,4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent_2.y, fromBefore2_1.ck2) annotation (Line( - points={{-13.4,-50},{34,-50},{34,-4},{39,-4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(fromBefore2_1.p_from_b1_before_b2, p_from_b1_before_b2) - annotation (Line(points={{61,0},{102,0}}, color={0,0,255})); -end FromBefore_no_ext2; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/package.mo b/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/package.mo deleted file mode 100644 index 51fbeb9..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.FORML; -package FromBefore_no_ext -end FromBefore_no_ext; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/package.order b/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/package.order deleted file mode 100644 index 389ba5c..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromBefore_no_ext/package.order +++ /dev/null @@ -1,2 +0,0 @@ -FromBefore_no_ext -FromBefore_no_ext2 diff --git a/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil.mo b/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil.mo deleted file mode 100644 index 61a89b5..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil.mo +++ /dev/null @@ -1,72 +0,0 @@ -within CRML_test.FORML.FromUntil; -block FromUntil -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; - CRML.ETL.Connectors.WhileOutput tl1 = tl; -public - CRML.ETL.Connectors.ClockInput ck1 "Boolean4 condition" annotation( - Placement(transformation(extent = {{-120, 30}, {-100, 50}}), iconTransformation(extent = {{-120, 30}, {-100, 50}}))); - CRML.ETL.Connectors.WhileInput tl annotation( - Placement(transformation(extent = {{-10, 90}, {10, 110}}), iconTransformation(extent = {{-10, 90}, {10, 110}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_from_b1_until_b2 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.ETL.TimeLocators.Periods periods(leftBoundaryIncluded=true, - rightBoundaryIncluded=true) annotation( - Placement(transformation(extent = {{-10, -10}, {10, 10}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck1 annotation( - Placement(transformation(extent = {{-80, 30}, {-60, 50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck1 annotation( - Placement(transformation(extent = {{-44, 36}, {-36, 44}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck2 annotation( - Placement(transformation(extent = {{-80, -50}, {-60, -30}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck2 annotation( - Placement(transformation(extent = {{-44, -44}, {-36, -36}}))); - -public - CRML.ETL.Connectors.ClockInput ck2 "Boolean4 condition" annotation( - Placement(transformation(extent={{-120,-50},{-100,-30}}), iconTransformation(extent={{-120, - -50},{-100,-30}}))); -equation - if (cardinality(tl) == 0) then - tl.timePeriod = true; - tl.clock = CRML.ETL.Types.Boolean4.true4; - tl.isLeftBoundaryIncluded = true; - tl.isRightBoundaryIncluded = true; - end if; - connect(ck1, clockToBoolean_ck1.u) annotation( - Line(points = {{-110, 40}, {-82, 40}}, color = {175, 175, 175}, pattern = LinePattern.Dot, thickness = 0.5)); - connect(clockToBoolean_ck1.y, booleanToBoolean4_ck1.u) annotation( - Line(points = {{-59, 40}, {-44.4, 40}}, color = {255, 0, 255})); - connect(booleanToBoolean4_ck1.y, periods.u1) annotation( - Line(points = {{-35.6, 40}, {-20, 40}, {-20, 0}, {-11, 0}}, color = {162, 29, 33})); - connect(clockToBoolean_ck2.y, booleanToBoolean4_ck2.u) annotation( - Line(points = {{-59, -40}, {-44.4, -40}}, color = {255, 0, 255})); - connect(booleanToBoolean4_ck2.y, periods.u2) annotation( - Line(points = {{-35.6, -40}, {-20, -40}, {-20, -8}, {-11, -8}}, color = {162, 29, 33})); - connect(periods.y, p_from_b1_until_b2) annotation (Line(points={{0,-10},{0,-20}, - {80,-20},{80,0},{110,0}}, color={0,0,255})); - connect(tl1, periods.tl) annotation( - Line(points = {{0, 100}, {0, 10}}, color = {0, 0, 255})); - connect(clockToBoolean_ck2.u, ck2) annotation (Line( - points={{-82,-40},{-110,-40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation( - Icon(coordinateSystem(preserveAspectRatio = false), graphics = {Rectangle(fillColor = {85, 170, 255}, fillPattern = FillPattern.Solid, lineThickness = 5, borderPattern = BorderPattern.Raised, extent = {{-100, 100}, {100, -100}}), Rectangle(lineColor = {175, 175, 175}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-70, 30}, {70, -52}}), Line(points = {{-50, -34}, {-50, -12}}, pattern = LinePattern.Dash), Line(points = {{-48, -12}, {52, -12}}, pattern = LinePattern.Dash), Line(points = {{52, -12}, {52, -34}}, pattern = LinePattern.Dash), Line(points = {{-62, -34}, {58, -34}}, color = {175, 175, 175}), Line(points = {{-50, -12}, {-50, 10}}, pattern = LinePattern.Dash), Rectangle(fillColor = {175, 175, 175}, fillPattern = FillPattern.Solid, extent = {{22, 2}, {52, -12}}), Line(points = {{-50, 10}, {22, 10}}, pattern = LinePattern.Dash), Line(points = {{22, 10}, {22, -12}}, pattern = LinePattern.Dash), Line(points = {{22, -12}, {20, -10}}, pattern = LinePattern.Dash), Line(points = {{22, -12}, {24, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, -12}, {-52, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, -12}, {-48, -10}}, pattern = LinePattern.Dash), Line(points = {{-50, 30}, {-70, 30}, {-70, -52}, {-50, -52}}), Line(points = {{50, 30}, {70, 30}, {70, -52}, {50, -52}}), Text(textColor = {175, 175, 175}, extent = {{-28, -10}, {22, -34}}, textString = "%u"), Text(extent = {{-78, 86}, {76, 38}}, - textColor={0,0,0}, - textString="from until")}), - Diagram(coordinateSystem(preserveAspectRatio = false)), - Documentation(info = " -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end FromUntil; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil2.mo b/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil2.mo deleted file mode 100644 index 77a74f3..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil2.mo +++ /dev/null @@ -1,96 +0,0 @@ -within CRML_test.FORML.FromUntil; -block FromUntil2 - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - CRML.ETL.Connectors.WhileOutput tl1 = tl; - -public - CRML.ETL.Connectors.ClockInput ck1 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,30},{-100,50}}), iconTransformation(extent={{-120,30}, - {-100,50}}))); - CRML.ETL.Connectors.WhileInput tl annotation (Placement( - transformation(extent={{-10,90},{10,110}}), iconTransformation(extent={ - {-10,90},{10,110}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_from_b1_until_b2 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); -public - CRML.ETL.Connectors.ClockInput ck2 "Boolean4 condition" annotation (Placement( - transformation(extent={{-120,-50},{-100,-30}}), iconTransformation( - extent={{-120,-50},{-100,-30}}))); - CRML.TimeLocators.Continuous.FromUntil - fromUntil - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck1 - annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck1 - annotation (Placement(transformation(extent={{-44,36},{-36,44}}))); - Modelica.Clocked.BooleanSignals.NonPeriodic.ClockToBoolean clockToBoolean_ck2 - annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_ck2 - annotation (Placement(transformation(extent={{-44,-44},{-36,-36}}))); -equation - if (cardinality(tl) == 0) then - tl.timePeriod = true; - tl.clock = CRML.ETL.Types.Boolean4.true4; - tl.isLeftBoundaryIncluded = true; - tl.isRightBoundaryIncluded = true; - end if; - - connect(ck1, clockToBoolean_ck1.u) annotation (Line( - points={{-110,40},{-110,40},{-110,40},{-82,40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean_ck1.y, booleanToBoolean4_ck1.u) - annotation (Line(points={{-59,40},{-44.4,40}}, color={255,0,255})); - connect(booleanToBoolean4_ck1.y, fromUntil.u1) annotation (Line(points={{-35.6, - 40},{-20,40},{-20,0},{-11,0}}, color={162,29,33})); - connect(ck2, clockToBoolean_ck2.u) annotation (Line( - points={{-110,-40},{-82,-40}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean_ck2.y, booleanToBoolean4_ck2.u) - annotation (Line(points={{-59,-40},{-44.4,-40}}, color={255,0,255})); - connect(booleanToBoolean4_ck2.y, fromUntil.u2) annotation (Line(points={{-35.6, - -40},{-20,-40},{-20,-8},{-11,-8}}, color={162,29,33})); - connect(fromUntil.y, p_from_b1_until_b2) annotation (Line(points={{0,-10},{0, - -20},{80,-20},{80,0},{110,0}}, color={0,0,255})); - connect(tl1, fromUntil.tl) - annotation (Line(points={{0,100},{0,10}}, color={0,0,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle(extent={{-100, - 100},{100,-100}}, fillColor = {85, 170, 255}, lineThickness = 5, fillPattern = FillPattern.Solid, borderPattern = BorderPattern.Raised, lineColor = {0, 0, 0}), Rectangle(extent={{-70,30}, - {70,-52}}, lineColor = {175, 175, 175}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid), Line(points={{-50,-34}, - {-50,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-48,-12}, - {52,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{52,-12}, - {52,-34}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-62,-34}, - {58,-34}}, color = {175, 175, 175}), Line(points={{-50,-12}, - {-50,10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Rectangle(extent={{22,2},{ - 52,-12}}, lineColor = {0, 0, 0}, fillColor = {175, 175, 175}, fillPattern = FillPattern.Solid), Line(points={{-50,10}, - {22,10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,10}, - {22,-12}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,-12}, - {20,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{22,-12}, - {24,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,-12}, - {-52,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,-12}, - {-48,-10}}, color = {0, 0, 0}, pattern = LinePattern.Dash), Line(points={{-50,30}, - {-70,30},{-70,-52},{-50,-52}}, color = {0, 0, 0}), Line(points={{50,30}, - {70,30},{70,-52},{50,-52}}, color = {0, 0, 0}), Text(extent={{-28,-10}, - {22,-34}}, lineColor = {175, 175, 175}, pattern = LinePattern.Dash, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, textString = "%u"), Text(extent={{-78,86}, - {76,38}}, lineColor={0,0,0}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, - textString="from until")}), Diagram( - coordinateSystem(preserveAspectRatio=false)), - Documentation(info=" -

Syntax

-
y = CheckAtEnd (u = condition, tl = time_period, checkAtEnd);
-

Description

-

Each instance of this block creates a requirement that evaluates whether the condition u is satisfied (true) at the end of the time period tl (which can be a continuous or discrete time period). The condition is a Boolean4 that takes its values in the { true, false, undecided, undefined } set.

-

To create time locators, refer to the Periods block.

-

The value of a requirement is a Boolean4 that can be used as input of another Ensure block. It is therefore possible to express requirements on requirements.

-

Requirements can be combined using Boolean4 operators, refer to the Logical4 package.

-

The condition u can be generated by converting Boolean signals to Boolean4 signals with the block BooleanToBoolean4, or by using the output y of another Check, CheckInteger or CheckReal block.

-


Example

-

This block is demonstrated with the following example:

-")); -end FromUntil2; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil_externals.mo b/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil_externals.mo deleted file mode 100644 index 7b84c2c..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil_externals.mo +++ /dev/null @@ -1,43 +0,0 @@ -within CRML_test.FORML.FromUntil; -model FromUntil_externals - -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; - -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - CRML.ETL.Connectors.ClockOutput ck1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.ClockOutput ck2 - annotation (Placement(transformation(extent={{100,-80},{120,-60}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-6,54},{6,66}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-6,-66},{6,-54}}))); -equation - connect(b1.y, clockEvent_1.u) - annotation (Line(points={{-39,60},{-6.6,60}}, color={217,67,180})); - connect(clockEvent_1.y, ck1) annotation (Line( - points={{6.6,60},{40,60},{40,50},{110,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(b2.y, clockEvent_2.u) - annotation (Line(points={{-39,-60},{-6.6,-60}}, color={217,67,180})); - connect(clockEvent_2.y, ck2) annotation (Line( - points={{6.6,-60},{40,-60},{40,-70},{110,-70}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end FromUntil_externals; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil_verif.mo b/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil_verif.mo deleted file mode 100644 index c87b165..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil_verif.mo +++ /dev/null @@ -1,21 +0,0 @@ -within CRML_test.FORML.FromUntil; -model FromUntil_verif - FromUntil_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - FromUntil fromUntil - annotation (Placement(transformation(extent={{0,0},{20,20}}))); -equation - // Bindings - externals.ck1 =fromUntil.ck1; - externals.ck2 =fromUntil.ck2; - annotation (Icon(graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent={{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points={{-36,60},{64,0},{-36,-60},{-36,60}})})); -end FromUntil_verif; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil_verif2.mo b/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil_verif2.mo deleted file mode 100644 index 8e3a476..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromUntil/FromUntil_verif2.mo +++ /dev/null @@ -1,22 +0,0 @@ -within CRML_test.FORML.FromUntil; -model FromUntil_verif2 - - FromUntil_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - FromUntil2 fromUntil2 - annotation (Placement(transformation(extent={{-26,16},{-6,36}}))); -equation - // Bindings - externals.ck1 =fromUntil2.ck1; - externals.ck2 =fromUntil2.ck2; - annotation (Icon(graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent={{-100,-102},{100,98}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points={{-36,58},{64,-2},{-36,-62},{-36,58}})})); -end FromUntil_verif2; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromUntil/package.mo b/resources/modelica_libraries/CRML_test/FORML/FromUntil/package.mo deleted file mode 100644 index 740fa4a..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromUntil/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.FORML; -package FromUntil -end FromUntil; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromUntil/package.order b/resources/modelica_libraries/CRML_test/FORML/FromUntil/package.order deleted file mode 100644 index 47ec878..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromUntil/package.order +++ /dev/null @@ -1,5 +0,0 @@ -FromUntil -FromUntil2 -FromUntil_externals -FromUntil_verif -FromUntil_verif2 diff --git a/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/FromUntil_no_ext.mo b/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/FromUntil_no_ext.mo deleted file mode 100644 index 4458ed9..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/FromUntil_no_ext.mo +++ /dev/null @@ -1,42 +0,0 @@ -within CRML_test.FORML.FromUntil_no_ext; -model FromUntil_no_ext -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-26,24},{-14,36}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-26,-56},{-14,-44}}))); - FromUntil.FromUntil fromUntil - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_from_b1_until_b2 - annotation (Placement(transformation(extent={{92,-10},{112,10}}))); -equation - - connect(b1.y,clockEvent_1. u) - annotation (Line(points={{-59,30},{-26.6,30}},color={217,67,180})); - connect(b2.y,clockEvent_2. u) - annotation (Line(points={{-59,-50},{-26.6,-50}},color={217,67,180})); - connect(clockEvent_2.y, fromUntil.ck2) annotation (Line( - points={{-13.4,-50},{34,-50},{34,-4},{39,-4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent_1.y, fromUntil.ck1) annotation (Line( - points={{-13.4,30},{34,30},{34,4},{39,4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(fromUntil.p_from_b1_until_b2, p_from_b1_until_b2) - annotation (Line(points={{61,0},{102,0}}, color={0,0,255})); -end FromUntil_no_ext; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/FromUntil_no_ext2.mo b/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/FromUntil_no_ext2.mo deleted file mode 100644 index 46d561a..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/FromUntil_no_ext2.mo +++ /dev/null @@ -1,42 +0,0 @@ -within CRML_test.FORML.FromUntil_no_ext; -model FromUntil_no_ext2 -protected - parameter Integer N = CRML.ETL.Types.nMaxOverlap; -public - CRML.Blocks.Logical.BooleanTable b1( - y0=false, - option_width=false, - instant={2,3.5,4,5,5.5,5.6,8,8.1,16}) - annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - CRML.Blocks.Logical.BooleanTable b2( - y0=false, - option_width=false, - instant={2.5,5,6,7,7.5,10}) - annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - CRML.Blocks.Events.ClockEvent clockEvent_1 - annotation (Placement(transformation(extent={{-26,24},{-14,36}}))); - CRML.Blocks.Events.ClockEvent clockEvent_2 - annotation (Placement(transformation(extent={{-26,-56},{-14,-44}}))); - FromUntil.FromUntil2 fromUntil2_1 - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] p_from_b1_until_b2 - annotation (Placement(transformation(extent={{92,-10},{112,10}}))); -equation - - connect(b1.y,clockEvent_1. u) - annotation (Line(points={{-59,30},{-26.6,30}},color={217,67,180})); - connect(b2.y,clockEvent_2. u) - annotation (Line(points={{-59,-50},{-26.6,-50}},color={217,67,180})); - connect(clockEvent_1.y, fromUntil2_1.ck1) annotation (Line( - points={{-13.4,30},{34,30},{34,4},{39,4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent_2.y, fromUntil2_1.ck2) annotation (Line( - points={{-13.4,-50},{34,-50},{34,-4},{39,-4}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(fromUntil2_1.p_from_b1_until_b2, p_from_b1_until_b2) - annotation (Line(points={{61,0},{102,0}}, color={0,0,255})); -end FromUntil_no_ext2; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/package.mo b/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/package.mo deleted file mode 100644 index 119b79f..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.FORML; -package FromUntil_no_ext -end FromUntil_no_ext; diff --git a/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/package.order b/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/package.order deleted file mode 100644 index 75a39ea..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/FromUntil_no_ext/package.order +++ /dev/null @@ -1,2 +0,0 @@ -FromUntil_no_ext -FromUntil_no_ext2 diff --git a/resources/modelica_libraries/CRML_test/FORML/Tests/DelayedTimePeriods.mo b/resources/modelica_libraries/CRML_test/FORML/Tests/DelayedTimePeriods.mo deleted file mode 100644 index 7a3f140..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/Tests/DelayedTimePeriods.mo +++ /dev/null @@ -1,52 +0,0 @@ -within CRML_test.FORML.Tests; -model DelayedTimePeriods - import CRML; - CRML.Blocks.Events.EventTable event1(option_width = false, instant = {0.5, 4, 5, 7, 10}) annotation( - Placement(transformation(extent = {{-100, 30}, {-80, 50}}))); - CRML.Blocks.Events.ShowEvent showEvent1 annotation( - Placement(transformation(extent = {{-64, 46}, {-56, 54}}))); - CRML.ETL.TimeLocators.Periods fromFor - annotation (Placement(transformation(extent={{40,0},{60,20}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 annotation( - Placement(transformation(extent = {{16, 6}, {24, 14}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 annotation( - Placement(transformation(extent = {{16, -2}, {24, 6}}))); - CRML.ETL.TimeLocators.Periods fromFor_duration(durationSpecified=true, - discreteClockSpecified=false) - annotation (Placement(transformation(extent={{40,-40},{60,-20}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_4 annotation( - Placement(transformation(extent = {{16, -34}, {24, -26}}))); - CRML.Blocks.Math.Constant duration(k=5) - annotation (Placement(transformation(extent={{-100,-50},{-80,-30}}))); - CRML.Blocks.Events.ShowEvent showDelayedEvent1 - annotation (Placement(transformation(extent={{-28,10},{-20,18}}))); - CRML.Blocks.Events.EventDelay eventDelay - annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); -equation - connect(event1.y, showEvent1.u) annotation( - Line(points = {{-79, 40}, {-70, 40}, {-70, 50}, {-64.4, 50}}, color = {217, 67, 180})); - connect(booleanToBoolean4_2.y, fromFor.u1) - annotation (Line(points={{24.4,10},{39,10}}, color={162,29,33})); - connect(booleanToBoolean4_1.y, fromFor.u2) - annotation (Line(points={{24.4,2},{39,2}}, color={162,29,33})); - connect(booleanToBoolean4_4.y, fromFor_duration.u1) - annotation (Line(points={{24.4,-30},{39,-30}}, color={162,29,33})); - connect(duration.y, fromFor_duration.continuousDuration) annotation (Line( - points={{-79,-40},{36,-40},{36,-38},{39,-38}}, color={0,0,0})); - connect(eventDelay.delay, duration.y) annotation (Line(points={{-61,-8},{-66, - -8},{-66,-40},{-79,-40}}, color={0,0,0})); - connect(eventDelay.u, event1.y) annotation (Line(points={{-61,0},{-68,0},{-68, - 10},{-79,10},{-79,40}}, color={217,67,180})); - connect(booleanToBoolean4_2.u, event1.y) annotation (Line(points={{15.6,10},{ - 2,10},{2,32},{-79,32},{-79,40}}, color={217,67,180})); - connect(booleanToBoolean4_1.u, eventDelay.y) annotation (Line(points={{15.6,2}, - {-36,2},{-36,0},{-39,0}}, color={217,67,180})); - connect(showDelayedEvent1.u, eventDelay.y) annotation (Line(points={{-28.4,14}, - {-30,14},{-30,2},{-36,2},{-36,0},{-39,0}}, color={217,67,180})); - connect(booleanToBoolean4_4.u, event1.y) annotation (Line(points={{15.6,-30}, - {-8,-30},{-8,32},{-79,32},{-79,40}}, color={217,67,180})); - annotation( - Icon(coordinateSystem(preserveAspectRatio = false), graphics = {Ellipse(lineColor = {75, 138, 73}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-100, -100}, {100, 100}}), Polygon(lineColor = {0, 0, 255}, fillColor = {75, 138, 73}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, points = {{-36, 60}, {64, 0}, {-36, -60}, {-36, 60}})}), - Diagram(coordinateSystem(preserveAspectRatio = false)), - experiment(StopTime = 20)); -end DelayedTimePeriods; diff --git a/resources/modelica_libraries/CRML_test/FORML/Tests/package.mo b/resources/modelica_libraries/CRML_test/FORML/Tests/package.mo deleted file mode 100644 index cfdf504..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/Tests/package.mo +++ /dev/null @@ -1,6 +0,0 @@ -within CRML_test.FORML; -package Tests - - annotation( - Icon(graphics = {Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100.0, -100.0}, {100.0, 100.0}}, radius = 25.0), Rectangle(lineColor = {128, 128, 128}, extent = {{-100.0, -100.0}, {100.0, 100.0}}, radius = 25.0), Polygon(origin = {8.0, 14.0}, lineColor = {78, 138, 73}, fillColor = {78, 138, 73}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, points = {{-58.0, 46.0}, {42.0, -14.0}, {-58.0, -74.0}, {-58.0, 46.0}})})); -end Tests; diff --git a/resources/modelica_libraries/CRML_test/FORML/Tests/package.order b/resources/modelica_libraries/CRML_test/FORML/Tests/package.order deleted file mode 100644 index 82997bd..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/Tests/package.order +++ /dev/null @@ -1 +0,0 @@ -DelayedTimePeriods diff --git a/resources/modelica_libraries/CRML_test/FORML/package.mo b/resources/modelica_libraries/CRML_test/FORML/package.mo deleted file mode 100644 index d59120e..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/package.mo +++ /dev/null @@ -1,19 +0,0 @@ -within CRML_test; -package FORML -annotation (Icon(graphics={ - Rectangle( - lineColor={200,200,200}, - fillColor={248,248,248}, - fillPattern=FillPattern.HorizontalCylinder, - extent={{-100,-100},{100,100}}, - radius=25.0), Text( - extent={{-42,38},{44,-30}}, - lineColor={0,0,0}, - fontName="Symbol", - textString=""), - Rectangle( - lineColor={128,128,128}, - fillPattern=FillPattern.None, - extent={{-100,-100},{100,100}}, - radius=25.0)})); -end FORML; diff --git a/resources/modelica_libraries/CRML_test/FORML/package.order b/resources/modelica_libraries/CRML_test/FORML/package.order deleted file mode 100644 index 45b5b26..0000000 --- a/resources/modelica_libraries/CRML_test/FORML/package.order +++ /dev/null @@ -1,12 +0,0 @@ -CheckAtEnd -AfterBefore -AfterBefore_no_ext -AfterFor -AfterFor_no_ext -AfterUntil -AfterUntil_no_ext -FromBefore -FromBefore_no_ext -FromUntil -FromUntil_no_ext -Tests diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation.mo deleted file mode 100644 index 9b43616..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation.mo +++ /dev/null @@ -1,13 +0,0 @@ -within CRML_test.Spec_doc.BooleanAccumulation; -partial model BooleanAccumulation - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.Boolean4Connector b2 - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - Utilities.Boolean4Connector b_accumulation - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); -equation - b_accumulation = CRML.ETL.Evaluator.TemporalOperators.add4(b1,b2); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanAccumulation; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_externals.mo deleted file mode 100644 index e412a08..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_externals.mo +++ /dev/null @@ -1,18 +0,0 @@ -within CRML_test.Spec_doc.BooleanAccumulation; -model BooleanAccumulation_externals - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant1(K=CRML.ETL.Types.Boolean4.true4) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant2(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.Boolean4Output b1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.Boolean4Output b2 - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); -equation - connect(boolean4Constant1.y, b1) - annotation (Line(points={{-39,50},{110,50}}, color={162,29,33})); - connect(boolean4Constant2.y, b2) - annotation (Line(points={{-39,-50},{110,-50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanAccumulation_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_ref.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_ref.mo deleted file mode 100644 index e3d0ecb..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_ref.mo +++ /dev/null @@ -1,13 +0,0 @@ -within CRML_test.Spec_doc.BooleanAccumulation; -partial model BooleanAccumulation_ref - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.Boolean4Connector b2 - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - Utilities.Boolean4Connector b_accumulation - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); -equation - b_accumulation = CRML.ETL.Evaluator.TemporalOperators.add4(b1,b2); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanAccumulation_ref; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_verif.mo deleted file mode 100644 index 0c59aed..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.Spec_doc.BooleanAccumulation; -model BooleanAccumulation_verif - extends BooleanAccumulation; - BooleanAccumulation_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - b2 = externals.b2; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end BooleanAccumulation_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_verif_ref.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_verif_ref.mo deleted file mode 100644 index 2451dea..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/BooleanAccumulation_verif_ref.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.Spec_doc.BooleanAccumulation; -model BooleanAccumulation_verif_ref - extends BooleanAccumulation_ref; - BooleanAccumulation_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - b2 = externals.b2; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end BooleanAccumulation_verif_ref; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/package.mo deleted file mode 100644 index 714e6f7..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package BooleanAccumulation -end BooleanAccumulation; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/package.order deleted file mode 100644 index 3e14366..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation/package.order +++ /dev/null @@ -1,5 +0,0 @@ -BooleanAccumulation -BooleanAccumulation_externals -BooleanAccumulation_ref -BooleanAccumulation_verif -BooleanAccumulation_verif_ref diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation_no_ext/BooleanAccumulation_no_ext.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation_no_ext/BooleanAccumulation_no_ext.mo deleted file mode 100644 index 2dbd0ff..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation_no_ext/BooleanAccumulation_no_ext.mo +++ /dev/null @@ -1,47 +0,0 @@ -within CRML_test.Spec_doc.BooleanAccumulation_no_ext; -model BooleanAccumulation_no_ext - import CRML.ETL.Types.Boolean4; - CRML.ETL.Types.Boolean4 b_true = Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_true_accumulates_true; - CRML.ETL.Types.Boolean4 b_true_accumulates_false; - CRML.ETL.Types.Boolean4 b_true_accumulates_undecided; - CRML.ETL.Types.Boolean4 b_true_accumulates_undefined; - CRML.ETL.Types.Boolean4 b_false_accumulates_true; - CRML.ETL.Types.Boolean4 b_false_accumulates_false; - CRML.ETL.Types.Boolean4 b_false_accumulates_undecided; - CRML.ETL.Types.Boolean4 b_false_accumulates_undefined; - CRML.ETL.Types.Boolean4 b_undecided_accumulates_true; - CRML.ETL.Types.Boolean4 b_undecided_accumulates_false; - CRML.ETL.Types.Boolean4 b_undecided_accumulates_undecided; - CRML.ETL.Types.Boolean4 b_undecided_accumulates_undefined; - CRML.ETL.Types.Boolean4 b_undefined_accumulates_true; - CRML.ETL.Types.Boolean4 b_undefined_accumulates_false; - CRML.ETL.Types.Boolean4 b_undefined_accumulates_undecided; - CRML.ETL.Types.Boolean4 b_undefined_accumulates_undefined; -equation - b_true_accumulates_true = CRML.ETL.Evaluator.TemporalOperators.add4(b_true, b_true); - b_true_accumulates_false = CRML.ETL.Evaluator.TemporalOperators.add4(b_true, b_false); - b_true_accumulates_undecided = CRML.ETL.Evaluator.TemporalOperators.add4(b_true, b_undecided); - b_true_accumulates_undefined = CRML.ETL.Evaluator.TemporalOperators.add4(b_true, b_undefined); - - b_false_accumulates_true = CRML.ETL.Evaluator.TemporalOperators.add4(b_false, b_true); - b_false_accumulates_false = CRML.ETL.Evaluator.TemporalOperators.add4(b_false, b_false); - b_false_accumulates_undecided = CRML.ETL.Evaluator.TemporalOperators.add4(b_false, b_undecided); - b_false_accumulates_undefined = CRML.ETL.Evaluator.TemporalOperators.add4(b_false, b_undefined); - - b_undecided_accumulates_true = CRML.ETL.Evaluator.TemporalOperators.add4(b_undecided, b_true); - b_undecided_accumulates_false = CRML.ETL.Evaluator.TemporalOperators.add4(b_undecided, b_false); - b_undecided_accumulates_undecided = CRML.ETL.Evaluator.TemporalOperators.add4(b_undecided, b_undecided); - b_undecided_accumulates_undefined = CRML.ETL.Evaluator.TemporalOperators.add4(b_undecided, b_undefined); - - b_undefined_accumulates_true = CRML.ETL.Evaluator.TemporalOperators.add4(b_undefined, b_true); - b_undefined_accumulates_false = CRML.ETL.Evaluator.TemporalOperators.add4(b_undefined, b_false); - b_undefined_accumulates_undecided = CRML.ETL.Evaluator.TemporalOperators.add4(b_undefined, b_undecided); - b_undefined_accumulates_undefined = CRML.ETL.Evaluator.TemporalOperators.add4(b_undefined, b_undefined); - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanAccumulation_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation_no_ext/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation_no_ext/package.mo deleted file mode 100644 index c72889c..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package BooleanAccumulation_no_ext -end BooleanAccumulation_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation_no_ext/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation_no_ext/package.order deleted file mode 100644 index cf37336..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAccumulation_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -BooleanAccumulation_no_ext diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAtEvent/BooleanAtEvent.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAtEvent/BooleanAtEvent.mo deleted file mode 100644 index 5033d58..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAtEvent/BooleanAtEvent.mo +++ /dev/null @@ -1,30 +0,0 @@ -within CRML_test.Spec_doc.BooleanAtEvent; -partial model BooleanAtEvent - Utilities.BooleanConnector b1 - annotation (Placement(transformation(extent={{-10,10},{10,-10}}, - rotation=-90, - origin={-110,30}))); - Utilities.ClockConnector c - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - Utilities.BooleanConnector b_at_event - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Logical.BooleanClockedDelay booleanClockedDelay - annotation (Placement(transformation(extent={{-8,-10},{12,10}}))); - CRML.Blocks.Events.ClockToBoolean clockToBoolean - annotation (Placement(transformation(extent={{-80,-34},{-72,-26}}))); - CRML.Blocks.MathInteger.IntegerConstant integerConstant(K=0) - annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); -equation - connect(c, clockToBoolean.u) annotation (Line(points={{-110,-30},{-80.8,-30},{ - -80.8,-30}}, color={0,0,0})); - connect(booleanClockedDelay.u, b1) annotation (Line(points={{-9,0},{-60,0},{ - -60,30},{-110,30}}, color={217,67,180})); - connect(booleanClockedDelay.clock, clockToBoolean.y) annotation (Line(points= - {{-9,8},{-40,8},{-40,-30},{-71.2,-30}}, color={217,67,180})); - connect(booleanClockedDelay.delay, integerConstant.y) annotation (Line(points - ={{-9,-8},{-20,-8},{-20,-60},{-39,-60}}, color={255,127,0})); - connect(booleanClockedDelay.y, b_at_event) - annotation (Line(points={{13,0},{110,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanAtEvent; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAtEvent/BooleanAtEvent_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAtEvent/BooleanAtEvent_externals.mo deleted file mode 100644 index 55791ab..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAtEvent/BooleanAtEvent_externals.mo +++ /dev/null @@ -1,37 +0,0 @@ -within CRML_test.Spec_doc.BooleanAtEvent; -model BooleanAtEvent_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1( - startTime=2, - period=1.5, - width=1) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical.BooleanPulse boolean4Constant2(period=1.5, startTime= - 1) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.BooleanOutput b1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.ClockOutput c - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{0,-70},{40,-30}}))); - CRML.Blocks.Events.ShowEvent showEvent_b - annotation (Placement(transformation(extent={{-16,-78},{-8,-70}}))); - CRML.Blocks.Events.ShowEvent showEvent_b1 - annotation (Placement(transformation(extent={{-18,26},{-10,34}}))); -equation - connect(boolean4Constant2.y, clockEvent.u) - annotation (Line(points={{-39,-50},{-2,-50}}, color={217,67,180})); - connect(clockEvent.y, c) annotation (Line( - points={{42,-50},{74,-50},{74,-50},{110,-50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(showEvent_b.u, clockEvent.u) annotation (Line(points={{-16.4,-74},{ - -20,-74},{-20,-50},{-2,-50}}, color={217,67,180})); - connect(boolean4Constant1.y, b1) - annotation (Line(points={{-39,50},{110,50}}, color={217,67,180})); - connect(showEvent_b1.u, b1) annotation (Line(points={{-18.4,30},{-20,30},{-20, - 50},{110,50}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanAtEvent_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAtEvent/BooleanAtEvent_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAtEvent/BooleanAtEvent_verif.mo deleted file mode 100644 index 32b57ed..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanAtEvent/BooleanAtEvent_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.Spec_doc.BooleanAtEvent; -model BooleanAtEvent_verif - extends BooleanAtEvent; - BooleanAtEvent_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - c =externals.c; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end BooleanAtEvent_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/BooleanConjunction.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/BooleanConjunction.mo deleted file mode 100644 index 2c8a038..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/BooleanConjunction.mo +++ /dev/null @@ -1,13 +0,0 @@ -within CRML_test.Spec_doc.BooleanConjunction; -partial model BooleanConjunction - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.Boolean4Connector b2 - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - Utilities.Boolean4Connector b_conjunction - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); -equation - b_conjunction = CRML.Blocks.Logical4.and4(b1, b2); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanConjunction; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/BooleanConjunction_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/BooleanConjunction_externals.mo deleted file mode 100644 index 23f026d..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/BooleanConjunction_externals.mo +++ /dev/null @@ -1,18 +0,0 @@ -within CRML_test.Spec_doc.BooleanConjunction; -model BooleanConjunction_externals - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant1(K=CRML.ETL.Types.Boolean4.true4) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant2(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.Boolean4Output b1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.Boolean4Output b2 - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); -equation - connect(boolean4Constant1.y, b1) - annotation (Line(points={{-39,50},{110,50}}, color={162,29,33})); - connect(boolean4Constant2.y, b2) - annotation (Line(points={{-39,-50},{110,-50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanConjunction_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/BooleanConjunction_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/BooleanConjunction_verif.mo deleted file mode 100644 index 326da50..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/BooleanConjunction_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.Spec_doc.BooleanConjunction; -model BooleanConjunction_verif - extends BooleanConjunction; - BooleanConjunction_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - b2 = externals.b2; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end BooleanConjunction_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/package.mo deleted file mode 100644 index 2f4798c..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package BooleanConjunction -end BooleanConjunction; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/package.order deleted file mode 100644 index 47ea87e..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction/package.order +++ /dev/null @@ -1,3 +0,0 @@ -BooleanConjunction -BooleanConjunction_externals -BooleanConjunction_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction_no_ext/BooleanConjunction_no_ext.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction_no_ext/BooleanConjunction_no_ext.mo deleted file mode 100644 index d95c2f0..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction_no_ext/BooleanConjunction_no_ext.mo +++ /dev/null @@ -1,47 +0,0 @@ -within CRML_test.Spec_doc.BooleanConjunction_no_ext; -model BooleanConjunction_no_ext - import CRML.ETL.Types.Boolean4; - CRML.ETL.Types.Boolean4 b_true = Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_true_and_true; - CRML.ETL.Types.Boolean4 b_true_and_false; - CRML.ETL.Types.Boolean4 b_true_and_undecided; - CRML.ETL.Types.Boolean4 b_true_and_undefined; - CRML.ETL.Types.Boolean4 b_false_and_true; - CRML.ETL.Types.Boolean4 b_false_and_false; - CRML.ETL.Types.Boolean4 b_false_and_undecided; - CRML.ETL.Types.Boolean4 b_false_and_undefined; - CRML.ETL.Types.Boolean4 b_undecided_and_true; - CRML.ETL.Types.Boolean4 b_undecided_and_false; - CRML.ETL.Types.Boolean4 b_undecided_and_undecided; - CRML.ETL.Types.Boolean4 b_undecided_and_undefined; - CRML.ETL.Types.Boolean4 b_undefined_and_true; - CRML.ETL.Types.Boolean4 b_undefined_and_false; - CRML.ETL.Types.Boolean4 b_undefined_and_undecided; - CRML.ETL.Types.Boolean4 b_undefined_and_undefined; -equation - b_true_and_true = CRML.Blocks.Logical4.and4(b_true, b_true); - b_true_and_false = CRML.Blocks.Logical4.and4(b_true, b_false); - b_true_and_undecided = CRML.Blocks.Logical4.and4(b_true, b_undecided); - b_true_and_undefined = CRML.Blocks.Logical4.and4(b_true, b_undefined); - - b_false_and_true = CRML.Blocks.Logical4.and4(b_false, b_true); - b_false_and_false = CRML.Blocks.Logical4.and4(b_false, b_false); - b_false_and_undecided = CRML.Blocks.Logical4.and4(b_false, b_undecided); - b_false_and_undefined = CRML.Blocks.Logical4.and4(b_false, b_undefined); - - b_undecided_and_true = CRML.Blocks.Logical4.and4(b_undecided, b_true); - b_undecided_and_false = CRML.Blocks.Logical4.and4(b_undecided, b_false); - b_undecided_and_undecided = CRML.Blocks.Logical4.and4(b_undecided, b_undecided); - b_undecided_and_undefined = CRML.Blocks.Logical4.and4(b_undecided, b_undefined); - - b_undefined_and_true = CRML.Blocks.Logical4.and4(b_undefined, b_true); - b_undefined_and_false = CRML.Blocks.Logical4.and4(b_undefined, b_false); - b_undefined_and_undecided = CRML.Blocks.Logical4.and4(b_undefined, b_undecided); - b_undefined_and_undefined = CRML.Blocks.Logical4.and4(b_undefined, b_undefined); - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanConjunction_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction_no_ext/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction_no_ext/package.mo deleted file mode 100644 index 0bfd3e2..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package BooleanConjunction_no_ext -end BooleanConjunction_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction_no_ext/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction_no_ext/package.order deleted file mode 100644 index 1520053..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanConjunction_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -BooleanConjunction_no_ext diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanIntegration/BooleanIntegration.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanIntegration/BooleanIntegration.mo deleted file mode 100644 index 33ffe40..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanIntegration/BooleanIntegration.mo +++ /dev/null @@ -1,28 +0,0 @@ -within CRML_test.Spec_doc.BooleanIntegration; -partial model BooleanIntegration - Utilities.Boolean4Connector a - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.Boolean4Connector b_integration - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - Utilities.TimeLocatorConnector P - annotation (Placement(transformation(extent={{-10,120},{10,100}}))); -// protected -// parameter Integer N=CRML.ETL.Types.nMaxOverlap; -public - CRML.ETL.Evaluator.Integrate boolean4Integrator - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant(K=CRML.ETL.Types.Boolean4.true4) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); -equation - b_integration = CRML.Blocks.Logical4.not4(a); - connect(boolean4Integrator.u, a) annotation (Line(points={{-11,0},{-60,0},{-60, - 30},{-110,30}}, color={162,29,33})); - connect(P, boolean4Integrator.tl) - annotation (Line(points={{0,110},{0,10}}, color={0,0,255})); - connect(boolean4Integrator.y, b_integration) annotation (Line(points={{11,0}, - {64,0},{64,0},{110,0}}, color={162,29,33})); - connect(boolean4Integrator.a, boolean4Constant.y) annotation (Line(points={{ - -11,8},{-26,8},{-26,50},{-39,50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanIntegration; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanIntegration/BooleanIntegration_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanIntegration/BooleanIntegration_externals.mo deleted file mode 100644 index 2f6aaeb..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanIntegration/BooleanIntegration_externals.mo +++ /dev/null @@ -1,66 +0,0 @@ -within CRML_test.Spec_doc.BooleanIntegration; -model BooleanIntegration_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1 - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Utilities.Boolean4Connector a - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{12,46},{20,54}}))); - Utilities.TimeLocatorConnector P - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); - CRML.Blocks.Events.EventPeriodic eventPeriodic1(period=20, startTime=2) - annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - CRML.Blocks.Events.EventPeriodic eventPeriodic2(period=20, startTime=3.5) - annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - CRML.Blocks.Events.ShowEvent showEvent_e1 - annotation (Placement(transformation(extent={{-8,-24},{0,-16}}))); - CRML.Blocks.Events.ShowEvent showEvent_e2 - annotation (Placement(transformation(extent={{-8,-84},{0,-76}}))); - CRML.ETL.TimeLocators.Periods periods - annotation (Placement(transformation(extent={{40,-20},{60,0}}))); -public - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{10,6},{18,14}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_3 - annotation (Placement(transformation(extent={{10,-44},{18,-36}}))); - inner CRML.TimeLocators.Continuous.Master master - annotation (Placement(transformation(extent={{40,70},{60,90}}))); - CRML.Blocks.Logical.BooleanPulse booleanPulse( - width=6, - period=20, - startTime=2) - annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 - booleanToBoolean4_7 - annotation (Placement(transformation(extent={{12,76},{20,84}}))); -equation - connect(boolean4Constant1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{11.6,50}}, color={217,67,180})); - connect(a, booleanToBoolean4_1.y) - annotation (Line(points={{110,50},{20.4,50}}, color={162,29,33})); - connect(showEvent_e1.u,eventPeriodic1. y) annotation (Line(points={{-8.4,-20}, - {-24,-20},{-24,10},{-39,10}}, - color={217,67,180})); - connect(eventPeriodic2.y,showEvent_e2. u) annotation (Line(points={{-39,-40}, - {-24,-40},{-24,-80},{-8.4,-80}}, - color={217,67,180})); - connect(eventPeriodic1.y,booleanToBoolean4_2. u) - annotation (Line(points={{-39,10},{9.6,10}}, color={217,67,180})); - connect(eventPeriodic2.y,booleanToBoolean4_3. u) - annotation (Line(points={{-39,-40},{9.6,-40}}, - color={217,67,180})); - connect(booleanToBoolean4_3.y,periods. u2) annotation (Line(points={{18.4,-40}, - {28,-40},{28,-18},{39,-18}}, - color={162,29,33})); - connect(booleanToBoolean4_2.y,periods. u1) annotation (Line(points={{18.4,10}, - {30,10},{30,-10},{39,-10}}, - color={162,29,33})); - connect(P, periods.y[1]) - annotation (Line(points={{110,-50},{50,-50},{50,-20}}, color={0,0,255})); - connect(booleanPulse.y, booleanToBoolean4_7.u) - annotation (Line(points={{1,80},{11.6,80}}, color={217,67,180})); - connect(master.u, booleanToBoolean4_7.y) - annotation (Line(points={{39,80},{20.4,80}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanIntegration_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanIntegration/BooleanIntegration_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanIntegration/BooleanIntegration_verif.mo deleted file mode 100644 index 2bda4f2..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanIntegration/BooleanIntegration_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.Spec_doc.BooleanIntegration; -model BooleanIntegration_verif - extends BooleanIntegration; - BooleanIntegration_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings -// a =externals.a; - P =externals.P; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end BooleanIntegration_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/BooleanNegation.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/BooleanNegation.mo deleted file mode 100644 index 3a4bc35..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/BooleanNegation.mo +++ /dev/null @@ -1,11 +0,0 @@ -within CRML_test.Spec_doc.BooleanNegation; -partial model BooleanNegation - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.Boolean4Connector not_b1 - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); -equation - not_b1 = CRML.Blocks.Logical4.not4(b1); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanNegation; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/BooleanNegation_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/BooleanNegation_externals.mo deleted file mode 100644 index 44c612f..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/BooleanNegation_externals.mo +++ /dev/null @@ -1,12 +0,0 @@ -within CRML_test.Spec_doc.BooleanNegation; -model BooleanNegation_externals - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant1(K=CRML.ETL.Types.Boolean4.true4) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.ETL.Connectors.Boolean4Output b1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); -equation - connect(boolean4Constant1.y, b1) - annotation (Line(points={{-39,50},{110,50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanNegation_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/BooleanNegation_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/BooleanNegation_verif.mo deleted file mode 100644 index b69186f..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/BooleanNegation_verif.mo +++ /dev/null @@ -1,26 +0,0 @@ -within CRML_test.Spec_doc.BooleanNegation; -model BooleanNegation_verif - extends BooleanNegation; - BooleanNegation_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end BooleanNegation_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/package.mo deleted file mode 100644 index e53807c..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package BooleanNegation -end BooleanNegation; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/package.order deleted file mode 100644 index dcb1dda..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation/package.order +++ /dev/null @@ -1,3 +0,0 @@ -BooleanNegation -BooleanNegation_externals -BooleanNegation_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation_no_ext/BooleanNegation_no_ext.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation_no_ext/BooleanNegation_no_ext.mo deleted file mode 100644 index a65a927..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation_no_ext/BooleanNegation_no_ext.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.Spec_doc.BooleanNegation_no_ext; -model BooleanNegation_no_ext - import CRML.ETL.Types.Boolean4; - CRML.ETL.Types.Boolean4 b_true = Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_not_true; - CRML.ETL.Types.Boolean4 b_not_false; - CRML.ETL.Types.Boolean4 b_not_undecided; - CRML.ETL.Types.Boolean4 b_not_undefined; -equation - b_not_true = CRML.Blocks.Logical4.not4(b_true); - b_not_false = CRML.Blocks.Logical4.not4(b_false); - b_not_undecided = CRML.Blocks.Logical4.not4(b_undecided); - b_not_undefined = CRML.Blocks.Logical4.not4(b_undefined); - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanNegation_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation_no_ext/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation_no_ext/package.mo deleted file mode 100644 index ce0e2ef..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package BooleanNegation_no_ext -end BooleanNegation_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation_no_ext/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation_no_ext/package.order deleted file mode 100644 index 9657b6f..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/BooleanNegation_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -BooleanNegation_no_ext diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/ClockConstructors.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/ClockConstructors.mo deleted file mode 100644 index 11c9e53..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/ClockConstructors.mo +++ /dev/null @@ -1,24 +0,0 @@ -within CRML_test.Spec_doc.ClockConstructors; -partial model ClockConstructors - Utilities.BooleanConnector b - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.ClockConnector clock - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{-6,14},{6,26}}))); - CRML.Blocks.Events.ShowEvent c - annotation (Placement(transformation(extent={{40,-24},{48,-16}}))); -equation - - connect(b, clockEvent.u) annotation (Line(points={{-110,30},{-58,30},{-58,20}, - {-6.6,20}}, color={0,0,0})); - connect(clockEvent.y, clock) annotation (Line( - points={{6.6,20},{54,20},{54,0},{110,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(c.u, b) annotation (Line(points={{39.6,-20},{-32,-20},{-32,30},{-110, - 30}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockConstructors; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/ClockConstructors_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/ClockConstructors_externals.mo deleted file mode 100644 index 22a621f..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/ClockConstructors_externals.mo +++ /dev/null @@ -1,12 +0,0 @@ -within CRML_test.Spec_doc.ClockConstructors; -model ClockConstructors_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1 - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.ETL.Connectors.BooleanOutput b - annotation (Placement(transformation(extent={{100,40},{120,60}}))); -equation - connect(boolean4Constant1.y, b) - annotation (Line(points={{-39,50},{110,50}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockConstructors_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/ClockConstructors_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/ClockConstructors_verif.mo deleted file mode 100644 index ea9e074..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/ClockConstructors_verif.mo +++ /dev/null @@ -1,26 +0,0 @@ -within CRML_test.Spec_doc.ClockConstructors; -model ClockConstructors_verif - extends ClockConstructors; - ClockConstructors_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b = externals.b; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end ClockConstructors_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/package.mo deleted file mode 100644 index 460362c..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package ClockConstructors -end ClockConstructors; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/package.order deleted file mode 100644 index 6b36da6..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors/package.order +++ /dev/null @@ -1,3 +0,0 @@ -ClockConstructors -ClockConstructors_externals -ClockConstructors_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors_no_ext/ClockConstructors_no_ext.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors_no_ext/ClockConstructors_no_ext.mo deleted file mode 100644 index 986d52c..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors_no_ext/ClockConstructors_no_ext.mo +++ /dev/null @@ -1,25 +0,0 @@ -within CRML_test.Spec_doc.ClockConstructors_no_ext; -model ClockConstructors_no_ext - Utilities.ClockConnector clock - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{-6,14},{6,26}}))); - CRML.Blocks.Events.ShowEvent c - annotation (Placement(transformation(extent={{40,-24},{48,-16}}))); - CRML.Blocks.Logical.BooleanTable boolean4Constant1(option_width=false, - instant={2,3.5}) - annotation (Placement(transformation(extent={{-100,10},{-80,30}}))); -equation - - connect(clockEvent.y, clock) annotation (Line( - points={{6.6,20},{54,20},{54,0},{110,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(boolean4Constant1.y, clockEvent.u) - annotation (Line(points={{-79,20},{-6.6,20}}, color={217,67,180})); - connect(c.u, clockEvent.u) annotation (Line(points={{39.6,-20},{-12,-20},{-12, - 20},{-6.6,20}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockConstructors_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors_no_ext/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors_no_ext/package.mo deleted file mode 100644 index 15a2ccb..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package ClockConstructors_no_ext -end ClockConstructors_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors_no_ext/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors_no_ext/package.order deleted file mode 100644 index 02f42f3..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockConstructors_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -ClockConstructors_no_ext diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/ClockCurrentTick.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/ClockCurrentTick.mo deleted file mode 100644 index 06a7315..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/ClockCurrentTick.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.Spec_doc.ClockCurrentTick; -partial model ClockCurrentTick - Utilities.ClockConnector c - annotation (Placement(transformation(extent={{-120,10},{-100,-10}}))); - Utilities.BooleanConnector e_current_tick - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.ClockToBoolean clockToBoolean - annotation (Placement(transformation(extent={{-2,-4},{6,4}}))); -equation - - connect(clockToBoolean.u, c) annotation (Line( - points={{-2.8,0},{-110,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean.y, e_current_tick) annotation (Line(points={{6.8,0},{ - 58,0},{58,0},{110,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockCurrentTick; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/ClockCurrentTick_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/ClockCurrentTick_externals.mo deleted file mode 100644 index f0799e9..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/ClockCurrentTick_externals.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.Spec_doc.ClockCurrentTick; -model ClockCurrentTick_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1(period=20, startTime= - 2) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.ETL.Connectors.ClockOutput c - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{24,44},{36,56}}))); -equation - connect(boolean4Constant1.y, clockEvent.u) - annotation (Line(points={{-39,50},{23.4,50}}, color={217,67,180})); - connect(c, clockEvent.y) annotation (Line( - points={{110,50},{36.6,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockCurrentTick_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/ClockCurrentTick_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/ClockCurrentTick_verif.mo deleted file mode 100644 index 0739b60..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/ClockCurrentTick_verif.mo +++ /dev/null @@ -1,26 +0,0 @@ -within CRML_test.Spec_doc.ClockCurrentTick; -model ClockCurrentTick_verif - extends ClockCurrentTick; - ClockCurrentTick_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - c =externals.c; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end ClockCurrentTick_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/package.mo deleted file mode 100644 index 18ca8ef..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package ClockCurrentTick -end ClockCurrentTick; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/package.order deleted file mode 100644 index b37ae93..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick/package.order +++ /dev/null @@ -1,3 +0,0 @@ -ClockCurrentTick -ClockCurrentTick_externals -ClockCurrentTick_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick_no_ext/ClockCurrentTick_no_ext.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick_no_ext/ClockCurrentTick_no_ext.mo deleted file mode 100644 index 414c33b..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick_no_ext/ClockCurrentTick_no_ext.mo +++ /dev/null @@ -1,25 +0,0 @@ -within CRML_test.Spec_doc.ClockCurrentTick_no_ext; -model ClockCurrentTick_no_ext - Utilities.BooleanConnector e_current_tick - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.ClockToBoolean clockToBoolean - annotation (Placement(transformation(extent={{-2,-4},{6,4}}))); - CRML.Blocks.Logical.BooleanTable boolean4Constant1(option_width=false, - instant={2,3.5,4,5.5}) - annotation (Placement(transformation(extent={{-100,-10},{-80,10}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{-46,-6},{-34,6}}))); -equation - - connect(clockToBoolean.y, e_current_tick) annotation (Line(points={{6.8,0},{ - 58,0},{58,0},{110,0}}, color={217,67,180})); - connect(boolean4Constant1.y, clockEvent.u) - annotation (Line(points={{-79,0},{-46.6,0}}, color={217,67,180})); - connect(clockEvent.y, clockToBoolean.u) annotation (Line( - points={{-33.4,0},{-2.8,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockCurrentTick_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick_no_ext/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick_no_ext/package.mo deleted file mode 100644 index b2e60bc..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package ClockCurrentTick_no_ext -end ClockCurrentTick_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick_no_ext/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick_no_ext/package.order deleted file mode 100644 index 0429e45..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockCurrentTick_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -ClockCurrentTick_no_ext diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter/ClockFilter.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter/ClockFilter.mo deleted file mode 100644 index eec2252..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter/ClockFilter.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.Spec_doc.ClockFilter; -partial model ClockFilter - Utilities.ClockConnector c - annotation (Placement(transformation(extent={{-120,10},{-100,-10}}))); - Utilities.BooleanConnector e_current_tick - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.ClockToBoolean clockToBoolean - annotation (Placement(transformation(extent={{-2,-4},{6,4}}))); -equation - - connect(clockToBoolean.u, c) annotation (Line( - points={{-2.8,0},{-110,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean.y, e_current_tick) annotation (Line(points={{6.8,0},{ - 58,0},{58,0},{110,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockFilter; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter/ClockFilter_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter/ClockFilter_externals.mo deleted file mode 100644 index d89dd01..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter/ClockFilter_externals.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.Spec_doc.ClockFilter; -model ClockFilter_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1(period=20, startTime= - 2) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.ETL.Connectors.ClockOutput c - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{24,44},{36,56}}))); -equation - connect(boolean4Constant1.y, clockEvent.u) - annotation (Line(points={{-39,50},{23.4,50}}, color={217,67,180})); - connect(c, clockEvent.y) annotation (Line( - points={{110,50},{36.6,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockFilter_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter/ClockFilter_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter/ClockFilter_verif.mo deleted file mode 100644 index 39e3bf5..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter/ClockFilter_verif.mo +++ /dev/null @@ -1,26 +0,0 @@ -within CRML_test.Spec_doc.ClockFilter; -model ClockFilter_verif - extends ClockFilter; - ClockFilter_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - c =externals.c; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end ClockFilter_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter_wip/ClockFilter.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter_wip/ClockFilter.mo deleted file mode 100644 index 23c4921..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter_wip/ClockFilter.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.Spec_doc.ClockFilter_wip; -partial model ClockFilter - Utilities.ClockConnector c - annotation (Placement(transformation(extent={{-120,10},{-100,-10}}))); - Utilities.BooleanConnector e_current_tick - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.ClockToBoolean clockToBoolean - annotation (Placement(transformation(extent={{-2,-4},{6,4}}))); -equation - - connect(clockToBoolean.u, c) annotation (Line( - points={{-2.8,0},{-110,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockToBoolean.y, e_current_tick) annotation (Line(points={{6.8,0},{ - 58,0},{58,0},{110,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockFilter; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter_wip/ClockFilter_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter_wip/ClockFilter_externals.mo deleted file mode 100644 index 5226b74..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter_wip/ClockFilter_externals.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.Spec_doc.ClockFilter_wip; -model ClockFilter_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1(period=20, startTime= - 2) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.ETL.Connectors.ClockOutput c - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{24,44},{36,56}}))); -equation - connect(boolean4Constant1.y, clockEvent.u) - annotation (Line(points={{-39,50},{23.4,50}}, color={217,67,180})); - connect(c, clockEvent.y) annotation (Line( - points={{110,50},{36.6,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockFilter_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter_wip/ClockFilter_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter_wip/ClockFilter_verif.mo deleted file mode 100644 index 35c3478..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockFilter_wip/ClockFilter_verif.mo +++ /dev/null @@ -1,26 +0,0 @@ -within CRML_test.Spec_doc.ClockFilter_wip; -model ClockFilter_verif - extends ClockFilter; - ClockFilter_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - c =externals.c; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end ClockFilter_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockRank_wip/ClockRank.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockRank_wip/ClockRank.mo deleted file mode 100644 index 4d1169d..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockRank_wip/ClockRank.mo +++ /dev/null @@ -1,24 +0,0 @@ -within CRML_test.Spec_doc.ClockRank_wip; -partial model ClockRank - Utilities.ClockConnector c1 - annotation (Placement(transformation(extent={{-120,10},{-100,-10}}))); - Utilities.IntegerConnector r - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.ClockToBoolean clockToBoolean - annotation (Placement(transformation(extent={{-54,-4},{-46,4}}))); - CRML.Blocks.Events.EventCounter eventCounter - annotation (Placement(transformation(extent={{20,-10},{40,10}}))); -equation - - connect(eventCounter.y, r) annotation (Line(points={{41,0},{74,0},{74,0},{110, - 0}}, color={255,127,0})); - connect(clockToBoolean.y, eventCounter.u) - annotation (Line(points={{-45.2,0},{19,0}}, color={217,67,180})); - connect(clockToBoolean.u, c1) annotation (Line( - points={{-54.8,0},{-110,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockRank; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockRank_wip/ClockRank_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockRank_wip/ClockRank_externals.mo deleted file mode 100644 index 0a390c8..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockRank_wip/ClockRank_externals.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.Spec_doc.ClockRank_wip; -model ClockRank_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1(period=20, startTime= - 2) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.ETL.Connectors.ClockOutput c - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{24,44},{36,56}}))); -equation - connect(boolean4Constant1.y, clockEvent.u) - annotation (Line(points={{-39,50},{23.4,50}}, color={217,67,180})); - connect(c, clockEvent.y) annotation (Line( - points={{110,50},{36.6,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockRank_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/ClockRank_wip/ClockRank_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/ClockRank_wip/ClockRank_verif.mo deleted file mode 100644 index 4df0336..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/ClockRank_wip/ClockRank_verif.mo +++ /dev/null @@ -1,26 +0,0 @@ -within CRML_test.Spec_doc.ClockRank_wip; -model ClockRank_verif - extends ClockRank; - ClockRank_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - c1 = externals.c; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end ClockRank_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/EventConstructors.mo b/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/EventConstructors.mo deleted file mode 100644 index 249177d..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/EventConstructors.mo +++ /dev/null @@ -1,21 +0,0 @@ -within CRML_test.Spec_doc.EventConstructors; -partial model EventConstructors - Utilities.Boolean4Connector b - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.BooleanConnector e - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.RisingEdge4 rising1 - annotation (Placement(transformation(extent={{-4,-4},{4,4}}))); - CRML.Blocks.Events.ShowEvent showEvent - annotation (Placement(transformation(extent={{40,-24},{48,-16}}))); -equation - - connect(rising1.u, b) annotation (Line(points={{-4.4,0},{-52.2,0},{-52.2,30}, - {-110,30}}, color={162,29,33})); - connect(rising1.y, e) - annotation (Line(points={{4.4,0},{110,0}}, color={217,67,180})); - connect(showEvent.u, e) annotation (Line(points={{39.6,-20},{26,-20},{26,0},{ - 110,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end EventConstructors; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/EventConstructors_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/EventConstructors_externals.mo deleted file mode 100644 index e6bd3c3..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/EventConstructors_externals.mo +++ /dev/null @@ -1,17 +0,0 @@ -within CRML_test.Spec_doc.EventConstructors; -model EventConstructors_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1(period=20, startTime= - 2) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.ETL.Connectors.Boolean4Output b - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{16,46},{24,54}}))); -equation - connect(boolean4Constant1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{15.6,50}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, b) - annotation (Line(points={{24.4,50},{110,50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end EventConstructors_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/EventConstructors_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/EventConstructors_verif.mo deleted file mode 100644 index 049c965..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/EventConstructors_verif.mo +++ /dev/null @@ -1,26 +0,0 @@ -within CRML_test.Spec_doc.EventConstructors; -model EventConstructors_verif - extends EventConstructors; - EventConstructors_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b = externals.b; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end EventConstructors_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/package.mo deleted file mode 100644 index 753a19b..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package EventConstructors -end EventConstructors; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/package.order deleted file mode 100644 index a709156..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/EventConstructors/package.order +++ /dev/null @@ -1,3 +0,0 @@ -EventConstructors -EventConstructors_externals -EventConstructors_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/OperatorExample2.mo b/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/OperatorExample2.mo deleted file mode 100644 index 613d2fc..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/OperatorExample2.mo +++ /dev/null @@ -1,13 +0,0 @@ -within CRML_test.Spec_doc.OperatorExample2; -partial model OperatorExample2 - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.Boolean4Connector b2 - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - Utilities.Boolean4Connector b - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); -equation - b = CRML.Blocks.Logical4.or4(b1, b2); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end OperatorExample2; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/OperatorExample2_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/OperatorExample2_externals.mo deleted file mode 100644 index 44bb904..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/OperatorExample2_externals.mo +++ /dev/null @@ -1,18 +0,0 @@ -within CRML_test.Spec_doc.OperatorExample2; -model OperatorExample2_externals - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant1(K=CRML.ETL.Types.Boolean4.true4) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant2(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.Boolean4Output b1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.Boolean4Output b2 - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); -equation - connect(boolean4Constant1.y, b1) - annotation (Line(points={{-39,50},{110,50}}, color={162,29,33})); - connect(boolean4Constant2.y, b2) - annotation (Line(points={{-39,-50},{110,-50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end OperatorExample2_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/OperatorExample2_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/OperatorExample2_verif.mo deleted file mode 100644 index 82111e5..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/OperatorExample2_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.Spec_doc.OperatorExample2; -model OperatorExample2_verif - extends OperatorExample2; - OperatorExample2_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - b2 = externals.b2; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end OperatorExample2_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/package.mo deleted file mode 100644 index 3ccd006..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package OperatorExample2 -end OperatorExample2; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/package.order deleted file mode 100644 index 5bf730c..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/OperatorExample2/package.order +++ /dev/null @@ -1,3 +0,0 @@ -OperatorExample2 -OperatorExample2_externals -OperatorExample2_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/PeriodClosingEvent.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/PeriodClosingEvent.mo deleted file mode 100644 index 3343de0..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/PeriodClosingEvent.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.Spec_doc.PeriodClosingEvent; -partial model PeriodClosingEvent - CRML.ETL.Connectors.TimeLocatorOutput[N] P - annotation (Placement(transformation(extent={{-120,10},{-100,-10}}))); -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; -public - Utilities.BooleanConnector e - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.TimeLocators.Attributes.PeriodsEnd periodsStart - annotation (Placement(transformation(extent={{-6,-4},{2,4}}))); -equation - - connect(P, periodsStart.tl) annotation (Line(points={{-110,0},{-56,0},{-56,4}, - {-2,4}}, color={0,0,255})); - connect(periodsStart.y, e) - annotation (Line(points={{2.4,0},{110,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end PeriodClosingEvent; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/PeriodClosingEvent_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/PeriodClosingEvent_externals.mo deleted file mode 100644 index c80867c..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/PeriodClosingEvent_externals.mo +++ /dev/null @@ -1,39 +0,0 @@ -within CRML_test.Spec_doc.PeriodClosingEvent; -model PeriodClosingEvent_externals - CRML.Blocks.Events.EventPeriodic eventPeriodic1(period=20, startTime=2) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] P - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.Blocks.Events.EventPeriodic eventPeriodic2(period=20, startTime=3.5) - annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - CRML.Blocks.Events.ShowEvent showEvent_e1 - annotation (Placement(transformation(extent={{-8,16},{0,24}}))); - CRML.Blocks.Events.ShowEvent showEvent_e2 - annotation (Placement(transformation(extent={{-8,-44},{0,-36}}))); - CRML.ETL.TimeLocators.Periods periods - annotation (Placement(transformation(extent={{40,20},{60,40}}))); -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; -public - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{10,46},{18,54}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{10,-4},{18,4}}))); -equation - connect(showEvent_e1.u, eventPeriodic1.y) annotation (Line(points={{-8.4,20},{ - -24,20},{-24,50},{-39,50}}, color={217,67,180})); - connect(eventPeriodic2.y, showEvent_e2.u) annotation (Line(points={{-39,0},{-24, - 0},{-24,-40},{-8.4,-40}}, color={217,67,180})); - connect(P, periods.y) - annotation (Line(points={{110,0},{50,0},{50,20}}, color={0,0,255})); - connect(eventPeriodic1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{9.6,50}}, color={217,67,180})); - connect(eventPeriodic2.y, booleanToBoolean4_2.u) - annotation (Line(points={{-39,0},{9.6,0}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, periods.u2) annotation (Line(points={{18.4,0}, - {28,0},{28,22},{39,22}}, color={162,29,33})); - connect(booleanToBoolean4_1.y, periods.u1) annotation (Line(points={{18.4,50}, - {30,50},{30,30},{39,30}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end PeriodClosingEvent_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/PeriodClosingEvent_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/PeriodClosingEvent_verif.mo deleted file mode 100644 index 05f7826..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/PeriodClosingEvent_verif.mo +++ /dev/null @@ -1,30 +0,0 @@ -within CRML_test.Spec_doc.PeriodClosingEvent; -model PeriodClosingEvent_verif - extends PeriodClosingEvent; - PeriodClosingEvent_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - CRML.Blocks.Events.ShowEvent showEvent_e - annotation (Placement(transformation(extent={{140,-4},{148,4}}))); -equation - // Bindings - P =externals.P; - connect(showEvent_e.u, e) annotation (Line(points={{139.6,0},{126,0},{126,0}, - {110,0}}, color={217,67,180})); - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{160,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{160,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end PeriodClosingEvent_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/package.mo deleted file mode 100644 index 63ac42b..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package PeriodClosingEvent -end PeriodClosingEvent; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/package.order deleted file mode 100644 index 09b164b..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodClosingEvent/package.order +++ /dev/null @@ -1,3 +0,0 @@ -PeriodClosingEvent -PeriodClosingEvent_externals -PeriodClosingEvent_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/PeriodConstructors.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/PeriodConstructors.mo deleted file mode 100644 index 343f962..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/PeriodConstructors.mo +++ /dev/null @@ -1,58 +0,0 @@ -within CRML_test.Spec_doc.PeriodConstructors; -partial model PeriodConstructors - Utilities.Boolean4Connector e1 - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] P1 - annotation (Placement(transformation(extent={{100,40},{120,20}}))); - Utilities.Boolean4Connector e2 - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - CRML.ETL.TimeLocators.Periods periods1(leftBoundaryIncluded=true, - rightBoundaryIncluded=true) - annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); - CRML.ETL.TimeLocators.Periods periods2(rightBoundaryIncluded=true, - leftBoundaryIncluded=false) - annotation (Placement(transformation(extent={{-20,0},{0,20}}))); - CRML.ETL.TimeLocators.Periods periods3(leftBoundaryIncluded=true, - rightBoundaryIncluded=false) - annotation (Placement(transformation(extent={{0,-40},{20,-20}}))); - CRML.ETL.TimeLocators.Periods periods4(rightBoundaryIncluded=false, - leftBoundaryIncluded=false) - annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; -public - CRML.ETL.Connectors.TimeLocatorOutput[N] P2 - annotation (Placement(transformation(extent={{100,0},{120,-20}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] P3 - annotation (Placement(transformation(extent={{100,-40},{120,-60}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] P4 - annotation (Placement(transformation(extent={{100,-80},{120,-100}}))); -equation - - connect(periods2.u1, e1) annotation (Line(points={{-21,10},{-36,10},{-36,30},{ - -110,30}}, color={162,29,33})); - connect(periods1.u1, e1) annotation (Line(points={{-41,50},{-72,50},{-72,30},{ - -110,30}}, color={162,29,33})); - connect(periods1.u2, e2) annotation (Line(points={{-41,42},{-76,42},{-76,-30}, - {-110,-30}}, color={162,29,33})); - connect(periods2.u2, e2) annotation (Line(points={{-21,2},{-76,2},{-76,-30},{-110, - -30}}, color={162,29,33})); - connect(periods3.u1, e1) annotation (Line(points={{-1,-30},{-36,-30},{-36,30}, - {-110,30}}, color={162,29,33})); - connect(periods3.u2, e2) annotation (Line(points={{-1,-38},{-76,-38},{-76,-30}, - {-110,-30}}, color={162,29,33})); - connect(periods4.u1, e1) annotation (Line(points={{19,-70},{-36,-70},{-36,-30}, - {-36,-30},{-36,30},{-110,30}}, color={162,29,33})); - connect(periods4.u2, e2) annotation (Line(points={{19,-78},{-76,-78},{-76,-30}, - {-110,-30}}, color={162,29,33})); - connect(P1, periods1.y) - annotation (Line(points={{110,30},{-30,30},{-30,40}}, color={0,0,255})); - connect(P2, periods2.y) annotation (Line(points={{110,-10},{50,-10},{50,0},{ - -10,0}}, color={0,0,255})); - connect(periods3.y, P3) annotation (Line(points={{10,-40},{58,-40},{58,-50},{ - 110,-50}}, color={0,0,255})); - connect(periods4.y, P4) annotation (Line(points={{30,-80},{68,-80},{68,-90},{ - 110,-90}}, color={0,0,255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end PeriodConstructors; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/PeriodConstructors_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/PeriodConstructors_externals.mo deleted file mode 100644 index 9c5dcce..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/PeriodConstructors_externals.mo +++ /dev/null @@ -1,34 +0,0 @@ -within CRML_test.Spec_doc.PeriodConstructors; -model PeriodConstructors_externals - CRML.Blocks.Events.EventPeriodic eventPeriodic1(period=20, startTime=2) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Utilities.Boolean4Connector e1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{16,46},{24,54}}))); - CRML.Blocks.Events.EventPeriodic eventPeriodic2(period=20, startTime=3.5) - annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{16,-4},{24,4}}))); - Utilities.Boolean4Connector e2 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.Blocks.Events.ShowEvent showEvent_e1 - annotation (Placement(transformation(extent={{-8,16},{0,24}}))); - CRML.Blocks.Events.ShowEvent showEvent_e2 - annotation (Placement(transformation(extent={{-8,-44},{0,-36}}))); -equation - connect(eventPeriodic1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{15.6,50}}, color={217,67,180})); - connect(booleanToBoolean4_1.y, e1) - annotation (Line(points={{24.4,50},{110,50}}, color={162,29,33})); - connect(eventPeriodic2.y, booleanToBoolean4_2.u) - annotation (Line(points={{-39,0},{15.6,0}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, e2) - annotation (Line(points={{24.4,0},{110,0}}, color={162,29,33})); - connect(showEvent_e1.u, eventPeriodic1.y) annotation (Line(points={{-8.4,20}, - {-24,20},{-24,50},{-39,50}}, color={217,67,180})); - connect(eventPeriodic2.y, showEvent_e2.u) annotation (Line(points={{-39,0},{ - -24,0},{-24,-40},{-8.4,-40}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end PeriodConstructors_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/PeriodConstructors_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/PeriodConstructors_verif.mo deleted file mode 100644 index acfe396..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/PeriodConstructors_verif.mo +++ /dev/null @@ -1,91 +0,0 @@ -within CRML_test.Spec_doc.PeriodConstructors; -model PeriodConstructors_verif - extends PeriodConstructors; - PeriodConstructors_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - CRML.TimeLocators.Attributes.PeriodsStart periodsStart_P1 - annotation (Placement(transformation(extent={{144,20},{152,28}}))); - CRML.TimeLocators.Attributes.PeriodsEnd periodsEnd_P1 - annotation (Placement(transformation(extent={{144,2},{152,10}}))); - CRML.Blocks.Events.ShowEvent showEvent_P1_start - annotation (Placement(transformation(extent={{170,20},{178,28}}))); - CRML.Blocks.Events.ShowEvent showEvent_P1_end - annotation (Placement(transformation(extent={{170,2},{178,10}}))); - CRML.TimeLocators.Attributes.PeriodsStart periodsStart_P2 - annotation (Placement(transformation(extent={{144,-22},{152,-14}}))); - CRML.Blocks.Events.ShowEvent showEvent_P2_start - annotation (Placement(transformation(extent={{170,-22},{178,-14}}))); - CRML.TimeLocators.Attributes.PeriodsEnd periodsEnd_P2 - annotation (Placement(transformation(extent={{144,-40},{152,-32}}))); - CRML.Blocks.Events.ShowEvent showEvent_P2_end - annotation (Placement(transformation(extent={{170,-40},{178,-32}}))); - CRML.TimeLocators.Attributes.PeriodsStart periodsStart_P3 - annotation (Placement(transformation(extent={{144,-60},{152,-52}}))); - CRML.Blocks.Events.ShowEvent showEvent_P3_start - annotation (Placement(transformation(extent={{170,-60},{178,-52}}))); - CRML.TimeLocators.Attributes.PeriodsEnd periodsEnd_P3 - annotation (Placement(transformation(extent={{144,-78},{152,-70}}))); - CRML.Blocks.Events.ShowEvent showEvent_P3_end - annotation (Placement(transformation(extent={{170,-78},{178,-70}}))); - CRML.TimeLocators.Attributes.PeriodsStart periodsStart_P4 - annotation (Placement(transformation(extent={{144,-100},{152,-92}}))); - CRML.Blocks.Events.ShowEvent showEvent_P4_start - annotation (Placement(transformation(extent={{170,-100},{178,-92}}))); - CRML.TimeLocators.Attributes.PeriodsEnd periodsEnd_P4 - annotation (Placement(transformation(extent={{144,-118},{152,-110}}))); - CRML.Blocks.Events.ShowEvent showEvent_P4_end - annotation (Placement(transformation(extent={{170,-118},{178,-110}}))); -equation - // Bindings - e1 = externals.e1; - e2 = externals.e2; - connect(periodsStart_P1.y, showEvent_P1_start.u) - annotation (Line(points={{152.4,24},{169.6,24}}, color={217,67,180})); - connect(periodsEnd_P1.y, showEvent_P1_end.u) - annotation (Line(points={{152.4,6},{169.6,6}}, color={217,67,180})); - connect(P1, periodsStart_P1.tl) annotation (Line(points={{110,30},{130,30},{ - 130,28},{148,28}}, color={0,0,255})); - connect(P1, periodsEnd_P1.tl) annotation (Line(points={{110,30},{129,30},{129, - 10},{148,10}}, color={0,0,255})); - connect(periodsStart_P2.y, showEvent_P2_start.u) annotation (Line(points={{ - 152.4,-18},{162.2,-18},{162.2,-18},{169.6,-18}}, color={217,67,180})); - connect(periodsEnd_P2.y, showEvent_P2_end.u) - annotation (Line(points={{152.4,-36},{169.6,-36}}, color={217,67,180})); - connect(P2, periodsStart_P2.tl) annotation (Line(points={{110,-10},{130,-10}, - {130,-14},{148,-14}}, color={0,0,255})); - connect(P2, periodsEnd_P2.tl) annotation (Line(points={{110,-10},{130,-10},{ - 130,-32},{148,-32}}, color={0,0,255})); - connect(periodsStart_P3.y, showEvent_P3_start.u) - annotation (Line(points={{152.4,-56},{169.6,-56}}, color={217,67,180})); - connect(periodsEnd_P3.y, showEvent_P3_end.u) - annotation (Line(points={{152.4,-74},{169.6,-74}}, color={217,67,180})); - connect(periodsStart_P4.y, showEvent_P4_start.u) - annotation (Line(points={{152.4,-96},{169.6,-96}}, color={217,67,180})); - connect(periodsEnd_P4.y, showEvent_P4_end.u) - annotation (Line(points={{152.4,-114},{169.6,-114}}, color={217,67,180})); - connect(P3, periodsStart_P3.tl) annotation (Line(points={{110,-50},{130,-50}, - {130,-52},{148,-52}}, color={0,0,255})); - connect(P3, periodsEnd_P3.tl) annotation (Line(points={{110,-50},{130,-50},{ - 130,-70},{148,-70}}, color={0,0,255})); - connect(P4, periodsStart_P4.tl) annotation (Line(points={{110,-90},{130,-90}, - {130,-92},{148,-92}}, color={0,0,255})); - connect(P4, periodsEnd_P4.tl) annotation (Line(points={{110,-90},{130,-90},{ - 130,-110},{148,-110}}, color={0,0,255})); - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{160,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{160,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end PeriodConstructors_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/package.mo deleted file mode 100644 index 2dc3084..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package PeriodConstructors -end PeriodConstructors; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/package.order deleted file mode 100644 index 975ff41..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodConstructors/package.order +++ /dev/null @@ -1,3 +0,0 @@ -PeriodConstructors -PeriodConstructors_externals -PeriodConstructors_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/PeriodOpeningEvent.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/PeriodOpeningEvent.mo deleted file mode 100644 index 52b7266..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/PeriodOpeningEvent.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.Spec_doc.PeriodOpeningEvent; -partial model PeriodOpeningEvent - CRML.ETL.Connectors.TimeLocatorOutput[N] P - annotation (Placement(transformation(extent={{-120,10},{-100,-10}}))); -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; -public - Utilities.BooleanConnector e - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.TimeLocators.Attributes.PeriodsStart periodsStart - annotation (Placement(transformation(extent={{-6,-4},{2,4}}))); -equation - - connect(P, periodsStart.tl) annotation (Line(points={{-110,0},{-56,0},{-56,4}, - {-2,4}}, color={0,0,255})); - connect(periodsStart.y, e) - annotation (Line(points={{2.4,0},{110,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end PeriodOpeningEvent; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/PeriodOpeningEvent_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/PeriodOpeningEvent_externals.mo deleted file mode 100644 index 278f458..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/PeriodOpeningEvent_externals.mo +++ /dev/null @@ -1,39 +0,0 @@ -within CRML_test.Spec_doc.PeriodOpeningEvent; -model PeriodOpeningEvent_externals - CRML.Blocks.Events.EventPeriodic eventPeriodic1(period=20, startTime=2) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.ETL.Connectors.TimeLocatorOutput[N] P - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - CRML.Blocks.Events.EventPeriodic eventPeriodic2(period=20, startTime=3.5) - annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - CRML.Blocks.Events.ShowEvent showEvent_e1 - annotation (Placement(transformation(extent={{-8,16},{0,24}}))); - CRML.Blocks.Events.ShowEvent showEvent_e2 - annotation (Placement(transformation(extent={{-8,-44},{0,-36}}))); - CRML.ETL.TimeLocators.Periods periods - annotation (Placement(transformation(extent={{40,20},{60,40}}))); -protected - parameter Integer N=CRML.ETL.Types.nMaxOverlap; -public - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{10,46},{18,54}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{10,-4},{18,4}}))); -equation - connect(showEvent_e1.u, eventPeriodic1.y) annotation (Line(points={{-8.4,20},{ - -24,20},{-24,50},{-39,50}}, color={217,67,180})); - connect(eventPeriodic2.y, showEvent_e2.u) annotation (Line(points={{-39,0},{-24, - 0},{-24,-40},{-8.4,-40}}, color={217,67,180})); - connect(P, periods.y) - annotation (Line(points={{110,0},{50,0},{50,20}}, color={0,0,255})); - connect(eventPeriodic1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{9.6,50}}, color={217,67,180})); - connect(eventPeriodic2.y, booleanToBoolean4_2.u) - annotation (Line(points={{-39,0},{9.6,0}}, color={217,67,180})); - connect(booleanToBoolean4_2.y, periods.u2) annotation (Line(points={{18.4,0}, - {28,0},{28,22},{39,22}}, color={162,29,33})); - connect(booleanToBoolean4_1.y, periods.u1) annotation (Line(points={{18.4,50}, - {30,50},{30,30},{39,30}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end PeriodOpeningEvent_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/PeriodOpeningEvent_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/PeriodOpeningEvent_verif.mo deleted file mode 100644 index 3129075..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/PeriodOpeningEvent_verif.mo +++ /dev/null @@ -1,30 +0,0 @@ -within CRML_test.Spec_doc.PeriodOpeningEvent; -model PeriodOpeningEvent_verif - extends PeriodOpeningEvent; - PeriodOpeningEvent_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - CRML.Blocks.Events.ShowEvent showEvent_e - annotation (Placement(transformation(extent={{140,-4},{148,4}}))); -equation - // Bindings - P =externals.P; - connect(showEvent_e.u, e) annotation (Line(points={{139.6,0},{126,0},{126,0}, - {110,0}}, color={217,67,180})); - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{160,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{160,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end PeriodOpeningEvent_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/package.mo deleted file mode 100644 index 81c27f3..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package PeriodOpeningEvent -end PeriodOpeningEvent; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/package.order deleted file mode 100644 index 68613f8..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/PeriodOpeningEvent/package.order +++ /dev/null @@ -1,3 +0,0 @@ -PeriodOpeningEvent -PeriodOpeningEvent_externals -PeriodOpeningEvent_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/TemplateExample1.mo b/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/TemplateExample1.mo deleted file mode 100644 index 2beaac1..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/TemplateExample1.mo +++ /dev/null @@ -1,13 +0,0 @@ -within CRML_test.Spec_doc.TemplateExample1; -partial model TemplateExample1 - Utilities.Boolean4Connector b1 - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.Boolean4Connector b2 - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - Utilities.Boolean4Connector b1_or_b2 - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); -equation - b1_or_b2 = CRML.Blocks.Logical4.or4(b1, b2); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end TemplateExample1; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/TemplateExample1_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/TemplateExample1_externals.mo deleted file mode 100644 index 285d337..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/TemplateExample1_externals.mo +++ /dev/null @@ -1,18 +0,0 @@ -within CRML_test.Spec_doc.TemplateExample1; -model TemplateExample1_externals - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant1(K=CRML.ETL.Types.Boolean4.true4) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant2(K=CRML.ETL.Types.Boolean4.undecided) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.Boolean4Output b1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.Boolean4Output b2 - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); -equation - connect(boolean4Constant1.y, b1) - annotation (Line(points={{-39,50},{110,50}}, color={162,29,33})); - connect(boolean4Constant2.y, b2) - annotation (Line(points={{-39,-50},{110,-50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end TemplateExample1_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/TemplateExample1_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/TemplateExample1_verif.mo deleted file mode 100644 index ed6d122..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/TemplateExample1_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.Spec_doc.TemplateExample1; -model TemplateExample1_verif - extends TemplateExample1; - TemplateExample1_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - b1 = externals.b1; - b2 = externals.b2; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end TemplateExample1_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/package.mo deleted file mode 100644 index 65ae357..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package TemplateExample1 -end TemplateExample1; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/package.order deleted file mode 100644 index ec476a0..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1/package.order +++ /dev/null @@ -1,3 +0,0 @@ -TemplateExample1 -TemplateExample1_externals -TemplateExample1_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1_no_ext/TemplateExample1_no_ext.mo b/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1_no_ext/TemplateExample1_no_ext.mo deleted file mode 100644 index 13d82f8..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1_no_ext/TemplateExample1_no_ext.mo +++ /dev/null @@ -1,47 +0,0 @@ -within CRML_test.Spec_doc.TemplateExample1_no_ext; -model TemplateExample1_no_ext - import CRML.ETL.Types.Boolean4; - CRML.ETL.Types.Boolean4 b_true = Boolean4.true4; - CRML.ETL.Types.Boolean4 b_false = Boolean4.false4; - CRML.ETL.Types.Boolean4 b_undecided = Boolean4.undecided; - CRML.ETL.Types.Boolean4 b_undefined = Boolean4.undefined; - CRML.ETL.Types.Boolean4 b_true_or_true; - CRML.ETL.Types.Boolean4 b_true_or_false; - CRML.ETL.Types.Boolean4 b_true_or_undecided; - CRML.ETL.Types.Boolean4 b_true_or_undefined; - CRML.ETL.Types.Boolean4 b_false_or_true; - CRML.ETL.Types.Boolean4 b_false_or_false; - CRML.ETL.Types.Boolean4 b_false_or_undecided; - CRML.ETL.Types.Boolean4 b_false_or_undefined; - CRML.ETL.Types.Boolean4 b_undecided_or_true; - CRML.ETL.Types.Boolean4 b_undecided_or_false; - CRML.ETL.Types.Boolean4 b_undecided_or_undecided; - CRML.ETL.Types.Boolean4 b_undecided_or_undefined; - CRML.ETL.Types.Boolean4 b_undefined_or_true; - CRML.ETL.Types.Boolean4 b_undefined_or_false; - CRML.ETL.Types.Boolean4 b_undefined_or_undecided; - CRML.ETL.Types.Boolean4 b_undefined_or_undefined; -equation - b_true_or_true = CRML.Blocks.Logical4.or4(b_true, b_true); - b_true_or_false = CRML.Blocks.Logical4.or4(b_true, b_false); - b_true_or_undecided = CRML.Blocks.Logical4.or4(b_true, b_undecided); - b_true_or_undefined = CRML.Blocks.Logical4.or4(b_true, b_undefined); - - b_false_or_true = CRML.Blocks.Logical4.or4(b_false, b_true); - b_false_or_false = CRML.Blocks.Logical4.or4(b_false, b_false); - b_false_or_undecided = CRML.Blocks.Logical4.or4(b_false, b_undecided); - b_false_or_undefined = CRML.Blocks.Logical4.or4(b_false, b_undefined); - - b_undecided_or_true = CRML.Blocks.Logical4.or4(b_undecided, b_true); - b_undecided_or_false = CRML.Blocks.Logical4.or4(b_undecided, b_false); - b_undecided_or_undecided = CRML.Blocks.Logical4.or4(b_undecided, b_undecided); - b_undecided_or_undefined = CRML.Blocks.Logical4.or4(b_undecided, b_undefined); - - b_undefined_or_true = CRML.Blocks.Logical4.or4(b_undefined, b_true); - b_undefined_or_false = CRML.Blocks.Logical4.or4(b_undefined, b_false); - b_undefined_or_undecided = CRML.Blocks.Logical4.or4(b_undefined, b_undecided); - b_undefined_or_undefined = CRML.Blocks.Logical4.or4(b_undefined, b_undefined); - - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end TemplateExample1_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1_no_ext/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1_no_ext/package.mo deleted file mode 100644 index 5a374a0..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1_no_ext/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package TemplateExample1_no_ext -end TemplateExample1_no_ext; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1_no_ext/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1_no_ext/package.order deleted file mode 100644 index 607fab2..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/TemplateExample1_no_ext/package.order +++ /dev/null @@ -1 +0,0 @@ -TemplateExample1_no_ext diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/package.mo deleted file mode 100644 index e520434..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/package.mo +++ /dev/null @@ -1,19 +0,0 @@ -within CRML_test; -package Spec_doc -annotation (Icon(graphics={ - Rectangle( - lineColor={200,200,200}, - fillColor={248,248,248}, - fillPattern=FillPattern.HorizontalCylinder, - extent={{-100,-100},{100,100}}, - radius=25.0), Text( - extent={{-42,38},{44,-30}}, - lineColor={0,0,0}, - fontName="Symbol", - textString=""), - Rectangle( - lineColor={128,128,128}, - fillPattern=FillPattern.None, - extent={{-100,-100},{100,100}}, - radius=25.0)})); -end Spec_doc; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/package.order deleted file mode 100644 index 42621b0..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/package.order +++ /dev/null @@ -1,21 +0,0 @@ -BooleanAccumulation -BooleanAccumulation_no_ext -BooleanConjunction -BooleanConjunction_no_ext -BooleanNegation -BooleanNegation_no_ext -ClockConstructors -ClockConstructors_no_ext -ClockCurrentTick -ClockCurrentTick_no_ext -EventConstructors -OperatorExample2 -PeriodClosingEvent -PeriodConstructors -PeriodOpeningEvent -TemplateExample1 -TemplateExample1_no_ext -wip_BooleanAtEvent -wip_BooleanIntegration -wip_ClockFilter -wip_ClockRank diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanAtEvent.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanAtEvent.mo deleted file mode 100644 index 3a1ef96..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanAtEvent.mo +++ /dev/null @@ -1,96 +0,0 @@ -within CRML_test.Spec_doc; -package wip_BooleanAtEvent - partial model BooleanAtEvent - Utilities.BooleanConnector b1 - annotation (Placement(transformation(extent={{-10,10},{10,-10}}, - rotation=-90, - origin={-110,30}))); - Utilities.ClockConnector c - annotation (Placement(transformation(extent={{-120,-20},{-100,-40}}))); - Utilities.BooleanConnector b_at_event - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Logical.BooleanClockedDelay booleanClockedDelay - annotation (Placement(transformation(extent={{-8,-10},{12,10}}))); - CRML.Blocks.Events.ClockToBoolean clockToBoolean - annotation (Placement(transformation(extent={{-80,-34},{-72,-26}}))); - CRML.Blocks.MathInteger.IntegerConstant integerConstant(K=0) - annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - equation - connect(c, clockToBoolean.u) annotation (Line(points={{-110,-30},{-80.8,-30},{ - -80.8,-30}}, color={0,0,0})); - connect(booleanClockedDelay.u, b1) annotation (Line(points={{-9,0},{-60,0}, - {-60,30},{-110,30}}, color={217,67,180})); - connect(booleanClockedDelay.clock, clockToBoolean.y) annotation (Line( - points={{-9,8},{-40,8},{-40,-30},{-71.2,-30}}, color={217,67,180})); - connect(booleanClockedDelay.delay, integerConstant.y) annotation (Line( - points={{-9,-8},{-20,-8},{-20,-60},{-39,-60}}, color={255,127,0})); - connect(booleanClockedDelay.y, b_at_event) - annotation (Line(points={{13,0},{110,0}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); - end BooleanAtEvent; - - model BooleanAtEvent_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1( - startTime=2, - period=1.5, - width=1) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.Blocks.Logical.BooleanPulse boolean4Constant2(period=1.5, startTime= - 1) - annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - CRML.ETL.Connectors.BooleanOutput b1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.ETL.Connectors.ClockOutput c - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{0,-70},{40,-30}}))); - CRML.Blocks.Events.ShowEvent showEvent_b - annotation (Placement(transformation(extent={{-16,-78},{-8,-70}}))); - CRML.Blocks.Events.ShowEvent showEvent_b1 - annotation (Placement(transformation(extent={{-18,26},{-10,34}}))); - equation - connect(boolean4Constant2.y, clockEvent.u) - annotation (Line(points={{-39,-50},{-2,-50}}, color={217,67,180})); - connect(clockEvent.y, c) annotation (Line( - points={{42,-50},{74,-50},{74,-50},{110,-50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(showEvent_b.u, clockEvent.u) annotation (Line(points={{-16.4,-74},{ - -20,-74},{-20,-50},{-2,-50}}, color={217,67,180})); - connect(boolean4Constant1.y, b1) - annotation (Line(points={{-39,50},{110,50}}, color={217,67,180})); - connect(showEvent_b1.u, b1) annotation (Line(points={{-18.4,30},{-20,30},{-20, - 50},{110,50}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); - end BooleanAtEvent_externals; - - model BooleanAtEvent_verif - extends BooleanAtEvent; - BooleanAtEvent_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); - equation - // Bindings - b1 = externals.b1; - c =externals.c; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); - end BooleanAtEvent_verif; -end wip_BooleanAtEvent; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/BooleanIntegration.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/BooleanIntegration.mo deleted file mode 100644 index 3cc4da1..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/BooleanIntegration.mo +++ /dev/null @@ -1,28 +0,0 @@ -within CRML_test.Spec_doc.wip_BooleanIntegration; -partial model BooleanIntegration - Utilities.Boolean4Connector a - annotation (Placement(transformation(extent={{-120,40},{-100,20}}))); - Utilities.Boolean4Connector b_integration - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - Utilities.TimeLocatorConnector P - annotation (Placement(transformation(extent={{-10,120},{10,100}}))); -// protected -// parameter Integer N=CRML.ETL.Types.nMaxOverlap; -public - CRML.ETL.Evaluator.Integrate boolean4Integrator - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - CRML.Blocks.Logical4.Boolean4Constant boolean4Constant(K=CRML.ETL.Types.Boolean4.true4) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); -equation - b_integration = CRML.Blocks.Logical4.not4(a); - connect(boolean4Integrator.u, a) annotation (Line(points={{-11,0},{-60,0},{-60, - 30},{-110,30}}, color={162,29,33})); - connect(P, boolean4Integrator.tl) - annotation (Line(points={{0,110},{0,10}}, color={0,0,255})); - connect(boolean4Integrator.y, b_integration) annotation (Line(points={{11,0}, - {64,0},{64,0},{110,0}}, color={162,29,33})); - connect(boolean4Integrator.a, boolean4Constant.y) annotation (Line(points={{ - -11,8},{-26,8},{-26,50},{-39,50}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanIntegration; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/BooleanIntegration_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/BooleanIntegration_externals.mo deleted file mode 100644 index 3b51af3..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/BooleanIntegration_externals.mo +++ /dev/null @@ -1,66 +0,0 @@ -within CRML_test.Spec_doc.wip_BooleanIntegration; -model BooleanIntegration_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1 - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Utilities.Boolean4Connector a - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_1 - annotation (Placement(transformation(extent={{12,46},{20,54}}))); - Utilities.TimeLocatorConnector P - annotation (Placement(transformation(extent={{100,-60},{120,-40}}))); - CRML.Blocks.Events.EventPeriodic eventPeriodic1(period=20, startTime=2) - annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - CRML.Blocks.Events.EventPeriodic eventPeriodic2(period=20, startTime=3.5) - annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - CRML.Blocks.Events.ShowEvent showEvent_e1 - annotation (Placement(transformation(extent={{-8,-24},{0,-16}}))); - CRML.Blocks.Events.ShowEvent showEvent_e2 - annotation (Placement(transformation(extent={{-8,-84},{0,-76}}))); - CRML.ETL.TimeLocators.Periods periods - annotation (Placement(transformation(extent={{40,-20},{60,0}}))); -public - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_2 - annotation (Placement(transformation(extent={{10,6},{18,14}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 booleanToBoolean4_3 - annotation (Placement(transformation(extent={{10,-44},{18,-36}}))); - inner CRML.TimeLocators.Continuous.Master master - annotation (Placement(transformation(extent={{40,70},{60,90}}))); - CRML.Blocks.Logical.BooleanPulse booleanPulse( - width=6, - period=20, - startTime=2) - annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - CRML.Blocks.Logical4.BooleanToBoolean4 - booleanToBoolean4_7 - annotation (Placement(transformation(extent={{12,76},{20,84}}))); -equation - connect(boolean4Constant1.y, booleanToBoolean4_1.u) - annotation (Line(points={{-39,50},{11.6,50}}, color={217,67,180})); - connect(a, booleanToBoolean4_1.y) - annotation (Line(points={{110,50},{20.4,50}}, color={162,29,33})); - connect(showEvent_e1.u,eventPeriodic1. y) annotation (Line(points={{-8.4,-20}, - {-24,-20},{-24,10},{-39,10}}, - color={217,67,180})); - connect(eventPeriodic2.y,showEvent_e2. u) annotation (Line(points={{-39,-40}, - {-24,-40},{-24,-80},{-8.4,-80}}, - color={217,67,180})); - connect(eventPeriodic1.y,booleanToBoolean4_2. u) - annotation (Line(points={{-39,10},{9.6,10}}, color={217,67,180})); - connect(eventPeriodic2.y,booleanToBoolean4_3. u) - annotation (Line(points={{-39,-40},{9.6,-40}}, - color={217,67,180})); - connect(booleanToBoolean4_3.y,periods. u2) annotation (Line(points={{18.4,-40}, - {28,-40},{28,-18},{39,-18}}, - color={162,29,33})); - connect(booleanToBoolean4_2.y,periods. u1) annotation (Line(points={{18.4,10}, - {30,10},{30,-10},{39,-10}}, - color={162,29,33})); - connect(P, periods.y[1]) - annotation (Line(points={{110,-50},{50,-50},{50,-20}}, color={0,0,255})); - connect(booleanPulse.y, booleanToBoolean4_7.u) - annotation (Line(points={{1,80},{11.6,80}}, color={217,67,180})); - connect(master.u, booleanToBoolean4_7.y) - annotation (Line(points={{39,80},{20.4,80}}, color={162,29,33})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end BooleanIntegration_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/BooleanIntegration_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/BooleanIntegration_verif.mo deleted file mode 100644 index c73386a..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/BooleanIntegration_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.Spec_doc.wip_BooleanIntegration; -model BooleanIntegration_verif - extends BooleanIntegration; - BooleanIntegration_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings -// a =externals.a; - P =externals.P; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end BooleanIntegration_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/package.mo deleted file mode 100644 index a3cf849..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package wip_BooleanIntegration -end wip_BooleanIntegration; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/package.order deleted file mode 100644 index d0f42be..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_BooleanIntegration/package.order +++ /dev/null @@ -1,3 +0,0 @@ -BooleanIntegration -BooleanIntegration_externals -BooleanIntegration_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/ClockFilter.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/ClockFilter.mo deleted file mode 100644 index 0413f68..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/ClockFilter.mo +++ /dev/null @@ -1,32 +0,0 @@ -within CRML_test.Spec_doc.wip_ClockFilter; -partial model ClockFilter - Utilities.ClockConnector c1 - annotation (Placement(transformation(extent={{-120,60},{-100,40}}))); - Utilities.BooleanConnector c_filter - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.ClockToBoolean clockToBoolean_c1 - annotation (Placement(transformation(extent={{-2,46},{6,54}}))); - CRML.Blocks.Events.EventFilter eventFilter - annotation (Placement(transformation(extent={{50,-10},{70,10}}))); - Utilities.ClockConnector c2 - annotation (Placement(transformation(extent={{-120,-40},{-100,-60}}))); - CRML.Blocks.Events.ClockToBoolean clockToBoolean_c2 - annotation (Placement(transformation(extent={{-4,-54},{4,-46}}))); -equation - - connect(clockToBoolean_c1.u, c1) annotation (Line( - points={{-2.8,50},{-110,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(c2, clockToBoolean_c2.u) - annotation (Line(points={{-110,-50},{-4.8,-50}}, color={0,0,0})); - connect(eventFilter.y, c_filter) annotation (Line(points={{71,0},{90,0},{90,0}, - {110,0}}, color={217,67,180})); - connect(clockToBoolean_c1.y, eventFilter.u) annotation (Line(points={{6.8,50}, - {28,50},{28,0},{49,0}}, color={217,67,180})); - connect(clockToBoolean_c2.y, eventFilter.cond) annotation (Line(points={{4.8, - -50},{26,-50},{26,8},{49,8}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockFilter; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/ClockFilter_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/ClockFilter_externals.mo deleted file mode 100644 index c9aa865..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/ClockFilter_externals.mo +++ /dev/null @@ -1,34 +0,0 @@ -within CRML_test.Spec_doc.wip_ClockFilter; -model ClockFilter_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1(period=20, startTime= - 2) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.ETL.Connectors.ClockOutput c1 - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{24,44},{36,56}}))); - CRML.Blocks.Logical.BooleanPulse boolean4Constant2( startTime= - 2, period=40) - annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - CRML.Blocks.Events.ClockEvent clockEvent1 - annotation (Placement(transformation(extent={{24,-6},{36,6}}))); - CRML.ETL.Connectors.ClockOutput c2 - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); -equation - connect(boolean4Constant1.y, clockEvent.u) - annotation (Line(points={{-39,50},{23.4,50}}, color={217,67,180})); - connect(c1, clockEvent.y) annotation (Line( - points={{110,50},{36.6,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(clockEvent1.u, boolean4Constant2.y) - annotation (Line(points={{23.4,0},{-39,0}}, color={217,67,180})); - connect(c2, clockEvent1.y) annotation (Line( - points={{110,0},{36.6,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockFilter_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/ClockFilter_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/ClockFilter_verif.mo deleted file mode 100644 index 6841ad1..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/ClockFilter_verif.mo +++ /dev/null @@ -1,27 +0,0 @@ -within CRML_test.Spec_doc.wip_ClockFilter; -model ClockFilter_verif - extends ClockFilter; - ClockFilter_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - c1 =externals.c1; - c2 =externals.c2; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end ClockFilter_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/package.mo deleted file mode 100644 index 7af6078..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package wip_ClockFilter -end wip_ClockFilter; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/package.order deleted file mode 100644 index eb6e7e3..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockFilter/package.order +++ /dev/null @@ -1,3 +0,0 @@ -ClockFilter -ClockFilter_externals -ClockFilter_verif diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/ClockRank.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/ClockRank.mo deleted file mode 100644 index e28f220..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/ClockRank.mo +++ /dev/null @@ -1,28 +0,0 @@ -within CRML_test.Spec_doc.wip_ClockRank; -partial model ClockRank - Utilities.ClockConnector c1 - annotation (Placement(transformation(extent={{-120,10},{-100,-10}}))); - Utilities.IntegerConnector r - annotation (Placement(transformation(extent={{100,10},{120,-10}}))); - CRML.Blocks.Events.ClockToBoolean clockToBoolean - annotation (Placement(transformation(extent={{-54,-4},{-46,4}}))); - CRML.Blocks.Events.EventCounter eventCounter - annotation (Placement(transformation(extent={{20,-10},{40,10}}))); - CRML.Blocks.Logical.BooleanConstant booleanConstant(K=false) - annotation (Placement(transformation(extent={{-20,-40},{0,-20}}))); -equation - - connect(eventCounter.y, r) annotation (Line(points={{41,0},{74,0},{74,0},{110, - 0}}, color={255,127,0})); - connect(clockToBoolean.y, eventCounter.u) - annotation (Line(points={{-45.2,0},{19,0}}, color={217,67,180})); - connect(clockToBoolean.u, c1) annotation (Line( - points={{-54.8,0},{-110,0}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - connect(booleanConstant.y, eventCounter.reset) - annotation (Line(points={{1,-30},{30,-30},{30,-11}}, color={217,67,180})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockRank; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/ClockRank_externals.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/ClockRank_externals.mo deleted file mode 100644 index 4f94ede..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/ClockRank_externals.mo +++ /dev/null @@ -1,20 +0,0 @@ -within CRML_test.Spec_doc.wip_ClockRank; -model ClockRank_externals - CRML.Blocks.Logical.BooleanPulse boolean4Constant1(period=20, startTime= - 2) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - CRML.ETL.Connectors.ClockOutput c - annotation (Placement(transformation(extent={{100,40},{120,60}}))); - CRML.Blocks.Events.ClockEvent clockEvent - annotation (Placement(transformation(extent={{24,44},{36,56}}))); -equation - connect(boolean4Constant1.y, clockEvent.u) - annotation (Line(points={{-39,50},{23.4,50}}, color={217,67,180})); - connect(c, clockEvent.y) annotation (Line( - points={{110,50},{36.6,50}}, - color={175,175,175}, - pattern=LinePattern.Dot, - thickness=0.5)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end ClockRank_externals; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/ClockRank_verif.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/ClockRank_verif.mo deleted file mode 100644 index f0c6b3d..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/ClockRank_verif.mo +++ /dev/null @@ -1,26 +0,0 @@ -within CRML_test.Spec_doc.wip_ClockRank; -model ClockRank_verif - extends ClockRank; - ClockRank_externals externals - annotation (Placement(transformation(extent={{-200,0},{-140,60}}))); -equation - // Bindings - c1 = externals.c; - annotation (Placement(transformation(extent={{0,-20},{60,40}})), - Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1), graphics={ - Ellipse(lineColor = {75,138,73}, - fillColor={255,255,255}, - fillPattern = FillPattern.Solid, - extent = {{-100,-100},{100,100}}), - Polygon(lineColor = {0,0,255}, - fillColor = {75,138,73}, - pattern = LinePattern.None, - fillPattern = FillPattern.Solid, - points = {{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram( - coordinateSystem(preserveAspectRatio=false, - extent={{-200,-100},{100,100}}, - initialScale=0.1)), - experiment(StopTime=14)); -end ClockRank_verif; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/package.mo b/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/package.mo deleted file mode 100644 index 48cef2e..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within CRML_test.Spec_doc; -package wip_ClockRank -end wip_ClockRank; diff --git a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/package.order b/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/package.order deleted file mode 100644 index 1647ac1..0000000 --- a/resources/modelica_libraries/CRML_test/Spec_doc/wip_ClockRank/package.order +++ /dev/null @@ -1,3 +0,0 @@ -ClockRank -ClockRank_externals -ClockRank_verif diff --git a/resources/modelica_libraries/CRML_test/Utilities/Boolean4Connector.mo b/resources/modelica_libraries/CRML_test/Utilities/Boolean4Connector.mo deleted file mode 100644 index 1f71c74..0000000 --- a/resources/modelica_libraries/CRML_test/Utilities/Boolean4Connector.mo +++ /dev/null @@ -1,15 +0,0 @@ -within CRML_test.Utilities; -connector Boolean4Connector = - CRML.ETL.Types.Boolean4 - "'Boolean4' as acausal connector" annotation ( - Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, - 100}}), graphics={Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={162,29,33}, - fillPattern=FillPattern.Forward)}), Diagram(graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={162,29,33}, - fillPattern=FillPattern.Forward)})); diff --git a/resources/modelica_libraries/CRML_test/Utilities/BooleanConnector.mo b/resources/modelica_libraries/CRML_test/Utilities/BooleanConnector.mo deleted file mode 100644 index 223764e..0000000 --- a/resources/modelica_libraries/CRML_test/Utilities/BooleanConnector.mo +++ /dev/null @@ -1,14 +0,0 @@ -within CRML_test.Utilities; -connector BooleanConnector=Boolean - "'Boolean' as acausal connector" annotation ( - Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, - 100}}), graphics={Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={217,67,180}, - fillPattern=FillPattern.Forward)}), Diagram(graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={217,67,180}, - fillPattern=FillPattern.Forward)})); diff --git a/resources/modelica_libraries/CRML_test/Utilities/ClockConnector.mo b/resources/modelica_libraries/CRML_test/Utilities/ClockConnector.mo deleted file mode 100644 index 3f7e0b7..0000000 --- a/resources/modelica_libraries/CRML_test/Utilities/ClockConnector.mo +++ /dev/null @@ -1,14 +0,0 @@ -within CRML_test.Utilities; -connector ClockConnector = Clock - "'Clock' as acausal connector" annotation ( - Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, - 100}}), graphics={Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={0,140,72}, - fillPattern=FillPattern.Forward)}), Diagram(graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={0,140,72}, - fillPattern=FillPattern.Forward)})); diff --git a/resources/modelica_libraries/CRML_test/Utilities/IntegerConnector.mo b/resources/modelica_libraries/CRML_test/Utilities/IntegerConnector.mo deleted file mode 100644 index 73765b8..0000000 --- a/resources/modelica_libraries/CRML_test/Utilities/IntegerConnector.mo +++ /dev/null @@ -1,14 +0,0 @@ -within CRML_test.Utilities; -connector IntegerConnector=Integer - "'Integer' as acausal connector" annotation ( - Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, - 100}}), graphics={Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={244,125,35}, - fillPattern=FillPattern.Forward)}), Diagram(graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={244,125,35}, - fillPattern=FillPattern.Forward)})); diff --git a/resources/modelica_libraries/CRML_test/Utilities/TimeLocatorConnector.mo b/resources/modelica_libraries/CRML_test/Utilities/TimeLocatorConnector.mo deleted file mode 100644 index ad41894..0000000 --- a/resources/modelica_libraries/CRML_test/Utilities/TimeLocatorConnector.mo +++ /dev/null @@ -1,15 +0,0 @@ -within CRML_test.Utilities; -connector TimeLocatorConnector = - CRML.ETL.Types.TimeLocator - "'Time locator' as acausal connector" annotation ( - Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, - 100}}), graphics={Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={28,108,200}, - fillPattern=FillPattern.Forward)}), Diagram(graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={28,108,200}, - fillPattern=FillPattern.Forward)})); diff --git a/resources/modelica_libraries/CRML_test/Utilities/package.mo b/resources/modelica_libraries/CRML_test/Utilities/package.mo deleted file mode 100644 index 94bd1aa..0000000 --- a/resources/modelica_libraries/CRML_test/Utilities/package.mo +++ /dev/null @@ -1,29 +0,0 @@ -within CRML_test; -package Utilities - -annotation (Icon(graphics={ - Rectangle( - lineColor={200,200,200}, - fillColor={248,248,248}, - fillPattern=FillPattern.HorizontalCylinder, - extent={{-100,-100},{100,100}}, - radius=25.0), - Rectangle( - lineColor={128,128,128}, - fillPattern=FillPattern.None, - extent={{-100,-100},{100,100}}, - radius=25.0), - Polygon( - origin={1.3835,-4.1418}, - rotation=45.0, - fillColor={64,64,64}, - pattern=LinePattern.None, - fillPattern=FillPattern.Solid, - points={{-15.0,93.333},{-15.0,68.333},{0.0,58.333},{15.0,68.333},{15.0,93.333},{20.0,93.333},{25.0,83.333},{25.0,58.333},{10.0,43.333},{10.0,-41.667},{25.0,-56.667},{25.0,-76.667},{10.0,-91.667},{0.0,-91.667},{0.0,-81.667},{5.0,-81.667},{15.0,-71.667},{15.0,-61.667},{5.0,-51.667},{-5.0,-51.667},{-15.0,-61.667},{-15.0,-71.667},{-5.0,-81.667},{0.0,-81.667},{0.0,-91.667},{-10.0,-91.667},{-25.0,-76.667},{-25.0,-56.667},{-10.0,-41.667},{-10.0,43.333},{-25.0,58.333},{-25.0,83.333},{-20.0,93.333}}), - Polygon( - origin={10.1018,5.218}, - rotation=-45.0, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid, - points={{-15.0,87.273},{15.0,87.273},{20.0,82.273},{20.0,27.273},{10.0,17.273},{10.0,7.273},{20.0,2.273},{20.0,-2.727},{5.0,-2.727},{5.0,-77.727},{10.0,-87.727},{5.0,-112.727},{-5.0,-112.727},{-10.0,-87.727},{-5.0,-77.727},{-5.0,-2.727},{-20.0,-2.727},{-20.0,2.273},{-10.0,7.273},{-10.0,17.273},{-20.0,27.273},{-20.0,82.273}})})); -end Utilities; diff --git a/resources/modelica_libraries/CRML_test/Utilities/package.order b/resources/modelica_libraries/CRML_test/Utilities/package.order deleted file mode 100644 index fab8880..0000000 --- a/resources/modelica_libraries/CRML_test/Utilities/package.order +++ /dev/null @@ -1,5 +0,0 @@ -Boolean4Connector -BooleanConnector -ClockConnector -IntegerConnector -TimeLocatorConnector diff --git a/resources/modelica_libraries/CRML_test/package.mo b/resources/modelica_libraries/CRML_test/package.mo deleted file mode 100644 index 31a6a9b..0000000 --- a/resources/modelica_libraries/CRML_test/package.mo +++ /dev/null @@ -1,18 +0,0 @@ -package CRML_test -annotation (Icon(graphics={ - Rectangle( - lineColor={200,200,200}, - fillColor={248,248,248}, - fillPattern=FillPattern.HorizontalCylinder, - extent={{-100,-100},{100,100}}, - radius=25.0), Text( - extent={{-42,38},{44,-30}}, - lineColor={0,0,0}, - fontName="Symbol", - textString=""), - Rectangle( - lineColor={128,128,128}, - fillPattern=FillPattern.None, - extent={{-100,-100},{100,100}}, - radius=25.0)}), uses(Modelica(version="4.0.0"))); -end CRML_test; diff --git a/resources/modelica_libraries/CRML_test/package.order b/resources/modelica_libraries/CRML_test/package.order deleted file mode 100644 index b3f309d..0000000 --- a/resources/modelica_libraries/CRML_test/package.order +++ /dev/null @@ -1,5 +0,0 @@ -ETL -FORML -Spec_doc -Utilities -Examples diff --git a/resources/modelica_libraries/README.md b/resources/modelica_libraries/README.md deleted file mode 100644 index 2ea6f9f..0000000 --- a/resources/modelica_libraries/README.md +++ /dev/null @@ -1,3 +0,0 @@ -The CRML library is developed by BOUSKELA Daniel and JARDIN Audrey at EDF and contains the ETL block definitions in Modelica. - -The CRMLtoModelica library contains the blocks needed by the Modelica models translated from CRML by the compiler. diff --git a/src/main/antlr/grammar/crml.g4 b/src/main/antlr/grammar/crml.g4 index 9c9958c..15114ab 100644 --- a/src/main/antlr/grammar/crml.g4 +++ b/src/main/antlr/grammar/crml.g4 @@ -84,7 +84,7 @@ integrate : 'integrate' exp 'on' exp; tick : 'tick' id; - exp : sub_exp | id | constant | constructor | sum |trim | proj | period_op + exp : sub_exp | id | constant | constructor | sum |trim | proj | period_op | iterator //| 'apply' cat=id 'on' '(' exp ')' | right=exp runary=right_op | lunary=builtin_op left=exp @@ -95,6 +95,8 @@ tick : 'tick' id; | 'element' | 'terminate' | when_exp | exp 'at' at=exp | integrate | tick |crml_component_reference | if_exp | set_def | 'evaluate' exp ; +iterator : name= ITERATOR; + if_exp : 'if' if_e=exp 'then' then_e=exp ('else' else_e=exp); constructor : 'new' type exp; @@ -129,6 +131,8 @@ string : STRING; IDENT : NONDIGIT ( DIGIT | NONDIGIT )* ; +ITERATOR : NONDIGIT ( DIGIT | NONDIGIT )* '.element'; + USER_KEYWORD : '\'' (NONDIGIT|SYMBOL) (NONDIGIT|' '|SYMBOL|DIGIT)* '\''; fragment CAPS : 'A' .. 'Z' ; diff --git a/src/main/java/crml/compiler/CRMLC.java b/src/main/java/crml/compiler/CRMLC.java index 95757d3..cfd3846 100644 --- a/src/main/java/crml/compiler/CRMLC.java +++ b/src/main/java/crml/compiler/CRMLC.java @@ -194,7 +194,7 @@ public static void parse_file ( System.out.println("File : " + out_file.toString() + " within : " + within); if(!within.isEmpty()) writer.write("within " + within + ";\n"); - writer.write(result.contents); + writer.write(result.toModelica()); writer.close(); logger.trace("Translated: " + file); logger.trace("Output Modelica file: " + out_file.getAbsolutePath()); diff --git a/src/main/java/crml/compiler/CompileSettings.java b/src/main/java/crml/compiler/CompileSettings.java index 325ca69..3838a8e 100644 --- a/src/main/java/crml/compiler/CompileSettings.java +++ b/src/main/java/crml/compiler/CompileSettings.java @@ -12,8 +12,8 @@ public class CompileSettings { public String within = ""; static final String defaultOutputRoot = "build/testSuiteGenerated"; - static final String CRMLtoModelicaLibrary = "resources/modelica_libraries/CRMLtoModelica.mo"; - static final String CRMLLibrary = "resources/modelica_libraries/CRML.mo"; + static final String CRMLtoModelicaLibrary = "libraries/modelica/CRMLtoModelica.mo"; + static final String CRMLLibrary = "libraries/modelica/CRML.mo"; public ProcessBuilder processBuilder; // used for running omc commands diff --git a/src/main/java/crml/compiler/OperatorMapping.java b/src/main/java/crml/compiler/OperatorMapping.java index 9ac283b..bd8e332 100644 --- a/src/main/java/crml/compiler/OperatorMapping.java +++ b/src/main/java/crml/compiler/OperatorMapping.java @@ -49,7 +49,8 @@ public static HashMap> get_operator_map() { List clockInteger = Arrays.asList("Clock", "Integer"); // Default operand names in built-in functions - List params = Arrays.asList("r1", "r2"); + List param1 = Arrays.asList("r1"); + List params2 = Arrays.asList("r1", "r2"); // SetLists List setOnset = Arrays.asList(true, true); @@ -71,10 +72,10 @@ public static HashMap> get_operator_map() { new Signature("+", intstring, "String", Type.OPERATOR), new Signature("+", stringreal, "String", Type.OPERATOR), new Signature("+", realstring, "String", Type.OPERATOR), - new Signature("CRMLtoModelica.Blocks.ClockAdd", periodReal, params, "Clock", Type.BLOCK), - new Signature("CRMLtoModelica.Blocks.ClockAdd", clockReal, params, "Clock", Type.BLOCK), - new Signature("CRMLtoModelica.Blocks.ClockAdd", clockInteger, params, "Clock", Type.BLOCK), - new Signature("CRMLtoModelica.Functions.add4", bool2, params, "Boolean", Type.FUNCTION)); + new Signature("CRMLtoModelica.Blocks.ClockAdd", periodReal, params2, "Clock", Type.BLOCK), + new Signature("CRMLtoModelica.Blocks.ClockAdd", clockReal, params2, "Clock", Type.BLOCK), + new Signature("CRMLtoModelica.Blocks.ClockAdd", clockInteger, params2, "Clock", Type.BLOCK), + new Signature("CRMLtoModelica.Functions.add4", bool2, params2, "Boolean", Type.FUNCTION)); built_in_operators.put("+", plus_sigs); @@ -83,14 +84,14 @@ public static HashMap> get_operator_map() { new Signature("-", int1, "Integer", Type.OPERATOR), new Signature("-", real1, "Real", Type.OPERATOR), new Signature("-", real2, "Real", Type.OPERATOR), - new Signature("CRMLtoModelica.Functions.diff4", bool2, params, "Boolean", Type.FUNCTION)); + new Signature("CRMLtoModelica.Functions.diff4", bool2, params2, "Boolean", Type.FUNCTION)); built_in_operators.put("-", minus_sigs); // * operators List mult_sigs = Arrays.asList(new Signature("*", int2, "Integer", Type.OPERATOR), new Signature("*", real2, "Real", Type.OPERATOR), - new Signature("CRMLtoModelica.Functions.mul4", bool2, params, "Boolean", Type.FUNCTION)); + new Signature("CRMLtoModelica.Functions.mul4", bool2, params2, "Boolean", Type.FUNCTION)); built_in_operators.put("*", mult_sigs); @@ -113,9 +114,9 @@ public static HashMap> get_operator_map() { new Signature("<=", real2, "Boolean", Type.OPERATOR), new Signature("<=", intreal, "Boolean", Type.OPERATOR), new Signature("<=", realint, "Boolean", Type.OPERATOR), - new Signature("CRMLtoModelica.realPeriodleq", realPeriod, params, "Boolean", "leq", Type.BLOCK), - new Signature("CRMLtoModelica.Blocks.Logical4.leq", bool2, params, "Boolean", "leq", Type.BLOCK), - new Signature("CRMLtoModelica.Functions.lEV", event2, params, "Boolean", Type.FUNCTION)); + new Signature("CRMLtoModelica.realPeriodleq", realPeriod, params2, "Boolean", "leq", Type.BLOCK), + new Signature("CRMLtoModelica.Blocks.Logical4.leq", bool2, params2, "Boolean", "leq", Type.BLOCK), + new Signature("CRMLtoModelica.Functions.lEV", event2, params2, "Boolean", Type.FUNCTION)); built_in_operators.put("<=", leq_sigs); @@ -124,10 +125,10 @@ public static HashMap> get_operator_map() { new Signature("<", real2, "Boolean", Type.OPERATOR), new Signature("<", intreal, "Boolean", Type.OPERATOR), new Signature("<", realint, "Boolean", Type.OPERATOR), - new Signature("leqArray", realint, params, "Boolean", Type.SET_OP, setOnvar, true), - new Signature("CRMLtoModelica.Blocks.realPeriodleq", realPeriod, params, "Boolean", Type.BLOCK), - new Signature("CRMLtoModelica.Blocks.Logical4.leq", bool2, params, "Boolean", "leq", Type.BLOCK), - new Signature("CRMLtoModelica.Functions.leqEV", event2, params, "Boolean", Type.FUNCTION)); + new Signature("leqArray", realint, params2, "Boolean", Type.SET_OP, setOnvar, true), + new Signature("CRMLtoModelica.Blocks.realPeriodleq", realPeriod, params2, "Boolean", Type.BLOCK), + new Signature("CRMLtoModelica.Blocks.Logical4.leq", bool2, params2, "Boolean", "leq", Type.BLOCK), + new Signature("CRMLtoModelica.Functions.leqEV", event2, params2, "Boolean", Type.FUNCTION)); built_in_operators.put("<", le_sigs); @@ -136,8 +137,8 @@ public static HashMap> get_operator_map() { new Signature(">=", real2, "Boolean", Type.OPERATOR), new Signature(">=", intreal, "Boolean", Type.OPERATOR), new Signature(">=", realint, "Boolean", Type.OPERATOR), - new Signature("CRMLtoModelica.Blocks.Logical4.geq", bool2, params, "Boolean", Type.FUNCTION), - new Signature("CRMLtoModelica.Functions.gEV", event2, params, "Boolean", Type.FUNCTION)); + new Signature("CRMLtoModelica.Blocks.Logical4.geq", bool2, params2, "Boolean", Type.FUNCTION), + new Signature("CRMLtoModelica.Functions.gEV", event2, params2, "Boolean", Type.FUNCTION)); built_in_operators.put(">=", geq_sigs); @@ -147,8 +148,8 @@ public static HashMap> get_operator_map() { new Signature(">", real2, "Boolean", Type.OPERATOR), new Signature(">", intreal, "Boolean", Type.OPERATOR), new Signature(">", realint, "Boolean", Type.OPERATOR), - new Signature("CRMLtoModelica.Functions.geq", bool2, params, "Boolean", Type.FUNCTION), - new Signature("CRMLtoModelica.Functions.geqEV", event2, params, "Boolean", Type.FUNCTION)); + new Signature("CRMLtoModelica.Functions.geq", bool2, params2, "Boolean", Type.FUNCTION), + new Signature("CRMLtoModelica.Functions.geqEV", event2, params2, "Boolean", Type.FUNCTION)); built_in_operators.put(">", gr_sigs); @@ -157,9 +158,9 @@ public static HashMap> get_operator_map() { new Signature("==", real2, "Boolean", Type.OPERATOR), new Signature("==", intreal, "Boolean", Type.OPERATOR), new Signature("==", realint, "Boolean", Type.OPERATOR), - new Signature("eqArray", realint, params, "Boolean", Type.SET_OP, setOnvar, true), - new Signature("CRMLtoModelica.Blocks.realPeriodeq", realPeriod, params, "Boolean", Type.BLOCK), - new Signature("CRMLtoModelica.Blocks.Logical4.eq", bool2, params, "Boolean", "eq", Type.BLOCK)); + new Signature("eqArray", realint, params2, "Boolean", Type.SET_OP, setOnvar, true), + new Signature("CRMLtoModelica.Blocks.realPeriodeq", realPeriod, params2, "Boolean", Type.BLOCK), + new Signature("CRMLtoModelica.Blocks.Logical4.eq", bool2, params2, "Boolean", "eq", Type.BLOCK)); built_in_operators.put("==", eq_sigs); @@ -168,9 +169,9 @@ public static HashMap> get_operator_map() { new Signature("<>", real2, "Boolean", Type.OPERATOR), new Signature("<>", intreal, "Boolean", Type.OPERATOR), new Signature("<>", realint, "Boolean", Type.OPERATOR), - new Signature("neqArray", realint, params, "Boolean", Type.SET_OP, setOnvar, true), - new Signature("CRMLtoModelica.realPeriodneq", realPeriod, params, "Boolean", Type.BLOCK), - new Signature("CRMLtoModelica.Blocks.Logical4.neq", bool2, params, "Boolean", "neq", Type.BLOCK)); + new Signature("neqArray", realint, params2, "Boolean", Type.SET_OP, setOnvar, true), + new Signature("CRMLtoModelica.realPeriodneq", realPeriod, params2, "Boolean", Type.BLOCK), + new Signature("CRMLtoModelica.Blocks.Logical4.neq", bool2, params2, "Boolean", "neq", Type.BLOCK)); built_in_operators.put("<>", neq_sigs); @@ -226,85 +227,92 @@ public static HashMap> get_operator_map() { // and operators List and_sigs = Arrays.asList( - new Signature("CRMLtoModelica.Functions.and4", bool2, params, "Boolean", Type.FUNCTION), - new Signature("arrayAnd", bool1, params, "Boolean", Type.SET_OP, setUnary, false), - new Signature("CRMLtoModelica.Blocks.unaryBoolAnd", bool1, params, "Boolean", Type.BLOCK), - new Signature ("andOnPeriod", Arrays.asList("Periods"), params, "Boolean", Type.FUNCTION)); + new Signature("CRMLtoModelica.Functions.and4", bool2, params2, "Boolean", Type.FUNCTION), + new Signature("CRMLtoModelica.Blocks.setAnd", bool1, param1, "Boolean", Type.SET_OP, setUnary, false), + new Signature("CRMLtoModelica.Blocks.unaryBoolAnd", bool1, param1, "Boolean", Type.BLOCK), + new Signature ("andOnPeriod", Arrays.asList("Periods"), param1, "Boolean", Type.FUNCTION)); built_in_operators.put("and", and_sigs); // or operators List or_sigs = Arrays.asList( - new Signature("CRMLtoModelica.Functions.or4", bool2, params, "Boolean", Type.FUNCTION), - new Signature("arrayOr", bool1, params, "Boolean", Type.SET_OP, setUnary, false)); + new Signature("CRMLtoModelica.Functions.or4", bool2, params2, "Boolean", Type.FUNCTION), + new Signature("arrayOr", bool1, param1, "Boolean", Type.SET_OP, setUnary, false)); built_in_operators.put("or", or_sigs); // not operators List not_sigs = Arrays.asList( - new Signature("CRMLtoModelica.Functions.not4", bool1, params, "Boolean", Type.FUNCTION), - new Signature("arrayNot", bool1, params, "Boolean", Type.SET_OP, setUnary, false)); + new Signature("CRMLtoModelica.Functions.not4", bool1, param1, "Boolean", Type.FUNCTION), + new Signature("arrayNot", bool1, param1, "Boolean", Type.SET_OP, setUnary, false)); built_in_operators.put("not", not_sigs); // end operators TODO proper implementation built_in_operators.put("end", - Arrays.asList(new Signature("CRMLtoModelica.Functions.PEnd", Arrays.asList("Period"), params, "Event", + Arrays.asList(new Signature("CRMLtoModelica.Functions.PEnd", Arrays.asList("Period"), param1, "Event", Type.FUNCTION))); built_in_operators.put("start", - Arrays.asList(new Signature("CRMLtoModelica.Functions.PStart", Arrays.asList("Period"), params, "Event", + Arrays.asList(new Signature("CRMLtoModelica.Functions.PStart", Arrays.asList("Period"), param1, "Event", Type.FUNCTION))); // tick operator built_in_operators.put("tick", - Arrays.asList(new Signature("CRMLtoModelica.Blocks.ClockTick", Arrays.asList("Clock"), params, "Event", + Arrays.asList(new Signature("CRMLtoModelica.Blocks.ClockTick", Arrays.asList("Clock"), param1, "Event", Type.BLOCK))); // filter operator built_in_operators.put("filter", - Arrays.asList(new Signature("CRMLtoModelica.Blocks.EventFilter", Arrays.asList("Clock", "Boolean"), params, + Arrays.asList(new Signature("CRMLtoModelica.Blocks.EventFilter", Arrays.asList("Clock", "Boolean"), params2, "Clock", Type.BLOCK))); // card operator built_in_operators.put("card", - Arrays.asList(new Signature("CRMLtoModelica.Blocks.CardClock", Arrays.asList("Clock"), params, + Arrays.asList(new Signature("CRMLtoModelica.Blocks.CardClock", Arrays.asList("Clock"), param1, "Integer", Type.BLOCK))); // integrate operator built_in_operators.put("integrate", - Arrays.asList(new Signature("CRMLtoModelica.Blocks.Integrate", Arrays.asList("Boolean", "Period"), params, + Arrays.asList(new Signature("CRMLtoModelica.Blocks.Integrate", Arrays.asList("Boolean", "Period"), params2, "Integer", Type.BLOCK))); // CONSTRUCTORS TODO finalize constructor table // String - List string_sigs = Arrays.asList(new Signature("String", int1, params, "String", Type.FUNCTION), - new Signature("String", real1, params, "String", Type.FUNCTION), - new Signature("CRMLtoModelica.Functions.Bool4toString", bool1, params, "String", Type.FUNCTION)); + List string_sigs = Arrays.asList(new Signature("String", int1, param1, "String", Type.FUNCTION), + new Signature("String", real1, param1, "String", Type.FUNCTION), + new Signature("CRMLtoModelica.Functions.Bool4toString", bool1, param1, "String", Type.FUNCTION)); built_in_operators.put("String", string_sigs); // Integer - List integer_sigs = Arrays.asList(new Signature("Integer", int1, params, "Integer", Type.FUNCTION), - new Signature("Integer", real1, params, "integer", Type.FUNCTION)); + List integer_sigs = Arrays.asList(new Signature("Integer", int1, param1, "Integer", Type.FUNCTION), + new Signature("Integer", real1, param1, "integer", Type.FUNCTION)); built_in_operators.put("Integer", integer_sigs); // Real - List real_sigs = Arrays.asList(new Signature("Real", int1, params, "Real", Type.FUNCTION), - new Signature("Real", real1, params, "real", Type.FUNCTION)); + List real_sigs = Arrays.asList(new Signature("Real", int1, param1, "Real", Type.FUNCTION), + new Signature("Real", real1, param1, "real", Type.FUNCTION)); built_in_operators.put("Real", real_sigs); // Boolean - List bool_sigs = Arrays.asList(new Signature("CRMLtoModelica.Functions.Event2Boolean", Arrays.asList("Event"), params, "Boolean", Type.FUNCTION)); + List bool_sigs = Arrays.asList(new Signature("CRMLtoModelica.Functions.Event2Boolean", Arrays.asList("Event"), param1, "Boolean", Type.FUNCTION)); built_in_operators.put("Boolean", bool_sigs); // Event - List event_sigs = Arrays.asList(new Signature("CRMLtoModelica.Types.Event", bool1, params, "Event", Type.BLOCK)); + List event_sigs = Arrays.asList(new Signature("CRMLtoModelica.Types.Event", bool1, param1, "Event", Type.BLOCK)); built_in_operators.put("Event", event_sigs); + // Periods + List periods_sigs = Arrays.asList(new Signature("CRMLtoModelica.Types.Periods", Arrays.asList("Event"), param1, "Periods", Type.BLOCK, Arrays.asList(true), false)); + + built_in_operators.put("Periods", periods_sigs); + + + return built_in_operators; } @@ -316,10 +324,14 @@ public static Signature is_defined(HashMap> operator_map if (sigs == null) return null; - for (Signature s : sigs) + for (Signature s : sigs){ + System.out.println("SIG NAME: " + s.function_name + " " +s.variable_is_set.toString()); if (s.variable_types.size() == 1 && s.variable_types.get(0).equals(type) && s.variable_is_set.get(0) == isSet) - return s; + + return s; + } + return null; } @@ -337,7 +349,7 @@ public static Signature is_defined(HashMap> operator_map && s.variable_types.get(1).equals(type2) && s.variable_is_set.get(0) == isSet1 && s.variable_is_set.get(1) == isSet2) return s; - + return null; } diff --git a/src/main/java/crml/compiler/Signature.java b/src/main/java/crml/compiler/Signature.java index 3740543..6872fad 100644 --- a/src/main/java/crml/compiler/Signature.java +++ b/src/main/java/crml/compiler/Signature.java @@ -1,6 +1,6 @@ -package crml.compiler; + package crml.compiler; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; import java.util.Vector; @@ -37,73 +37,37 @@ public Signature(String name, List params, String return_t, Type t) { this.mtype = t; this.variable_types = params; this.return_type = return_t; - if(params.size()==1) - this.variable_is_set = Arrays.asList(false); - else - this.variable_is_set = Arrays.asList(false, false); + this.variable_is_set = new ArrayList(); + for (int i=0; i < params.size(); i++){ + this.variable_is_set.add(false); + } this.is_return_set=false; this.temp_var_name = name; // unless otherwise specified } public Signature(String name, List params, String return_t, String out_var_name, Type t) { - this.function_name = name; - this.mtype = t; - this.variable_types = params; - this.return_type = return_t; - if(params.size()==1) - this.variable_is_set = Arrays.asList(false); - else - this.variable_is_set = Arrays.asList(false, false); - this.is_return_set=false; + this(name, params, return_t, t); this.temp_var_name = out_var_name; } public Signature(String name, List params, List param_names, String return_t, Type t) { - this.function_name = name; - this.mtype = t; - this.variable_types = params; + this(name, params, return_t, t); this.variable_names= param_names; - this.return_type = return_t; - if(params.size()==1) - this.variable_is_set = Arrays.asList(false); - else - this.variable_is_set = Arrays.asList(false, false); - this.is_return_set=false; - this.temp_var_name = name; // unless otherwise specified } public Signature(String name, List params, List param_names, String return_t, String out_var_name, Type t) { - this.function_name = name; - this.mtype = t; - this.variable_types = params; - this.variable_names= param_names; - this.return_type = return_t; - if(params.size()==1) - this.variable_is_set = Arrays.asList(false); - else - this.variable_is_set = Arrays.asList(false, false); - this.is_return_set=false; - this.temp_var_name = out_var_name; // unless otherwise specified + this(name, params, param_names, return_t, t); + this.temp_var_name = out_var_name; } public Signature(String name, List params, List param_names, String return_t, Type t, List isSet, Boolean returnSet) { - this.function_name = name; - this.mtype = t; - this.variable_types = params; - this.variable_names= param_names; - this.return_type = return_t; + this(name, params, param_names, return_t, t); this.variable_is_set = isSet; this.is_return_set=returnSet; - this.temp_var_name = name; // unless otherwise specified } public Signature(String name, List params, List param_names, String return_t, Type t, String out_var_name, List isSet, Boolean returnSet) { - this.function_name = name; - this.mtype = t; - this.variable_types = params; - this.variable_names= param_names; - this.return_type = return_t; - this.variable_is_set = isSet; + this(name, params, param_names, return_t, t); this.is_return_set=returnSet; this.temp_var_name = out_var_name; } diff --git a/src/main/java/crml/compiler/Value.java b/src/main/java/crml/compiler/Value.java index bd51728..5043f95 100644 --- a/src/main/java/crml/compiler/Value.java +++ b/src/main/java/crml/compiler/Value.java @@ -4,6 +4,13 @@ import java.util.List; public class Value { + public Value(List contents, String type) { + this.contents_set=contents; + this.type=type; + this.isSet = false; + this.setPath=null; + } + public Value(String contents, String type) { this.contents=contents; this.type=type; @@ -11,6 +18,13 @@ public Value(String contents, String type) { this.setPath=null; } + public Value(List contents, String type, Boolean isSet, List setPath) { + this.contents_set=contents; + this.type=type; + this.isSet=isSet; + this.setPath=setPath; + } + public Value(String contents, String type, Boolean isSet, List setPath) { this.contents=contents; this.type=type; @@ -18,15 +32,46 @@ public Value(String contents, String type, Boolean isSet, List setPath) this.setPath=setPath; } + public Value(List contents, String type, Boolean isSet) { + this.contents_set=contents; + this.type=type; + this.isSet = isSet; + this.setPath=new ArrayList(); + } + public Value(String contents, String type, Boolean isSet) { this.contents=contents; this.type=type; this.isSet = isSet; this.setPath=new ArrayList(); } + + public String toModelica(){ + if(!isSet | contents_set == null) return contents; + + String ret = "{"; + String separator = ""; + for(Value v : contents_set){ + ret += separator + v.toModelica(); + separator = ", "; + } + ret +="}"; + + return ret; + } + + public List getSetValue(){ + return contents_set; + } + + public String getValue(){ + return contents; + } - String contents; // parsed contents + private String contents; // single value + private List contents_set; // parsed contents for a set String type; // computed type Boolean isSet; List setPath; + } diff --git a/src/main/java/crml/compiler/crmlVisitorImpl.java b/src/main/java/crml/compiler/crmlVisitorImpl.java index 45a8d5e..e0d5823 100644 --- a/src/main/java/crml/compiler/crmlVisitorImpl.java +++ b/src/main/java/crml/compiler/crmlVisitorImpl.java @@ -57,6 +57,11 @@ public crmlVisitorImpl (crmlParser parser, List external_variables, Bool this.external_variables = external_variables; } + /** + * + * @param parser + * @param causal whether to genrerate input/output prefixes for every variable in Modelica + */ public crmlVisitorImpl (crmlParser parser, Boolean causal) { // FIXME check that class name and class file match @@ -74,15 +79,15 @@ public crmlVisitorImpl (crmlParser parser, Boolean causal) { types_mapping = new HashMap(); // table for mapping CRML built in types to Modelica types - types_mapping.put("Boolean", "CRMLtoModelica.Types.Boolean4"); - types_mapping.put("Period", "CRMLtoModelica.Types.CRMLPeriod"); - types_mapping.put("Periods", "CRMLtoModelica.Types.CRMLPeriods"); - types_mapping.put("Event", "CRMLtoModelica.Types.Event"); - types_mapping.put("Requirement", "CRMLtoModelica.Types.Boolean4"); - types_mapping.put("Clock", "CRMLtoModelica.Types.CRMLClock"); - types_mapping.put("Real", "Real"); - types_mapping.put("Integer", "Integer"); - types_mapping.put("String", "String"); + types_mapping.put("Boolean", "CRMLtoModelica.Types.Boolean4"); + types_mapping.put("Period", "CRMLtoModelica.Types.CRMLPeriod"); + types_mapping.put("Periods", "CRMLtoModelica.Types.CRMLPeriods"); + types_mapping.put("Event", "CRMLtoModelica.Types.Event"); + types_mapping.put("Requirement", "CRMLtoModelica.Types.Boolean4"); + types_mapping.put("Clock", "CRMLtoModelica.Types.CRMLClock"); + types_mapping.put("Real", "Real"); + types_mapping.put("Integer", "Integer"); + types_mapping.put("String", "String"); operators_map = OperatorMapping.get_operator_map(); @@ -110,12 +115,13 @@ public crmlVisitorImpl (crmlParser parser, Boolean causal) { } } + buffer.append("model " + ctx.id().getText() + " \n"); List cL = ctx.element_def(); for (Element_defContext e : cL) - buffer.append(visit(e).contents); + buffer.append(visit(e).toModelica()); buffer.append(localFunctionCalls); @@ -237,13 +243,13 @@ else if(ctx.structure_type()!=null) prefix += ctx.id(0).getText(); buffer.append("model "+ ctx.id(0).getText()); - // parse class variables - if (ctx.class_var_def()!= null) + + if (ctx.class_var_def()!= null)// parse class variables buffer.append("\n"); for (Class_var_defContext e : ctx.class_var_def()) { val = visitClass_var_def(e); - buffer.append(val.contents); + buffer.append(val.toModelica()); } if (ctx.type()!=null) { @@ -341,7 +347,7 @@ else if (ctx.uninstantiated_def()!=null) // append body Value exp = visit(ctx.operator_def().exp()); definition.append(localFunctionCalls + "\n"); - definition.append("equation \n out =" + exp.contents + ";\n"); + definition.append("equation \n out =" + exp.toModelica() + ";\n"); definition.append("end "); definition.append(modelName); definition.append(";\n"); @@ -403,7 +409,7 @@ else if (ctx.uninstantiated_def()!=null) // append body Value exp = visit(ctx.exp()); definition.append(localFunctionCalls + "\n"); - definition.append("equation \n out =" + exp.contents + ";\n"); + definition.append("equation \n out =" + exp.toModelica() + ";\n"); definition.append("end "); definition.append(modelName); definition.append(";\n"); @@ -452,7 +458,7 @@ else if (ctx.uninstantiated_def()!=null) if(ctx.exp()!=null) { v=visit(ctx.exp()); if(!v.type.equals("new")) // check that it is not a constructor - buffer.append(" = " + v.contents); + buffer.append(" = " + v.toModelica()); } buffer.append(";\n"); @@ -499,6 +505,12 @@ else if (ctx.uninstantiated_def()!=null) System.out.println("Category: " + current_category + " og_op : " + ctx.builtin_op().getText()+ " og_op : "+ op); if (ctx.binary!=null){ + + // check for iterators + if(ctx.left.iterator()!=null||ctx.right.iterator()!=null){ + throw new ParseCancellationException("iterators need to be implemented"); + + } left = visit(ctx.left); right = visit(ctx.right); Value result = apply_binary_op(op, left, right); @@ -507,20 +519,19 @@ else if (ctx.uninstantiated_def()!=null) left = visit(ctx.left); Value result = apply_lunary_op(op, left); return result; - } - } + }} if(ctx.runary!= null) { String op=null; - if(current_category!=null) // we check if we should apply the category - op = category_map.getCategory(current_category).get(ctx.runary.getText()); - if (op==null) op = ctx.runary.getText(); + if(current_category!=null) // we check if we should apply the category + op = category_map.getCategory(current_category).get(ctx.runary.getText()); + if (op==null) op = ctx.runary.getText(); - System.out.println("Category: " + current_category + " og_op : " + ctx.runary.getText()+ " og_op : "+ op); - right = visit(ctx.right); - Value result = apply_runary_op(op, right); - return result; - } - + System.out.println("Category: " + current_category + " og_op : " + ctx.runary.getText()+ " og_op : "+ op); + right = visit(ctx.right); + Value result = apply_runary_op(op, right); + return result; + } + // if the expression is in parenthesis if(ctx.sub_exp()!=null) return visit(ctx.sub_exp().exp()); @@ -541,9 +552,39 @@ else if (ctx.uninstantiated_def()!=null) if (op==null) op = "'"+uc.name+"'"; String s=""; + + Signature sig = user_operators.get(op); + + if(sig == null) + throw new ParseCancellationException("no definition found : " + ctx.getText() + '\n'); + + + int i=0; + + // check for array iterators + Value v = null; + + Boolean foundIterator = false; for ( ExpContext e : uc.args){ - s+= e.getText().toString() + " "; + if(e.iterator()!=null && ((sig.variable_is_set==null) || !sig.variable_is_set.get(i))){ + // flatten iterator + foundIterator = true; + //v = new Value (e.id().getText(), sig.return_type, true); + + System.out.println("FOUND iterator " + e.getText().replace(".element", "") ); + + v= apply_iterator_op(sig, e.getText().replace(".element", ""), i, args); + + } + i++; } + if(foundIterator) + return v; // FIXME type checking + + for ( ExpContext e : uc.args){ + s+= e.getText().toString() + " "; + } + System.out.println("Applying operator: " + uc.name + " " + s + "\n"); return apply_user_operator(op, uc.args); @@ -589,18 +630,18 @@ private UserOperatorCall reconstructUserOperator(ExpContext ctx, String string, } @Override - //FIXME proper set implementation + //FIXME proper sets typing public Value visitSet_def(crmlParser.Set_defContext ctx) { - if(ctx.empty_set()!=null) return new Value ("{}", "{}", true); - StringBuffer values = new StringBuffer("{"); + if(ctx.empty_set()!=null) + return new Value (new ArrayList(), "{}", true); + List values= new ArrayList(); + String type="{}"; for(int i =0; i < ctx.exp().size(); i++){ Value v = visit(ctx.exp(i)); - values.append(v.contents); - if(i exp) { for(int i=0; i exp, String val, int index) { + String previous_category = null; + // check if the operator is defined + //System.out.println("APPLYING OPERATOR " + op + "\n"); + Signature sign = user_operators.get(op); + if (sign== null) + throw new ParseCancellationException("User operator undefined : " + op + "\n"); + + if (sign.getCategory() != null){ + previous_category = current_category; + current_category = sign.getCategory(); + } + String name=op.substring(0, op.length()-1).replace(".", "_")+counter+'\''; + + String res=""; + + for(int i=0; i args){ + + // translates to block instantiation + + String name = sig.function_name +"_iteraor"+counter++; + String res = name + "\n algorithm \n"; + res+= sig.return_type + "[:] out"; + res += "for " + v_name + ".size()" +"\n"; + + String args_modelica = ""; + for(int i=0; i< args.size(); i++){ + + } + + res += "out[i]=" + sig.function_name + "(" + args + ")"; + + res += "end " + name + ";\n"; + + localFunctionCalls.append(res); + counter++; + return new Value("res", sig.return_type, true); + } private Value apply_binary_op(String op, Value left, Value right) { // check if predefined operator maps to Modelica operator @@ -842,11 +947,11 @@ private Value apply_binary_op(String op, Value left, Value right) { // special case if the return is boolean and needs to be wrapped in a CRML boolean if (op_t.return_type.equals("Boolean")) - return new Value ("CRMLtoModelica.Functions.cvBooleanToBoolean4(" + left.contents + " " + op + " " + right.contents + ")", "Boolean"); + return new Value ("CRMLtoModelica.Functions.cvBooleanToBoolean4(" + left.toModelica() + " " + op + " " + right.toModelica() + ")", "Boolean"); - return new Value (left.contents + " " + op_t.function_name + " " + right.contents, op_t.return_type, op_t.is_return_set); + return new Value (left.toModelica() + " " + op_t.function_name + " " + right.toModelica(), op_t.return_type, op_t.is_return_set); } else if (op_t.mtype == Signature.Type.FUNCTION) { - return new Value (op_t.function_name +"(" + right.contents + ", " + left.contents + ")", op_t.return_type, op_t.is_return_set); + return new Value (op_t.function_name +"(" + right.toModelica() + ", " + left.toModelica() + ")", op_t.return_type, op_t.is_return_set); } else if (op_t.mtype == Signature.Type.SET_OP) { // generate a set operator @@ -885,10 +990,10 @@ private Value apply_binary_op(String op, Value left, Value right) { // operator translates to block instantiation String name=op_t.temp_var_name.replace('.', '_')+counter; + System.out.println("VALUES: " + op_t.variable_names.get(0) + " " + op_t.function_name); - - String res = op_t.function_name+ " " + name+ "("+ op_t.variable_names.get(0) + " = "+left.contents+"," - + op_t.variable_names.get(1) + " = "+right.contents+");\n"; + String res = op_t.function_name+ " " + name+ "("+ op_t.variable_names.get(0) + " = "+left.toModelica()+"," + + op_t.variable_names.get(1) + " = "+right.toModelica()+");\n"; localFunctionCalls.append(res); counter++; diff --git a/src/test/resources/testModels/libraries/ETL_test/CheckOver_no_ext.crml b/src/test/resources/testModels/libraries/ETL_test/CheckOver_no_ext.crml index 8b8085f..96a7b6f 100644 --- a/src/test/resources/testModels/libraries/ETL_test/CheckOver_no_ext.crml +++ b/src/test/resources/testModels/libraries/ETL_test/CheckOver_no_ext.crml @@ -4,6 +4,7 @@ model CheckOver_no_ext is { // Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi or (P end); //With or defined as the built-in disjunction operator // Option2 Template b1 'or' b2 = not (not b1 and not b2); + Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi 'or' new Boolean (P end); //With 'or' as a user-defined disjunction operator for Booleans (only) // Evaluate @@ -12,12 +13,12 @@ model CheckOver_no_ext is { // Check Operator [ Boolean ] 'check' Boolean phi 'over' Periods P - = and ('evaluate' phi 'over' P); // has to be expanded implicitly - make an issue + = and ('evaluate' phi 'over' P.element); //for each p in P evaluate' phi 'over' p, has to be expanded implicitly - make an issue // Example of function call Boolean phi1 is if (2.0 < time) and (time < 3.5) then undecided else false; Boolean b1 is if (2.5 < time) and (time < 5) then true else false; - Periods P1 is {[new Event b1, new Event not b1]}; + Periods P1 is new Periods [new Clock b1, new Clock not b1]; Boolean b_check_over is 'check' phi1 'over' P1; //Value is undefined, becomes undecided at 2.5s and then false at t=3.5s }; \ No newline at end of file diff --git a/src/test/resources/testModels/libraries/ETL_test/EvaluateOver_no_ext.crml b/src/test/resources/testModels/libraries/ETL_test/EvaluateOver_no_ext.crml index 8a1426b..417d3b3 100644 --- a/src/test/resources/testModels/libraries/ETL_test/EvaluateOver_no_ext.crml +++ b/src/test/resources/testModels/libraries/ETL_test/EvaluateOver_no_ext.crml @@ -4,6 +4,9 @@ model EvaluateOver_no_ext is { // Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi or (P end); //With or defined as the built-in disjunction operator // Option2 Template b1 'or' b2 = not (not b1 and not b2); + + // P end returns an event and we convert it to Boolean + Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi 'or' new Boolean (P end); //With 'or' as a user-defined disjunction operator for Booleans (only) // Evaluate diff --git a/src/test/resources/testModels/spec-doc-examples/to_be_added_to_spec/LibraryImport.crml b/src/test/resources/testModels/spec-doc-examples/to_be_added_to_spec/LibraryImport.crml new file mode 100644 index 0000000..fc53949 --- /dev/null +++ b/src/test/resources/testModels/spec-doc-examples/to_be_added_to_spec/LibraryImport.crml @@ -0,0 +1,9 @@ +library TestLib is { + Template b1 'or' b2 = not (not b1 and not b2); +}; + +model LibraryImport is TestLib union { + Boolean b1 is true; + Boolean b2 i false; + Boolean b1_or_b2 is b1 'or' b2; +}; \ No newline at end of file diff --git a/test_model/package.mo b/test_model/package.mo deleted file mode 100644 index becba7e..0000000 --- a/test_model/package.mo +++ /dev/null @@ -1,4 +0,0 @@ -within ; -package test_model - - end test_model; \ No newline at end of file diff --git a/test_model/package.order b/test_model/package.order deleted file mode 100644 index 20d7b0a..0000000 --- a/test_model/package.order +++ /dev/null @@ -1 +0,0 @@ -test_clock diff --git a/test_model/test_clock.mo b/test_model/test_clock.mo deleted file mode 100644 index 45c43fc..0000000 --- a/test_model/test_clock.mo +++ /dev/null @@ -1,10 +0,0 @@ -within test_model; - -model test_clock - -CRMLtoModelica.Types.Boolean4 b1 = if (CRMLtoModelica.Functions.and4(CRMLtoModelica.Functions.cvBooleanToBoolean4(time < 5), CRMLtoModelica.Functions.cvBooleanToBoolean4(2.5 < time))== CRMLtoModelica.Types.Boolean4.true4) then CRMLtoModelica.Types.Boolean4.true4 else CRMLtoModelica.Types.Boolean4.false4; - -CRMLtoModelica.Types.CRMLClock C1 = c8; -CRMLtoModelica.Types.CRMLClock c8(b=b1); -CRMLtoModelica.Types.CRMLClock_build c8_init(clock =c8); -end test_clock; \ No newline at end of file