From d423deabcb26861ea15079af087c977127143f73 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:58:33 +0100 Subject: [PATCH 01/12] Adding openmodelica-library-testing - Refactoring Markdown - Removing OpenModelica test scripts --- .gitattributes | 3 + .github/workflows/Test.yml | 54 ++- README.md | 78 +++- Testing/Makefile | 11 +- Testing/OpenModelica/.gitignore | 12 - Testing/OpenModelica/Makefile | 138 ------ .../PNlib.Examples.ConTest.Conflict.mos | 52 --- .../PNlib.Examples.ConTest.ConflictLoop.mos | 51 -- ...Nlib.Examples.ConTest.LoopAndArcweight.mos | 45 -- .../PNlib.Examples.ConTest.PCtoTC.mos | 44 -- .../PNlib.Examples.ConTest.PCtoTCfunction.mos | 44 -- .../PNlib.Examples.ConTest.SinglePC.mos | 41 -- .../PNlib.Examples.ConTest.SingleTC.mos | 42 -- .../PNlib.Examples.ConTest.Speed.mos | 51 -- .../PNlib.Examples.ConTest.TCtoPC.mos | 44 -- .../PNlib.Examples.ConTest.TCtoPCfunction.mos | 44 -- .../PNlib.Examples.ConTest.ZeroArcWeight.mos | 46 -- .../PNlib.Examples.ConTest.ZeroPlace.mos | 48 -- ...PNlib.Examples.DisTest.ConflictBeneBaB.mos | 61 --- ...ib.Examples.DisTest.ConflictBeneGreedy.mos | 49 -- ....Examples.DisTest.ConflictBeneQuotient.mos | 49 -- .../PNlib.Examples.DisTest.ConflictPrio.mos | 49 -- .../PNlib.Examples.DisTest.ConflictProb.mos | 49 -- ...b.Examples.DisTest.DisLoopAndArcweight.mos | 44 -- ...lib.Examples.DisTest.EightConflictProb.mos | 57 --- .../PNlib.Examples.DisTest.FiveTimes.mos | 66 --- ....Examples.DisTest.InputConflictBeneBaB.mos | 49 -- ...amples.DisTest.InputConflictBeneGreedy.mos | 49 -- ...ples.DisTest.InputConflictBeneQuotient.mos | 49 -- ...lib.Examples.DisTest.InputConflictPrio.mos | 49 -- ...lib.Examples.DisTest.InputConflictProb.mos | 50 -- ...PNlib.Examples.DisTest.NoInputConflict.mos | 45 -- ...Examples.DisTest.OutputConflictBeneBaB.mos | 49 -- ...mples.DisTest.OutputConflictBeneGreedy.mos | 49 -- ...les.DisTest.OutputConflictBeneQuotient.mos | 49 -- ...ib.Examples.DisTest.OutputConflictPrio.mos | 49 -- ...ib.Examples.DisTest.OutputConflictProb.mos | 49 -- .../PNlib.Examples.DisTest.PDtoTD.mos | 43 -- .../PNlib.Examples.DisTest.PDtoTDfunction.mos | 43 -- .../PNlib.Examples.DisTest.PDtoTT.mos | 43 -- .../PNlib.Examples.DisTest.PrioTest.mos | 55 --- .../PNlib.Examples.DisTest.SinglePD.mos | 41 -- .../PNlib.Examples.DisTest.SingleTD.mos | 42 -- ...PNlib.Examples.DisTest.SixConflictProb.mos | 53 --- .../PNlib.Examples.DisTest.TDtoPD.mos | 43 -- .../PNlib.Examples.DisTest.TDtoPDfunction.mos | 43 -- .../PNlib.Examples.DisTest.TEnoInput.mos | 43 -- .../PNlib.Examples.DisTest.TEtest.mos | 46 -- ...Nlib.Examples.DisTest.TFDinputConflict.mos | 53 --- .../PNlib.Examples.DisTest.TFDoutCap.mos | 51 -- ...lib.Examples.DisTest.TFDoutputConflict.mos | 55 --- .../PNlib.Examples.DisTest.TFDtest.mos | 47 -- .../PNlib.Examples.DisTest.TTcircle.mos | 46 -- .../PNlib.Examples.DisTest.TTtoPD.mos | 43 -- .../PNlib.Examples.DisTest.Ttest.mos | 52 --- .../PNlib.Examples.ExtTest.ArcswithPCtoTC.mos | 60 --- ...PNlib.Examples.ExtTest.ArcswithPCtoTC2.mos | 63 --- ...PNlib.Examples.ExtTest.ArcswithPCtoTC3.mos | 63 --- ...b.Examples.ExtTest.DoubleArcwithPCtoTC.mos | 49 -- ...b.Examples.ExtTest.DoubleArcwithPTtoTD.mos | 47 -- ....Examples.ExtTest.DoubleArcwithPTtoTD2.mos | 47 -- .../PNlib.Examples.ExtTest.IATest.mos | 52 --- .../PNlib.Examples.ExtTest.IAwithPCtoTC.mos | 49 -- .../PNlib.Examples.ExtTest.IAwithPDtoTD.mos | 47 -- .../PNlib.Examples.ExtTest.IAwithPDtoTD2.mos | 47 -- .../PNlib.Examples.ExtTest.NoTokens.mos | 50 -- .../PNlib.Examples.ExtTest.TATest.mos | 51 -- .../PNlib.Examples.ExtTest.TAwithPCtoTC.mos | 49 -- .../PNlib.Examples.ExtTest.TAwithPDtoTD.mos | 47 -- .../PNlib.Examples.ExtTest.TAwithPDtoTD2.mos | 47 -- ...xamples.ExtTest.TAwithWeaklyActivation.mos | 51 -- .../PNlib.Examples.ExtTest.TDSTest.mos | 45 -- ...Nlib.Examples.ExtTest.TDSTestinterrupt.mos | 49 -- .../PNlib.Examples.ExtTest.TDSdiscrete.mos | 45 -- .../PNlib.Examples.ExtTest.TDStriangular.mos | 45 -- ...ib.Examples.ExtTest.TDStruncatednormal.mos | 45 -- .../PNlib.Examples.ExtTest.TDSuniform.mos | 45 -- .../PNlib.Examples.ExtTest.TESTest.mos | 47 -- .../PNlib.Examples.ExtTest.TFDStest.mos | 48 -- .../PNlib.Examples.HybTest.ConflictPrio.mos | 49 -- .../PNlib.Examples.HybTest.ConflictProb.mos | 49 -- .../PNlib.Examples.HybTest.ConflictType3.mos | 51 -- .../PNlib.Examples.HybTest.ConflictType4.mos | 51 -- ...lib.Examples.HybTest.EightConflictProb.mos | 57 --- ...b.Examples.HybTest.HybLoopAndArcweight.mos | 43 -- ...lib.Examples.HybTest.InputConflictPrio.mos | 49 -- ...lib.Examples.HybTest.InputConflictProb.mos | 49 -- ...ib.Examples.HybTest.InputConflictType3.mos | 51 -- ...ib.Examples.HybTest.OutputConflictPrio.mos | 49 -- ...ib.Examples.HybTest.OutputConflictProb.mos | 49 -- ...b.Examples.HybTest.OutputConflictType3.mos | 51 -- .../PNlib.Examples.HybTest.PCtoTD.mos | 43 -- .../PNlib.Examples.HybTest.PCtoTDfunction.mos | 43 -- ...PNlib.Examples.HybTest.SixConflictProb.mos | 53 --- .../PNlib.Examples.HybTest.TCwithPD.mos | 46 -- .../PNlib.Examples.HybTest.TDtoPC.mos | 43 -- .../PNlib.Examples.HybTest.TDtoPCfunction.mos | 43 -- ...amples.Models.BicoloredPlaces.Aquarium.mos | 53 --- ....Models.FiliP.ModellStationen.Station1.mos | 56 --- ....Models.FiliP.ModellStationen.Station7.mos | 133 ------ Testing/OpenModelica/rtest | 435 ------------------ 101 files changed, 89 insertions(+), 5295 deletions(-) delete mode 100644 Testing/OpenModelica/.gitignore delete mode 100644 Testing/OpenModelica/Makefile delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.Conflict.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.LoopAndArcweight.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTC.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTCfunction.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.SinglePC.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.SingleTC.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.Speed.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPC.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPCfunction.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.ZeroArcWeight.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.ZeroPlace.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneBaB.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneGreedy.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneQuotient.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.ConflictPrio.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.DisLoopAndArcweight.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.EightConflictProb.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.FiveTimes.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneBaB.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneGreedy.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneQuotient.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictPrio.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.NoInputConflict.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneBaB.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneGreedy.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneQuotient.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictPrio.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTD.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTDfunction.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTT.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.PrioTest.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.SinglePD.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.SingleTD.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPD.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPDfunction.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.TEnoInput.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.TEtest.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.TFDinputConflict.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutCap.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutputConflict.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.TFDtest.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.TTcircle.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.TTtoPD.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.Ttest.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC2.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.IATest.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPCtoTC.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD2.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.NoTokens.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TATest.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPCtoTC.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD2.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTest.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTestinterrupt.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TDSdiscrete.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TDStriangular.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TDStruncatednormal.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TDSuniform.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TESTest.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.ExtTest.TFDStest.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.ConflictPrio.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.ConflictProb.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType3.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType4.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.EightConflictProb.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.HybLoopAndArcweight.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictPrio.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictProb.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictType3.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictPrio.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictProb.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictType3.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTD.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTDfunction.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.SixConflictProb.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.TCwithPD.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPC.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPCfunction.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station1.mos delete mode 100644 Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station7.mos delete mode 100755 Testing/OpenModelica/rtest diff --git a/.gitattributes b/.gitattributes index 1a4cc1fa..c253a49e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,6 +8,9 @@ *.order text eol=lf Testing/OpenModelica/rtest text eol=lf +# Set linguist language to Modelica +*.mo linguist-language=Modelica + # Denote all files that are truly binary and should not be modified. *.jpg binary *.mat binary diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index cb4e0b53..53e599cb 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -1,41 +1,49 @@ name: Test on: + workflow_dispatch: + pull_request: push: branches: - - 'master' - pull_request: + - main + - 'releases/*' + tags: 'v*' jobs: - test: - runs-on: 'ubuntu-latest' - env: - OPENMODELICAHOME: '/usr' + linux: + runs-on: ubuntu-latest timeout-minutes: 60 + strategy: + matrix: + omc-version: ['1.18', 'stable', 'nightly'] + fail-fast: false steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Python 3 + uses: actions/setup-python@v5 + with: + python-version: '3.10' - - name: "Set up OpenModelica Compiler" - uses: AnHeuermann/setup-openmodelica@v0.6 + - name: Setup OpenModelica + uses: OpenModelica/setup-openmodelica@v1 with: - version: 'stable' + version: stable packages: | omc libraries: | - 'Modelica 4.0.0' + Modelica 4.0.0 omc-diff: true - - name: "Test OpenModelica" - run: "make -C Testing openmodelica" - - - name: "Upload openmodelica.log" - uses: actions/upload-artifact@v3 + - uses: OpenModelica/openmodelica-library-testing@v0.1 with: - name: openmodelica.log - path: Testing/openmodelica.log - - - name: "Look for failing tests" - run: | - grep "\(^ - \)\|\(... equation mismatch\)" Testing/openmodelica.log | true - grep -i "^== 0 out of [0-9]* tests failed" Testing/openmodelica.log + library: 'PNlib' + library-version: '2.2' + modelica-file: 'PNlib/package.mo' + omc-version: 'stable' + reference-files-dir: 'ReferenceFiles' + reference-files-extension: 'mat' + reference-files-delimiter: '.' + pages-root-url: 'https://anheuermann.github.io/pnlib/' diff --git a/README.md b/README.md index a6d53517..11552b21 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,67 @@ # PNlib + +[![Test][test-badge]][test-link] + Free Modelica library for modelling xHPN. ## Library description -The advanced Petri Net library, called PNlib, enables the modeling of extended hybrid Petri Nets (xHPN). It comprises - * discrete (PD) and continuous places (PC), - * discrete (TD), stochastic (TS), and continuous transitions (TC), and - * test (TA), inhibitor (IA), and read arcs (RA). -![iconsxHPN](PNlib/Resources/Images/iconsxHPN.png "xHPN: Extended Hybrid Petri Nets") +The advanced Petri Net library, called PNlib, enables the modeling of extended +hybrid Petri Nets (xHPN). It comprises + + * discrete (PD) and continuous places (PC), + * discrete (TD), stochastic (TS), and continuous transitions (TC), and + * test (TA), inhibitor (IA), and read arcs (RA). + +![iconsxHPN][pnlib-img] The main package PNlib is divided into the following sub-packages: - * _Interfaces_: contains the connectors of the Petri net component models. - * _Blocks_: contains blocks with specific procedures that are used in the Petri net component models. - * _Functions_: contains functions with specific algorithmic procedures which are used in the Petri net component models. - * _Constants_: contains constants which are used in the Petri net component models. - * _Examples_: contains several examples and unit tests. + + * _Interfaces_: contains the connectors of the Petri net component models. + * _Blocks_: contains blocks with specific procedures that are used in the Petri + net component models. + * _Functions_: contains functions with specific algorithmic procedures which + are used in the Petri net component models. + * _Constants_: contains constants which are used in the Petri net component + models. + * _Examples_: contains several examples and unit tests. ## Current release -Download [PNlib v2.2 (2019-10-24)](../../archive/v2.2.zip) -## Compatibility [![Test](https://github.com/AMIT-HSBI/PNlib/actions/workflows/Test.yml/badge.svg)](https://github.com/AMIT-HSBI/PNlib/actions/workflows/Test.yml) -* Works in OpenModelica (latest release) ([trend](http://libraries.openmodelica.org/branches/history/master/PNlib.svg), [coverage](http://libraries.openmodelica.org/branches/master/PNlib/PNlib.html)) -* Works in Dymola 2017/2019/2020 +Download [PNlib v2.2 (2019-10-24)][release-v-2-2] + +## Compatibility + + * Works in OpenModelica (latest release) + ([trend][trend-img], + [coverage](http://libraries.openmodelica.org/branches/master/PNlib/PNlib.html)) + * Works in Dymola 2017/2019/2020 ## License -This Modelica package is free software and the use is completely at your own risk; -it can be redistributed and/or modified under the terms of the [Modelica License 2](https://modelica.org/licenses/ModelicaLicense2). + +This Modelica package is free software and the use is completely at your own +risk; it can be redistributed and/or modified under the terms of the +[Modelica License 2][license-link]. ## Development and contribution - University of Applied Sciences Bielefeld - Department of engineering and mathematics - 33619 Bielefeld - Germany -* Sabrina Proß -* Lennart Ochel -* Timo Lask -* Bernhard Bachmann - -You may report feedback, issues or feature-requests using the [Issues](../../issues) button. + +``` +Hochschule Bielefeld – University of Applied Sciences and Arts +Faculty of Engineering and Mathematics +``` + + * Sabrina Proß + * Lennart Ochel + * Timo Lask + * Bernhard Bachmann + +You may report feedback, issues or feature-requests using +[GitHub Issues][issues]. + +[test-badge]: https://github.com/AMIT-HSBI/PNlib/actions/workflows/Test.yml/badge.svg +[test-link]: https://github.com/AMIT-HSBI/PNlib/actions/workflows/Test.yml +[pnlib-img]: PNlib/Resources/Images/iconsxHPN.png "xHPN: Extended Hybrid PetriNets" +[release-v-2-2]: https://github.com/AMIT-HSBI/PNlib/releases/tag/v2.2 +[trend-img]: http://libraries.openmodelica.org/branches/history/master/PNlib.svg +[license-link]: https://modelica.org/licenses/ModelicaLicense2 +[issues]: https://github.com/AMIT-HSBI/PNlib/issues diff --git a/Testing/Makefile b/Testing/Makefile index d5d38409..fd8cbac6 100644 --- a/Testing/Makefile +++ b/Testing/Makefile @@ -1,12 +1,6 @@ -.PHONY : test clean openmodelica dymola +.PHONY : test clean dymola -test: openmodelica dymola - -openmodelica: - @make -C OpenModelica | tee openmodelica.log - @make -C OpenModelica clean - @echo "" - @grep == openmodelica.log +test: dymola dymola: @make -C Dymola | tee dymola.log @@ -15,6 +9,5 @@ dymola: @grep == dymola.log clean: - @make -C OpenModelica clean @make -C Dymola clean @rm *.log diff --git a/Testing/OpenModelica/.gitignore b/Testing/OpenModelica/.gitignore deleted file mode 100644 index f62e5a5c..00000000 --- a/Testing/OpenModelica/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -# Source files -*.bin -*.c -*.h -*.json -*.libs -*.log -*.o -*.o.tmp -*.makefile -*.xml - diff --git a/Testing/OpenModelica/Makefile b/Testing/OpenModelica/Makefile deleted file mode 100644 index a3d17e22..00000000 --- a/Testing/OpenModelica/Makefile +++ /dev/null @@ -1,138 +0,0 @@ -TEST = ./rtest -v - -TESTFILES = \ -PNlib.Examples.ConTest.Conflict.mos \ -PNlib.Examples.ConTest.ConflictLoop.mos \ -PNlib.Examples.ConTest.LoopAndArcweight.mos \ -PNlib.Examples.ConTest.PCtoTC.mos \ -PNlib.Examples.ConTest.PCtoTCfunction.mos \ -PNlib.Examples.ConTest.SinglePC.mos \ -PNlib.Examples.ConTest.SingleTC.mos \ -PNlib.Examples.ConTest.Speed.mos \ -PNlib.Examples.ConTest.TCtoPC.mos \ -PNlib.Examples.ConTest.TCtoPCfunction.mos \ -PNlib.Examples.ConTest.ZeroArcWeight.mos \ -PNlib.Examples.ConTest.ZeroPlace.mos \ -PNlib.Examples.DisTest.ConflictPrio.mos \ -PNlib.Examples.DisTest.ConflictProb.mos \ -PNlib.Examples.DisTest.ConflictBeneGreedy.mos \ -PNlib.Examples.DisTest.ConflictBeneQuotient.mos \ -PNlib.Examples.DisTest.ConflictBeneBaB.mos \ -PNlib.Examples.DisTest.DisLoopAndArcweight.mos \ -PNlib.Examples.DisTest.EightConflictProb.mos \ -PNlib.Examples.DisTest.InputConflictPrio.mos \ -PNlib.Examples.DisTest.InputConflictProb.mos \ -PNlib.Examples.DisTest.InputConflictBeneGreedy.mos \ -PNlib.Examples.DisTest.InputConflictBeneQuotient.mos \ -PNlib.Examples.DisTest.InputConflictBeneBaB.mos \ -PNlib.Examples.DisTest.OutputConflictPrio.mos \ -PNlib.Examples.DisTest.OutputConflictProb.mos \ -PNlib.Examples.DisTest.OutputConflictBeneGreedy.mos \ -PNlib.Examples.DisTest.OutputConflictBeneQuotient.mos \ -PNlib.Examples.DisTest.OutputConflictBeneBaB.mos \ -PNlib.Examples.DisTest.PDtoTD.mos \ -PNlib.Examples.DisTest.PDtoTDfunction.mos \ -PNlib.Examples.DisTest.PrioTest.mos \ -PNlib.Examples.DisTest.NoInputConflict.mos \ -PNlib.Examples.DisTest.SinglePD.mos \ -PNlib.Examples.DisTest.SingleTD.mos \ -PNlib.Examples.DisTest.SixConflictProb.mos \ -PNlib.Examples.DisTest.TDtoPD.mos \ -PNlib.Examples.DisTest.TDtoPDfunction.mos \ -PNlib.Examples.DisTest.TFDtest.mos \ -PNlib.Examples.DisTest.TFDoutCap.mos \ -PNlib.Examples.DisTest.TFDinputConflict.mos \ -PNlib.Examples.DisTest.TFDoutputConflict.mos \ -PNlib.Examples.DisTest.PDtoTT.mos \ -PNlib.Examples.DisTest.TTtoPD.mos \ -PNlib.Examples.DisTest.TTcircle.mos \ -PNlib.Examples.DisTest.TEtest.mos \ -PNlib.Examples.DisTest.TEnoInput.mos \ -PNlib.Examples.DisTest.FiveTimes.mos \ -PNlib.Examples.DisTest.Ttest.mos \ -PNlib.Examples.ExtTest.ArcswithPCtoTC.mos \ -PNlib.Examples.ExtTest.ArcswithPCtoTC2.mos \ -PNlib.Examples.ExtTest.ArcswithPCtoTC3.mos \ -PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos \ -PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos \ -PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2.mos \ -PNlib.Examples.ExtTest.IATest.mos \ -PNlib.Examples.ExtTest.IAwithPCtoTC.mos \ -PNlib.Examples.ExtTest.IAwithPDtoTD.mos \ -PNlib.Examples.ExtTest.IAwithPDtoTD2.mos \ -PNlib.Examples.ExtTest.TATest.mos \ -PNlib.Examples.ExtTest.TAwithPCtoTC.mos \ -PNlib.Examples.ExtTest.TAwithPDtoTD.mos \ -PNlib.Examples.ExtTest.TAwithPDtoTD2.mos \ -PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos \ -PNlib.Examples.ExtTest.TDSTest.mos \ -PNlib.Examples.ExtTest.TDSTestinterrupt.mos \ -PNlib.Examples.ExtTest.TDStriangular.mos \ -PNlib.Examples.ExtTest.TDSuniform.mos \ -PNlib.Examples.ExtTest.TDStruncatednormal.mos \ -PNlib.Examples.ExtTest.TDSdiscrete.mos \ -PNlib.Examples.ExtTest.TFDStest.mos \ -PNlib.Examples.ExtTest.TESTest.mos \ -PNlib.Examples.ExtTest.NoTokens.mos \ -PNlib.Examples.HybTest.ConflictPrio.mos \ -PNlib.Examples.HybTest.ConflictProb.mos \ -PNlib.Examples.HybTest.ConflictType3.mos \ -PNlib.Examples.HybTest.ConflictType4.mos \ -PNlib.Examples.HybTest.EightConflictProb.mos \ -PNlib.Examples.HybTest.HybLoopAndArcweight.mos \ -PNlib.Examples.HybTest.InputConflictPrio.mos \ -PNlib.Examples.HybTest.InputConflictProb.mos \ -PNlib.Examples.HybTest.InputConflictType3.mos \ -PNlib.Examples.HybTest.OutputConflictPrio.mos \ -PNlib.Examples.HybTest.OutputConflictProb.mos \ -PNlib.Examples.HybTest.OutputConflictType3.mos \ -PNlib.Examples.HybTest.PCtoTD.mos \ -PNlib.Examples.HybTest.PCtoTDfunction.mos \ -PNlib.Examples.HybTest.SixConflictProb.mos \ -PNlib.Examples.HybTest.TCwithPD.mos \ -PNlib.Examples.HybTest.TDtoPC.mos \ -PNlib.Examples.HybTest.TDtoPCfunction.mos \ -PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos \ - -# These tests are OS dependent. Move up when fixed. -# Run make failingtest -FAILINGTESTFILES = \ -PNlib.Examples.Models.FiliP.ModellStationen.Station1.mos \ - -# Dependency files that are not .mo .mos or Makefile -# Add them here or they will be cleaned. -DEPENDENCIES = \ -*.mos \ -Makefile \ -rtest \ - -CLEAN = `ls | grep -w -v -f deps.tmp` - -.PHONY : test clean getdeps failingtest - -test: - @echo - @echo Running tests... - @$(TEST) $(TESTFILES) - -# Cleans all files that are not listed as dependencies -clean: - @echo $(DEPENDENCIES) | sed 's/ /\\\|/g' > deps.tmp - @rm -rf $(CLEAN) - -# Run this if you want to list out the files (dependencies). -# do it after cleaning and updating the folder -# then you can get a list of file names (which must be dependencies -# since you got them from repository + your own new files) -# then add them to the DEPENDENCIES. You can find the -# list in deps.txt -getdeps: - @echo $(DEPENDENCIES) | sed 's/ /\\\|/g' > deps.tmp - @echo $(CLEAN) | sed -r 's/deps.txt|deps.tmp//g' | sed 's/ / \\\n/g' > deps.txt - @echo Dependency list saved in deps.txt. - @echo Copy the list from deps.txt and add it to the Makefile @DEPENDENCIES - -failingtest: - @echo - @echo Running failing tests... - @$(TEST) $(FAILINGTESTFILES) diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.Conflict.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.Conflict.mos deleted file mode 100644 index e2a71fd7..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.Conflict.mos +++ /dev/null @@ -1,52 +0,0 @@ -// name: PNlib.Examples.ConTest.Conflict -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.Conflict); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.Conflict_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.Conflict.mat", - "PNlib.Examples.ConTest.Conflict_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.Conflict_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.Conflict_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.Conflict_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.Conflict', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-nls=\\'newton\\' -s=\\'rungekutta\\''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos deleted file mode 100644 index bb26e3dd..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos +++ /dev/null @@ -1,51 +0,0 @@ -// name: PNlib.Examples.ConTest.ConflictLoop -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.ConflictLoop); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed" -}; -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.ConflictLoop_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.ConflictLoop.mat", - "PNlib.Examples.ConTest.ConflictLoop_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.ConflictLoop_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.ConflictLoop_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.ConflictLoop_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.ConflictLoop', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.LoopAndArcweight.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.LoopAndArcweight.mos deleted file mode 100644 index 4e2cdc62..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.LoopAndArcweight.mos +++ /dev/null @@ -1,45 +0,0 @@ -// name: PNlib.Examples.ConTest.LoopAndArcweight -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.LoopAndArcweight); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.LoopAndArcweight_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.LoopAndArcweight.mat", - "PNlib.Examples.ConTest.LoopAndArcweight_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.LoopAndArcweight_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.LoopAndArcweight_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.LoopAndArcweight_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.LoopAndArcweight', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTC.mos deleted file mode 100644 index c3b18dbd..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTC.mos +++ /dev/null @@ -1,44 +0,0 @@ -// name: PNlib.Examples.ConTest.PCtoTC -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.PCtoTC); getErrorString(); - -vars := { - "P1.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.PCtoTC_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.PCtoTC.mat", - "PNlib.Examples.ConTest.PCtoTC_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.PCtoTC_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.PCtoTC_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.PCtoTC_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.PCtoTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTCfunction.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTCfunction.mos deleted file mode 100644 index a75bac83..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTCfunction.mos +++ /dev/null @@ -1,44 +0,0 @@ -// name: PNlib.Examples.ConTest.PCtoTCfunction -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.PCtoTCfunction); getErrorString(); - -vars := { - "P1.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.PCtoTCfunction_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.PCtoTCfunction.mat", - "PNlib.Examples.ConTest.PCtoTCfunction_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.PCtoTCfunction_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.PCtoTCfunction_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.PCtoTCfunction_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.PCtoTCfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.SinglePC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.SinglePC.mos deleted file mode 100644 index 979fc7e6..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.SinglePC.mos +++ /dev/null @@ -1,41 +0,0 @@ -// name: PNlib.Examples.ConTest.SinglePC -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.SinglePC); getErrorString(); - -vars := { - "P1.t" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.SinglePC_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.SinglePC.mat", - "PNlib.Examples.ConTest.SinglePC_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.SinglePC_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.SinglePC_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.SinglePC_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.SinglePC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.SingleTC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.SingleTC.mos deleted file mode 100644 index 860d8d57..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.SingleTC.mos +++ /dev/null @@ -1,42 +0,0 @@ -// name: PNlib.Examples.ConTest.SingleTC -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.SingleTC); getErrorString(); - -vars := { - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.SingleTC_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.SingleTC.mat", - "PNlib.Examples.ConTest.SingleTC_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.SingleTC_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.SingleTC_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.SingleTC_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.SingleTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "" -// {"T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.Speed.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.Speed.mos deleted file mode 100644 index b657f5be..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.Speed.mos +++ /dev/null @@ -1,51 +0,0 @@ -// name: PNlib.Examples.ConTest.Speed -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.Speed); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.Speed_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.Speed.mat", - "PNlib.Examples.ConTest.Speed_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.Speed_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.Speed_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.Speed_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.Speed', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPC.mos deleted file mode 100644 index a171247d..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPC.mos +++ /dev/null @@ -1,44 +0,0 @@ -// name: PNlib.Examples.ConTest.TCtoPC -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.TCtoPC); getErrorString(); - -vars := { - "P1.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.TCtoPC_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.TCtoPC.mat", - "PNlib.Examples.ConTest.TCtoPC_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.TCtoPC_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.TCtoPC_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.TCtoPC_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.TCtoPC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPCfunction.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPCfunction.mos deleted file mode 100644 index 72069fb1..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPCfunction.mos +++ /dev/null @@ -1,44 +0,0 @@ -// name: PNlib.Examples.ConTest.TCtoPCfunction -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.TCtoPCfunction); getErrorString(); - -vars := { - "P1.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.TCtoPCfunction_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.TCtoPCfunction.mat", - "PNlib.Examples.ConTest.TCtoPCfunction_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.TCtoPCfunction_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.TCtoPCfunction_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.TCtoPCfunction_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.TCtoPCfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroArcWeight.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroArcWeight.mos deleted file mode 100644 index de78f868..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroArcWeight.mos +++ /dev/null @@ -1,46 +0,0 @@ -// name: PNlib.Examples.ConTest.ZeroArcWeight -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.ZeroArcWeight); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.ZeroArcWeight_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.ZeroArcWeight.mat", - "PNlib.Examples.ConTest.ZeroArcWeight_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.ZeroArcWeight_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.ZeroArcWeight_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.ZeroArcWeight_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 12.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.ZeroArcWeight', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroPlace.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroPlace.mos deleted file mode 100644 index d2e2d247..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroPlace.mos +++ /dev/null @@ -1,48 +0,0 @@ -// name: PNlib.Examples.ConTest.ZeroPlace -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ConTest.ZeroPlace); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ConTest.ZeroPlace_res.mat", - "../../ReferenceFiles/PNlib.Examples.ConTest.ZeroPlace.mat", - "PNlib.Examples.ConTest.ZeroPlace_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ConTest.ZeroPlace_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.ZeroPlace_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ConTest.ZeroPlace_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.ZeroPlace', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneBaB.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneBaB.mos deleted file mode 100644 index 053d8734..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneBaB.mos +++ /dev/null @@ -1,61 +0,0 @@ -// name: PNlib.Examples.DisTest.ConflictBeneBaB -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.ConflictBeneBaB); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "P4.t", - "P5.t", - "P6.t", - "P7.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire", - "T4.active", - "T4.fire", - "T5.active", - "T5.fire", - "T6.active", - "T6.fire", - "T7.active", - "T7.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.ConflictBeneBaB_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictBeneBaB.mat", - "PNlib.Examples.DisTest.ConflictBeneBaB_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.ConflictBeneBaB_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictBeneBaB_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.ConflictBeneBaB_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.ConflictBeneBaB', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","P4.t","P5.t","P6.t","P7.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire","T4.active","T4.fire","T5.active","T5.fire","T6.active","T6.fire","T7.active","T7.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneGreedy.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneGreedy.mos deleted file mode 100644 index 8690bc60..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneGreedy.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.ConflictBeneGreedy -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.ConflictBeneGreedy); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.ConflictBeneGreedy_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictBeneGreedy.mat", - "PNlib.Examples.DisTest.ConflictBeneGreedy_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.ConflictBeneGreedy_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictBeneGreedy_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.ConflictBeneGreedy_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.ConflictBeneGreedy', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneQuotient.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneQuotient.mos deleted file mode 100644 index 0e5ed17c..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneQuotient.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.ConflictBeneQuotient -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.ConflictBeneQuotient); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.ConflictBeneQuotient_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictBeneQuotient.mat", - "PNlib.Examples.DisTest.ConflictBeneQuotient_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.ConflictBeneQuotient_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictBeneQuotient_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.ConflictBeneQuotient_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.ConflictBeneQuotient', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictPrio.mos deleted file mode 100644 index 5d6811a2..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictPrio.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.ConflictPrio -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.ConflictPrio); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.ConflictPrio_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictPrio.mat", - "PNlib.Examples.DisTest.ConflictPrio_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.ConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictPrio_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.ConflictPrio_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.ConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos deleted file mode 100644 index f54595d0..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.ConflictProb -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.ConflictProb); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.ConflictProb_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictProb.mat", - "PNlib.Examples.DisTest.ConflictProb_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.ConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictProb_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.ConflictProb_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.ConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.DisLoopAndArcweight.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.DisLoopAndArcweight.mos deleted file mode 100644 index 690266fb..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.DisLoopAndArcweight.mos +++ /dev/null @@ -1,44 +0,0 @@ -// name: PNlib.Examples.DisTest.DisLoopAndArcweight -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.DisLoopAndArcweight); getErrorString(); - -vars := { - "P1.t", - "T1.fire", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.DisLoopAndArcweight_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.DisLoopAndArcweight.mat", - "PNlib.Examples.DisTest.DisLoopAndArcweight_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.DisLoopAndArcweight_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.DisLoopAndArcweight_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.DisLoopAndArcweight_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.DisLoopAndArcweight', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.fire","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.EightConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.EightConflictProb.mos deleted file mode 100644 index ca7cc8f1..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.EightConflictProb.mos +++ /dev/null @@ -1,57 +0,0 @@ -// name: PNlib.Examples.DisTest.EightConflictProb -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.EightConflictProb); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire", - "T4.active", - "T4.fire", - "T5.active", - "T5.fire", - "T6.active", - "T6.fire", - "T7.active", - "T7.fire", - "T8.active", - "T8.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.EightConflictProb_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.EightConflictProb.mat", - "PNlib.Examples.DisTest.EightConflictProb_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.EightConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.EightConflictProb_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.EightConflictProb_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.EightConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire","T4.active","T4.fire","T5.active","T5.fire","T6.active","T6.fire","T7.active","T7.fire","T8.active","T8.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.FiveTimes.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.FiveTimes.mos deleted file mode 100644 index e311941a..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.FiveTimes.mos +++ /dev/null @@ -1,66 +0,0 @@ -// name: PNlib.Examples.DisTest.FiveTimes -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.FiveTimes); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "P4.t", - "P5.t", - "P6.t", - "P7.t", - "P8.t", - "P9.t", - "P10.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.fire", - "T3.fireIn", - "T3.fireOut", - "T3.activeIn", - "T3.activeOut", - "T4.active", - "T4.fire", - "T5.fire", - "T5.instantaneousSpeed", - "T5.maximumSpeed", - "T6.active", - "T6.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.FiveTimes_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.FiveTimes.mat", - "PNlib.Examples.DisTest.FiveTimes_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.FiveTimes_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.FiveTimes_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.FiveTimes_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.FiveTimes', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","P4.t","P5.t","P6.t","P7.t","P8.t","P9.t","P10.t","T1.active","T1.fire","T2.active","T2.fire","T3.fire","T3.fireIn","T3.fireOut","T3.activeIn","T3.activeOut","T4.active","T4.fire","T5.fire","T5.instantaneousSpeed","T5.maximumSpeed","T6.active","T6.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneBaB.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneBaB.mos deleted file mode 100644 index 2c220e8d..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneBaB.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.InputConflictBeneBaB -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.InputConflictBeneBaB); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.InputConflictBeneBaB_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictBeneBaB.mat", - "PNlib.Examples.DisTest.InputConflictBeneBaB_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.InputConflictBeneBaB_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictBeneBaB_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.InputConflictBeneBaB_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.InputConflictBeneBaB', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneGreedy.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneGreedy.mos deleted file mode 100644 index 816d2179..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneGreedy.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.InputConflictBeneGreedy -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.InputConflictBeneGreedy); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.InputConflictBeneGreedy_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictBeneGreedy.mat", - "PNlib.Examples.DisTest.InputConflictBeneGreedy_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.InputConflictBeneGreedy_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictBeneGreedy_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.InputConflictBeneGreedy_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.InputConflictBeneGreedy', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneQuotient.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneQuotient.mos deleted file mode 100644 index a73f1371..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneQuotient.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.InputConflictBeneQuotient -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.InputConflictBeneQuotient); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.InputConflictBeneQuotient_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictBeneQuotient.mat", - "PNlib.Examples.DisTest.InputConflictBeneQuotient_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.InputConflictBeneQuotient_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictBeneQuotient_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.InputConflictBeneQuotient_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.InputConflictBeneQuotient', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictPrio.mos deleted file mode 100644 index 1bee9796..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictPrio.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.InputConflictPrio -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.InputConflictPrio); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.InputConflictPrio_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictPrio.mat", - "PNlib.Examples.DisTest.InputConflictPrio_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.InputConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictPrio_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.InputConflictPrio_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.InputConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos deleted file mode 100644 index fa344c16..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos +++ /dev/null @@ -1,50 +0,0 @@ -// name: PNlib.Examples.DisTest.InputConflictProb -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.InputConflictProb); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.InputConflictProb_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictProb.mat", - "PNlib.Examples.DisTest.InputConflictProb_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.InputConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictProb_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.InputConflictProb_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.InputConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.NoInputConflict.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.NoInputConflict.mos deleted file mode 100644 index 7822e02f..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.NoInputConflict.mos +++ /dev/null @@ -1,45 +0,0 @@ -// name: PNlib.Examples.DisTest.NoInputConflict -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.NoInputConflict); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.NoInputConflict_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.NoInputConflict.mat", - "PNlib.Examples.DisTest.NoInputConflict_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.NoInputConflict_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.NoInputConflict_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.NoInputConflict_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.NoInputConflict', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire","T2.active","T2.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneBaB.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneBaB.mos deleted file mode 100644 index e9f2a308..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneBaB.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.OutputConflictBeneBaB -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.OutputConflictBeneBaB); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.OutputConflictBeneBaB_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictBeneBaB.mat", - "PNlib.Examples.DisTest.OutputConflictBeneBaB_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.OutputConflictBeneBaB_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictBeneBaB_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.OutputConflictBeneBaB_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.OutputConflictBeneBaB', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneGreedy.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneGreedy.mos deleted file mode 100644 index 0815c5f6..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneGreedy.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.OutputConflictBeneGreedy -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.OutputConflictBeneGreedy); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.OutputConflictBeneGreedy_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictBeneGreedy.mat", - "PNlib.Examples.DisTest.OutputConflictBeneGreedy_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.OutputConflictBeneGreedy_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictBeneGreedy_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.OutputConflictBeneGreedy_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.OutputConflictBeneGreedy', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneQuotient.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneQuotient.mos deleted file mode 100644 index ac03f850..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneQuotient.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.OutputConflictBeneQuotient -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.OutputConflictBeneQuotient); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.OutputConflictBeneQuotient_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictBeneQuotient.mat", - "PNlib.Examples.DisTest.OutputConflictBeneQuotient_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.OutputConflictBeneQuotient_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictBeneQuotient_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.OutputConflictBeneQuotient_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.OutputConflictBeneQuotient', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictPrio.mos deleted file mode 100644 index a46c7779..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictPrio.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.OutputConflictPrio -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.OutputConflictPrio); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.OutputConflictPrio_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictPrio.mat", - "PNlib.Examples.DisTest.OutputConflictPrio_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.OutputConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictPrio_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.OutputConflictPrio_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.OutputConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos deleted file mode 100644 index ca3835ec..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.DisTest.OutputConflictProb -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.OutputConflictProb); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.OutputConflictProb_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictProb.mat", - "PNlib.Examples.DisTest.OutputConflictProb_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.OutputConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictProb_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.OutputConflictProb_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.OutputConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTD.mos deleted file mode 100644 index 8aba8541..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTD.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.DisTest.PDtoTD -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.PDtoTD); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.PDtoTD_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.PDtoTD.mat", - "PNlib.Examples.DisTest.PDtoTD_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.PDtoTD_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.PDtoTD_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.PDtoTD_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.PDtoTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTDfunction.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTDfunction.mos deleted file mode 100644 index 3ee2e1b9..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTDfunction.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.DisTest.PDtoTDfunction -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.PDtoTDfunction); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.PDtoTDfunction_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.PDtoTDfunction.mat", - "PNlib.Examples.DisTest.PDtoTDfunction_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.PDtoTDfunction_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.PDtoTDfunction_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.PDtoTDfunction_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.PDtoTDfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTT.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTT.mos deleted file mode 100644 index 866e921b..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTT.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.DisTest.PDtoTT -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.PDtoTT); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.PDtoTT_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.PDtoTT.mat", - "PNlib.Examples.DisTest.PDtoTT_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.PDtoTT_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.PDtoTT_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.PDtoTT_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.PDtoTT', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.PrioTest.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.PrioTest.mos deleted file mode 100644 index 0cd19a39..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.PrioTest.mos +++ /dev/null @@ -1,55 +0,0 @@ -// name: PNlib.Examples.DisTest.ConflictPrio -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.PrioTest); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "P4.t", - "P5.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire", - "T4.active", - "T4.fire", - "T5.active", - "T5.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.PrioTest_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.PrioTest.mat", - "PNlib.Examples.DisTest.PrioTest_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.PrioTest_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.PrioTest_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.PrioTest_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.PrioTest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","P4.t","P5.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire","T4.active","T4.fire","T5.active","T5.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.SinglePD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.SinglePD.mos deleted file mode 100644 index 1743f183..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.SinglePD.mos +++ /dev/null @@ -1,41 +0,0 @@ -// name: PNlib.Examples.DisTest.SinglePD -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.SinglePD); getErrorString(); - -vars := { - "P1.t" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.SinglePD_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.SinglePD.mat", - "PNlib.Examples.DisTest.SinglePD_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.SinglePD_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.SinglePD_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.SinglePD_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.SinglePD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.SingleTD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.SingleTD.mos deleted file mode 100644 index 47c872ac..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.SingleTD.mos +++ /dev/null @@ -1,42 +0,0 @@ -// name: PNlib.Examples.DisTest.SingleTD -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.SingleTD); getErrorString(); - -vars := { - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.SingleTD_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.SingleTD.mat", - "PNlib.Examples.DisTest.SingleTD_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.SingleTD_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.SingleTD_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.SingleTD_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.SingleTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos deleted file mode 100644 index 18e84974..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos +++ /dev/null @@ -1,53 +0,0 @@ -// name: PNlib.Examples.DisTest.SixConflictProb -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.SixConflictProb); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire", - "T4.active", - "T4.fire", - "T5.active", - "T5.fire", - "T6.active", - "T6.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.SixConflictProb_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.SixConflictProb.mat", - "PNlib.Examples.DisTest.SixConflictProb_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.SixConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.SixConflictProb_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.SixConflictProb_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.SixConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire","T4.active","T4.fire","T5.active","T5.fire","T6.active","T6.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPD.mos deleted file mode 100644 index b2bef3e0..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPD.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.DisTest.TDtoPD -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.TDtoPD); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.TDtoPD_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.TDtoPD.mat", - "PNlib.Examples.DisTest.TDtoPD_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.TDtoPD_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.TDtoPD_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.TDtoPD_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TDtoPD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPDfunction.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPDfunction.mos deleted file mode 100644 index f721bee1..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPDfunction.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.DisTest.TDtoPDfunction -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.TDtoPDfunction); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.TDtoPDfunction_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.TDtoPDfunction.mat", - "PNlib.Examples.DisTest.TDtoPDfunction_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.TDtoPDfunction_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.TDtoPDfunction_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.TDtoPDfunction_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TDtoPDfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TEnoInput.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TEnoInput.mos deleted file mode 100644 index 41148fc7..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.TEnoInput.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.DisTest.TEnoInput -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.TEnoInput); getErrorString(); - -vars := { - "P1.t", - "T2.fire", - "T2.active" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.TEnoInput_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.TEnoInput.mat", - "PNlib.Examples.DisTest.TEnoInput_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.TEnoInput_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.TEnoInput_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.TEnoInput_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TEnoInput', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T2.fire","T2.active"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TEtest.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TEtest.mos deleted file mode 100644 index 8a02e55a..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.TEtest.mos +++ /dev/null @@ -1,46 +0,0 @@ -// name: PNlib.Examples.DisTest.TEtest -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.TEtest); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.fire", - "T1.active", - "T2.fire", - "T2.active" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.TEtest_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.TEtest.mat", - "PNlib.Examples.DisTest.TEtest_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.TEtest_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.TEtest_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.TEtest_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TEtest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.fire","T1.active","T2.fire","T2.active"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDinputConflict.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDinputConflict.mos deleted file mode 100644 index d8122d4d..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDinputConflict.mos +++ /dev/null @@ -1,53 +0,0 @@ -// name: PNlib.Examples.DisTest.TFDinputConflict -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.TFDinputConflict); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.fire", - "T1.fireIn", - "T1.fireOut", - "T1.activeIn", - "T1.activeOut", - "T2.fire", - "T2.active", - "T3.fire", - "T3.active", - "T4.fire", - "T4.active" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.TFDinputConflict_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.TFDinputConflict.mat", - "PNlib.Examples.DisTest.TFDinputConflict_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.TFDinputConflict_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.TFDinputConflict_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.TFDinputConflict_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TFDinputConflict', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.fire","T1.fireIn","T1.fireOut","T1.activeIn","T1.activeOut","T2.fire","T2.active","T3.fire","T3.active","T4.fire","T4.active"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutCap.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutCap.mos deleted file mode 100644 index c4ac83bf..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutCap.mos +++ /dev/null @@ -1,51 +0,0 @@ -// name: PNlib.Examples.DisTest.TFDoutCap -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.TFDoutCap); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.fire", - "T1.fireIn", - "T1.fireOut", - "T1.activeIn", - "T1.activeOut", - "T2.fire", - "T2.active", - "T3.fire", - "T3.active" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.TFDoutCap_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.TFDoutCap.mat", - "PNlib.Examples.DisTest.TFDoutCap_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.TFDoutCap_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.TFDoutCap_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.TFDoutCap_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TFDoutCap', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.fire","T1.fireIn","T1.fireOut","T1.activeIn","T1.activeOut","T2.fire","T2.active","T3.fire","T3.active"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutputConflict.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutputConflict.mos deleted file mode 100644 index ba089a53..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutputConflict.mos +++ /dev/null @@ -1,55 +0,0 @@ -// name: PNlib.Examples.DisTest.TFDoutputConflict -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.TFDoutputConflict); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.fireIn", - "T1.fireOut", - "T1.activeIn", - "T1.activeOut", - "T2.fire", - "T2.fireIn", - "T2.fireOut", - "T2.activeIn", - "T2.activeOut", - "T3.fire", - "T3.active" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.TFDoutputConflict_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.TFDoutputConflict.mat", - "PNlib.Examples.DisTest.TFDoutputConflict_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.TFDoutputConflict_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.TFDoutputConflict_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.TFDoutputConflict_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TFDoutputConflict', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.fireIn","T1.fireOut","T1.activeIn","T1.activeOut","T2.fire","T2.fireIn","T2.fireOut","T2.activeIn","T2.activeOut","T3.fire","T3.active"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDtest.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDtest.mos deleted file mode 100644 index 0120ba12..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDtest.mos +++ /dev/null @@ -1,47 +0,0 @@ -// name: PNlib.Examples.DisTest.TFDtest -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.TFDtest); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.fire", - "T1.fireIn", - "T1.fireOut", - "T1.activeIn", - "T1.activeOut" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.TFDtest_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.TFDtest.mat", - "PNlib.Examples.DisTest.TFDtest_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.TFDtest_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.TFDtest_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.TFDtest_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TFDtest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.fire","T1.fireIn","T1.fireOut","T1.activeIn","T1.activeOut"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TTcircle.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TTcircle.mos deleted file mode 100644 index ea7fe51c..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.TTcircle.mos +++ /dev/null @@ -1,46 +0,0 @@ -// name: PNlib.Examples.DisTest.TTcircle -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.TTcircle); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.TTcircle_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.TTcircle.mat", - "PNlib.Examples.DisTest.TTcircle_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.TTcircle_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.TTcircle_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.TTcircle_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TTcircle', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.active","T1.fire","T2.active","T2.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TTtoPD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TTtoPD.mos deleted file mode 100644 index eaf58cb1..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.TTtoPD.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.DisTest.TTtoPD -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.TTtoPD); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.TTtoPD_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.TTtoPD.mat", - "PNlib.Examples.DisTest.TTtoPD_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.TTtoPD_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.TTtoPD_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.TTtoPD_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TTtoPD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.Ttest.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.Ttest.mos deleted file mode 100644 index ee223ee3..00000000 --- a/Testing/OpenModelica/PNlib.Examples.DisTest.Ttest.mos +++ /dev/null @@ -1,52 +0,0 @@ -// name: PNlib.Examples.DisTest.Ttest -// keywords: PNlib, discrete -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.DisTest.Ttest); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "P4.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire", - "T4.active", - "T4.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.DisTest.Ttest_res.mat", - "../../ReferenceFiles/PNlib.Examples.DisTest.Ttest.mat", - "PNlib.Examples.DisTest.Ttest_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.DisTest.Ttest_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.Ttest_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.DisTest.Ttest_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.Ttest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","P4.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire","T4.active","T4.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC.mos deleted file mode 100644 index 75afd13a..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC.mos +++ /dev/null @@ -1,60 +0,0 @@ -// name: PNlib.Examples.ExtTest.ArcswithPCtoTC -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.ArcswithPCtoTC); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "P4.t", - "P5.t", - "P6.t", - "P7.t", - "P8.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed", - "T4.fire", - "T4.instantaneousSpeed", - "T4.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.ArcswithPCtoTC_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC.mat", - "PNlib.Examples.ExtTest.ArcswithPCtoTC_diff", vars=vars); getErrorString(); - - if success then - print("Files Equal!"); - else - filterSimulationResults("PNlib.Examples.ExtTest.ArcswithPCtoTC_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC_minimal.mat", vars, 0); getErrorString(); - end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.ArcswithPCtoTC_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.ArcswithPCtoTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","P4.t","P5.t","P6.t","P7.t","P8.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed","T4.fire","T4.instantaneousSpeed","T4.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC2.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC2.mos deleted file mode 100644 index 8ffef12f..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC2.mos +++ /dev/null @@ -1,63 +0,0 @@ -// name: PNlib.Examples.ExtTest.ArcswithPCtoTC2 -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.ArcswithPCtoTC2); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "P4.t", - "P5.t", - "P6.t", - "P7.t", - "P8.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed", - "T4.fire", - "T4.instantaneousSpeed", - "T4.maximumSpeed", - "T5.fire", - "T5.instantaneousSpeed", - "T5.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.ArcswithPCtoTC2_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC2.mat", - "PNlib.Examples.ExtTest.ArcswithPCtoTC2_diff", vars=vars); getErrorString(); - - if success then - print("Files Equal!"); - else - filterSimulationResults("PNlib.Examples.ExtTest.ArcswithPCtoTC2_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC2_minimal.mat", vars, 0); getErrorString(); - end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.ArcswithPCtoTC2_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.ArcswithPCtoTC2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","P4.t","P5.t","P6.t","P7.t","P8.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed","T4.fire","T4.instantaneousSpeed","T4.maximumSpeed","T5.fire","T5.instantaneousSpeed","T5.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mos deleted file mode 100644 index 79641e58..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mos +++ /dev/null @@ -1,63 +0,0 @@ -// name: PNlib.Examples.ExtTest.ArcswithPCtoTC3 -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.ArcswithPCtoTC3); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "P4.t", - "P5.t", - "P6.t", - "P7.t", - "P8.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed", - "T4.fire", - "T4.instantaneousSpeed", - "T4.maximumSpeed", - "T5.fire", - "T5.instantaneousSpeed", - "T5.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.ArcswithPCtoTC3_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mat", - "PNlib.Examples.ExtTest.ArcswithPCtoTC3_diff", vars=vars); getErrorString(); - - if success then - print("Files Equal!"); - else - filterSimulationResults("PNlib.Examples.ExtTest.ArcswithPCtoTC3_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC3_minimal.mat", vars, 0); getErrorString(); - end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.ArcswithPCtoTC3_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.ArcswithPCtoTC3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","P4.t","P5.t","P6.t","P7.t","P8.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed","T4.fire","T4.instantaneousSpeed","T4.maximumSpeed","T5.fire","T5.instantaneousSpeed","T5.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos deleted file mode 100644 index bc1ffa7c..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.ExtTest.DoubleArcwithPCtoTC -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.DoubleArcwithPCtoTC); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.DoubleArcwithPCtoTC_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mat", - "PNlib.Examples.ExtTest.DoubleArcwithPCtoTC_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.DoubleArcwithPCtoTC_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.DoubleArcwithPCtoTC_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.DoubleArcwithPCtoTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos deleted file mode 100644 index 03c39161..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos +++ /dev/null @@ -1,47 +0,0 @@ -// name: PNlib.Examples.ExtTest.DoubleArcwithPTtoTD -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.DoubleArcwithPTtoTD); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.DoubleArcwithPTtoTD_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mat", - "PNlib.Examples.ExtTest.DoubleArcwithPTtoTD_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.DoubleArcwithPTtoTD_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.DoubleArcwithPTtoTD_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.DoubleArcwithPTtoTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2.mos deleted file mode 100644 index 3ee75040..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2.mos +++ /dev/null @@ -1,47 +0,0 @@ -// name: PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2 -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2.mat", - "PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.IATest.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.IATest.mos deleted file mode 100644 index 375e422e..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.IATest.mos +++ /dev/null @@ -1,52 +0,0 @@ -// name: PNlib.Examples.ExtTest.IATest -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.IATest); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.IATest_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.IATest.mat", - "PNlib.Examples.ExtTest.IATest_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.IATest_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.IATest_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.IATest_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 6.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.IATest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPCtoTC.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPCtoTC.mos deleted file mode 100644 index bc416d74..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPCtoTC.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.ExtTest.IAwithPCtoTC -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.IAwithPCtoTC); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.IAwithPCtoTC_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.IAwithPCtoTC.mat", - "PNlib.Examples.ExtTest.IAwithPCtoTC_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.IAwithPCtoTC_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.IAwithPCtoTC_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.IAwithPCtoTC_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.IAwithPCtoTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD.mos deleted file mode 100644 index 694d8fc8..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD.mos +++ /dev/null @@ -1,47 +0,0 @@ -// name: PNlib.Examples.ExtTest.IAwithPDtoTD -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.IAwithPDtoTD); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.IAwithPDtoTD_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.IAwithPDtoTD.mat", - "PNlib.Examples.ExtTest.IAwithPDtoTD_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.IAwithPDtoTD_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.IAwithPDtoTD_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.IAwithPDtoTD_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.IAwithPDtoTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD2.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD2.mos deleted file mode 100644 index c9933cf9..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD2.mos +++ /dev/null @@ -1,47 +0,0 @@ -// name: PNlib.Examples.ExtTest.IAwithPDtoTD2 -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.IAwithPDtoTD2); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.IAwithPDtoTD2_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.IAwithPDtoTD2.mat", - "PNlib.Examples.ExtTest.IAwithPDtoTD2_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.IAwithPDtoTD2_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.IAwithPDtoTD2_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.IAwithPDtoTD2_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.IAwithPDtoTD2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.NoTokens.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.NoTokens.mos deleted file mode 100644 index af5208b0..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.NoTokens.mos +++ /dev/null @@ -1,50 +0,0 @@ -// name: PNlib.Examples.ExtTest.NoTokens -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.NoTokens); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "P4.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.NoTokens_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.NoTokens.mat", - "PNlib.Examples.ExtTest.NoTokens_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.NoTokens_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.NoTokens_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.NoTokens_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 12.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.NoTokens', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","P4.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TATest.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TATest.mos deleted file mode 100644 index 58f96991..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TATest.mos +++ /dev/null @@ -1,51 +0,0 @@ -// name: PNlib.Examples.ExtTest.TATest -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TATest); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TATest_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TATest.mat", - "PNlib.Examples.ExtTest.TATest_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TATest_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TATest_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TATest_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 6.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TATest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPCtoTC.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPCtoTC.mos deleted file mode 100644 index 2044ecf0..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPCtoTC.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.ExtTest.TAwithPCtoTC -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TAwithPCtoTC); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TAwithPCtoTC_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithPCtoTC.mat", - "PNlib.Examples.ExtTest.TAwithPCtoTC_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TAwithPCtoTC_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithPCtoTC_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TAwithPCtoTC_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TAwithPCtoTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD.mos deleted file mode 100644 index bfc03b4b..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD.mos +++ /dev/null @@ -1,47 +0,0 @@ -// name: PNlib.Examples.ExtTest.TAwithPDtoTD -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TAwithPDtoTD); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TAwithPDtoTD_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithPDtoTD.mat", - "PNlib.Examples.ExtTest.TAwithPDtoTD_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TAwithPDtoTD_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithPDtoTD_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TAwithPDtoTD_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TAwithPDtoTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD2.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD2.mos deleted file mode 100644 index 162311d9..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD2.mos +++ /dev/null @@ -1,47 +0,0 @@ -// name: PNlib.Examples.ExtTest.TAwithPDtoTD2 -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TAwithPDtoTD2); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TAwithPDtoTD2_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithPDtoTD2.mat", - "PNlib.Examples.ExtTest.TAwithPDtoTD2_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TAwithPDtoTD2_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithPDtoTD2_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TAwithPDtoTD2_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TAwithPDtoTD2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos deleted file mode 100644 index be830dd5..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos +++ /dev/null @@ -1,51 +0,0 @@ -// name: PNlib.Examples.ExtTest.TAwithWeaklyActivation -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TAwithWeaklyActivation); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TAwithWeaklyActivation_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mat", - "PNlib.Examples.ExtTest.TAwithWeaklyActivation_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TAwithWeaklyActivation_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithWeaklyActivation_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TAwithWeaklyActivation_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TAwithWeaklyActivation', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTest.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTest.mos deleted file mode 100644 index bcff9af4..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTest.mos +++ /dev/null @@ -1,45 +0,0 @@ -// name: PNlib.Examples.ExtTest.TDSTest -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TDSTest); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.active", - "T1.fire", - "T1.putFireTime" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TDSTest_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TDSTest.mat", - "PNlib.Examples.ExtTest.TDSTest_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TDSTest_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TDSTest_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TDSTest_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDSTest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.active","T1.fire","T1.putFireTime"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTestinterrupt.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTestinterrupt.mos deleted file mode 100644 index 475be464..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTestinterrupt.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.ExtTest.TDSTestinterrupt -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TDSTestinterrupt); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.active", - "T1.fire", - "T1.putFireTime", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TDSTestinterrupt_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TDSTestinterrupt.mat", - "PNlib.Examples.ExtTest.TDSTestinterrupt_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TDSTestinterrupt_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TDSTestinterrupt_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TDSTestinterrupt_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 8.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDSTestinterrupt', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.active","T1.fire","T1.putFireTime","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSdiscrete.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSdiscrete.mos deleted file mode 100644 index 8224cd2d..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSdiscrete.mos +++ /dev/null @@ -1,45 +0,0 @@ -// name: PNlib.Examples.ExtTest.TDSdiscrete -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TDSdiscrete); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.active", - "T1.fire", - "T1.putFireTime" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TDSdiscrete_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TDSdiscrete.mat", - "PNlib.Examples.ExtTest.TDSdiscrete_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TDSdiscrete_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TDSdiscrete_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TDSdiscrete_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 60.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDSdiscrete', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.active","T1.fire","T1.putFireTime"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStriangular.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStriangular.mos deleted file mode 100644 index 891bd230..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStriangular.mos +++ /dev/null @@ -1,45 +0,0 @@ -// name: PNlib.Examples.ExtTest.TDStriangular -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TDStriangular); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.active", - "T1.fire", - "T1.putFireTime" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TDStriangular_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TDStriangular.mat", - "PNlib.Examples.ExtTest.TDStriangular_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TDStriangular_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TDStriangular_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TDStriangular_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDStriangular', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.active","T1.fire","T1.putFireTime"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStruncatednormal.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStruncatednormal.mos deleted file mode 100644 index c50a934f..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStruncatednormal.mos +++ /dev/null @@ -1,45 +0,0 @@ -// name: PNlib.Examples.ExtTest.TDStruncatednormal -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TDStruncatednormal); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.active", - "T1.fire", - "T1.putFireTime" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TDStruncatednormal_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TDStruncatednormal.mat", - "PNlib.Examples.ExtTest.TDStruncatednormal_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TDStruncatednormal_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TDStruncatednormal_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TDStruncatednormal_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDStruncatednormal', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.active","T1.fire","T1.putFireTime"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSuniform.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSuniform.mos deleted file mode 100644 index 34d7e5a0..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSuniform.mos +++ /dev/null @@ -1,45 +0,0 @@ -// name: PNlib.Examples.ExtTest.TDSuniform -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TDSuniform); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.active", - "T1.fire", - "T1.putFireTime" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TDSuniform_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TDSuniform.mat", - "PNlib.Examples.ExtTest.TDSuniform_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TDSuniform_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TDSuniform_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TDSuniform_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 20.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDSuniform', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.active","T1.fire","T1.putFireTime"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TESTest.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TESTest.mos deleted file mode 100644 index 3984b4de..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TESTest.mos +++ /dev/null @@ -1,47 +0,0 @@ -// name: PNlib.Examples.ExtTest.TESTest -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TESTest); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.active", - "T1.fire", - "T1.putFireTime", - "T2.active", - "T2.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TESTest_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TESTest.mat", - "PNlib.Examples.ExtTest.TESTest_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TESTest_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TESTest_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TESTest_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TESTest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.active","T1.fire","T1.putFireTime","T2.active","T2.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TFDStest.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TFDStest.mos deleted file mode 100644 index edc35565..00000000 --- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TFDStest.mos +++ /dev/null @@ -1,48 +0,0 @@ -// name: PNlib.Examples.ExtTest.TFDStest -// keywords: PNlib, continuous -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.ExtTest.TFDStest); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "T1.fire", - "T1.fireIn", - "T1.fireOut", - "T1.activeIn", - "T1.activeOut", - "T1.putDuration" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.ExtTest.TFDStest_res.mat", - "../../ReferenceFiles/PNlib.Examples.ExtTest.TFDStest.mat", - "PNlib.Examples.ExtTest.TFDStest_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.ExtTest.TFDStest_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TFDStest_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.ExtTest.TFDStest_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TFDStest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","T1.fire","T1.fireIn","T1.fireOut","T1.activeIn","T1.activeOut","T1.putDuration"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictPrio.mos deleted file mode 100644 index 9c61d5f2..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictPrio.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.HybTest.ConflictPrio -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.ConflictPrio); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.ConflictPrio_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictPrio.mat", - "PNlib.Examples.HybTest.ConflictPrio_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.ConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictPrio_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.ConflictPrio_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.ConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictProb.mos deleted file mode 100644 index dda11e87..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictProb.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.HybTest.ConflictProb -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.ConflictProb); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.ConflictProb_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictProb.mat", - "PNlib.Examples.HybTest.ConflictProb_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.ConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictProb_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.ConflictProb_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.ConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType3.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType3.mos deleted file mode 100644 index 48773b18..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType3.mos +++ /dev/null @@ -1,51 +0,0 @@ -// name: PNlib.Examples.HybTest.ConflictType3 -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.ConflictType3); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.active", - "T2.fire", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.ConflictType3_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictType3.mat", - "PNlib.Examples.HybTest.ConflictType3_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.ConflictType3_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictType3_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.ConflictType3_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.ConflictType3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.active","T2.fire","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType4.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType4.mos deleted file mode 100644 index a028c9a9..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType4.mos +++ /dev/null @@ -1,51 +0,0 @@ -// name: PNlib.Examples.HybTest.ConflictType4 -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.ConflictType4); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "P4.t", - "P5.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.fire", - "T2.instantaneousSpeed", - "T2.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.ConflictType4_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictType4.mat", - "PNlib.Examples.HybTest.ConflictType4_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.ConflictType4_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictType4_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.ConflictType4_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.ConflictType4', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","P4.t","P5.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.EightConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.EightConflictProb.mos deleted file mode 100644 index 699dce0b..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.EightConflictProb.mos +++ /dev/null @@ -1,57 +0,0 @@ -// name: PNlib.Examples.HybTest.EightConflictProb -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.EightConflictProb); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire", - "T4.active", - "T4.fire", - "T5.active", - "T5.fire", - "T6.active", - "T6.fire", - "T7.active", - "T7.fire", - "T8.active", - "T8.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.EightConflictProb_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.EightConflictProb.mat", - "PNlib.Examples.HybTest.EightConflictProb_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.EightConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.EightConflictProb_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.EightConflictProb_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.EightConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire","T4.active","T4.fire","T5.active","T5.fire","T6.active","T6.fire","T7.active","T7.fire","T8.active","T8.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.HybLoopAndArcweight.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.HybLoopAndArcweight.mos deleted file mode 100644 index fce43a3e..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.HybLoopAndArcweight.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.HybTest.HybLoopAndArcweight -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.HybLoopAndArcweight); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.HybLoopAndArcweight_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.HybLoopAndArcweight.mat", - "PNlib.Examples.HybTest.HybLoopAndArcweight_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.HybLoopAndArcweight_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.HybLoopAndArcweight_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.HybLoopAndArcweight_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.HybLoopAndArcweight', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictPrio.mos deleted file mode 100644 index 4c1fc7af..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictPrio.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.HybTest.InputConflictPrio -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.InputConflictPrio); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.InputConflictPrio_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictPrio.mat", - "PNlib.Examples.HybTest.InputConflictPrio_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.InputConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictPrio_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.InputConflictPrio_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.InputConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictProb.mos deleted file mode 100644 index b0b6f882..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictProb.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.HybTest.InputConflictProb -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.InputConflictProb); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.InputConflictProb_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictProb.mat", - "PNlib.Examples.HybTest.InputConflictProb_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.InputConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictProb_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.InputConflictProb_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.InputConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictType3.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictType3.mos deleted file mode 100644 index 767e5e57..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictType3.mos +++ /dev/null @@ -1,51 +0,0 @@ -// name: PNlib.Examples.HybTest.InputConflictType3 -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.InputConflictType3); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.active", - "T2.fire", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.InputConflictType3_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictType3.mat", - "PNlib.Examples.HybTest.InputConflictType3_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.InputConflictType3_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictType3_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.InputConflictType3_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.InputConflictType3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.active","T2.fire","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictPrio.mos deleted file mode 100644 index 9c2e6acf..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictPrio.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.HybTest.OutputConflictPrio -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.OutputConflictPrio); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.OutputConflictPrio_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictPrio.mat", - "PNlib.Examples.HybTest.OutputConflictPrio_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.OutputConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictPrio_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.OutputConflictPrio_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.OutputConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictProb.mos deleted file mode 100644 index c6d14b15..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictProb.mos +++ /dev/null @@ -1,49 +0,0 @@ -// name: PNlib.Examples.HybTest.OutputConflictProb -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.OutputConflictProb); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.OutputConflictProb_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictProb.mat", - "PNlib.Examples.HybTest.OutputConflictProb_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.OutputConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictProb_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.OutputConflictProb_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.OutputConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictType3.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictType3.mos deleted file mode 100644 index 700c5d30..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictType3.mos +++ /dev/null @@ -1,51 +0,0 @@ -// name: PNlib.Examples.HybTest.OutputConflictType3 -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.OutputConflictType3); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed", - "T2.active", - "T2.fire", - "T3.fire", - "T3.instantaneousSpeed", - "T3.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.OutputConflictType3_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictType3.mat", - "PNlib.Examples.HybTest.OutputConflictType3_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.OutputConflictType3_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictType3_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.OutputConflictType3_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.OutputConflictType3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.active","T2.fire","T3.fire","T3.instantaneousSpeed","T3.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTD.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTD.mos deleted file mode 100644 index dc43a7d8..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTD.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.HybTest.PCtoTD -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.PCtoTD); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.PCtoTD_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.PCtoTD.mat", - "PNlib.Examples.HybTest.PCtoTD_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.PCtoTD_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.PCtoTD_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.PCtoTD_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.PCtoTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTDfunction.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTDfunction.mos deleted file mode 100644 index c9d94af9..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTDfunction.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.HybTest.PCtoTDfunction -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.PCtoTDfunction); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.PCtoTDfunction_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.PCtoTDfunction.mat", - "PNlib.Examples.HybTest.PCtoTDfunction_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.PCtoTDfunction_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.PCtoTDfunction_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.PCtoTDfunction_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.PCtoTDfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.SixConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.SixConflictProb.mos deleted file mode 100644 index 68d8fa2b..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.SixConflictProb.mos +++ /dev/null @@ -1,53 +0,0 @@ -// name: PNlib.Examples.HybTest.SixConflictProb -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.SixConflictProb); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire", - "T2.active", - "T2.fire", - "T3.active", - "T3.fire", - "T4.active", - "T4.fire", - "T5.active", - "T5.fire", - "T6.active", - "T6.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.SixConflictProb_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.SixConflictProb.mat", - "PNlib.Examples.HybTest.SixConflictProb_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.SixConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.SixConflictProb_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.SixConflictProb_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.SixConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire","T2.active","T2.fire","T3.active","T3.fire","T4.active","T4.fire","T5.active","T5.fire","T6.active","T6.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.TCwithPD.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.TCwithPD.mos deleted file mode 100644 index 47b57841..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.TCwithPD.mos +++ /dev/null @@ -1,46 +0,0 @@ -// name: PNlib.Examples.HybTest.TCwithPD -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.TCwithPD); getErrorString(); - -vars := { - "P1.t", - "P2.t", - "P3.t", - "T1.fire", - "T1.instantaneousSpeed", - "T1.maximumSpeed" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.TCwithPD_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.TCwithPD.mat", - "PNlib.Examples.HybTest.TCwithPD_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.TCwithPD_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.TCwithPD_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.TCwithPD_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.TCwithPD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPC.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPC.mos deleted file mode 100644 index 4f92f2ab..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPC.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.HybTest.TDtoPC -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.TDtoPC); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.TDtoPC_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.TDtoPC.mat", - "PNlib.Examples.HybTest.TDtoPC_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.TDtoPC_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.TDtoPC_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.TDtoPC_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.TDtoPC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPCfunction.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPCfunction.mos deleted file mode 100644 index 5e490f52..00000000 --- a/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPCfunction.mos +++ /dev/null @@ -1,43 +0,0 @@ -// name: PNlib.Examples.HybTest.TDtoPCfunction -// keywords: PNlib, hybrid -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.HybTest.TDtoPCfunction); getErrorString(); - -vars := { - "P1.t", - "T1.active", - "T1.fire" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.HybTest.TDtoPCfunction_res.mat", - "../../ReferenceFiles/PNlib.Examples.HybTest.TDtoPCfunction.mat", - "PNlib.Examples.HybTest.TDtoPCfunction_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.HybTest.TDtoPCfunction_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.TDtoPCfunction_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.HybTest.TDtoPCfunction_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.TDtoPCfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","T1.active","T1.fire"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos b/Testing/OpenModelica/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos deleted file mode 100644 index 7999f56a..00000000 --- a/Testing/OpenModelica/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos +++ /dev/null @@ -1,53 +0,0 @@ -// name: PNlib.Examples.Models.BicoloredPlaces.Aquarium -// keywords: PNlib, colored places -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.Models.BicoloredPlaces.Aquarium); getErrorString(); - -vars := { - "P1.t", - "P1.color[1]", - "P1.color[2]", - "P2.t", - "P2.color[1]", - "P2.color[2]", - "t1.fire", - "t1.instantaneousSpeed", - "t1.maximumSpeed", - "t2.fire", - "t2.instantaneousSpeed", - "t2.maximumSpeed", - "ratio" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.Models.BicoloredPlaces.Aquarium_res.mat", - "../../ReferenceFiles/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mat", - "PNlib.Examples.Models.BicoloredPlaces.Aquarium_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.Models.BicoloredPlaces.Aquarium_res.mat", "../../ReferenceFiles/PNlib.Examples.Models.BicoloredPlaces.Aquarium_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.Models.BicoloredPlaces.Aquarium_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 40.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.Models.BicoloredPlaces.Aquarium', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"P1.t","P1.color[1]","P1.color[2]","P2.t","P2.color[1]","P2.color[2]","t1.fire","t1.instantaneousSpeed","t1.maximumSpeed","t2.fire","t2.instantaneousSpeed","t2.maximumSpeed","ratio"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station1.mos b/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station1.mos deleted file mode 100644 index b4ea9d2d..00000000 --- a/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station1.mos +++ /dev/null @@ -1,56 +0,0 @@ -// name: PNlib.Examples.Models.FiliP.ModellStationen.Station1 -// keywords: PNlib, colored places -// status: correct - -loadFile("../../PNlib/package.mo"); getErrorString(); -simulate(PNlib.Examples.Models.FiliP.ModellStationen.Station1); getErrorString(); - -vars := { - "pflegekraft.HatFruehDienst", - "pflegekraft.HatSpaetDienst", - "pflegekraft.HatNachtDienst", - "pflegekraft.IstKrank", - "pflegekraft.HatUrlaubt", - "pflegekraft.HatWochenende", - "pflegekraft.HatRuhezeit", - "pflegekraft.Dienstfaehig", - "pflegekraft.ArbeitszeitKontingentPlanungsPeriode", - "pflegekraft.GeleisteteArbeistzeitGesammt", - "station.BesetzungFruehDienst", - "station.BesetzungSpaetDienst", - "station.BesetzungNachtDienst", - "station.BesetzungsDefizitFrueh", - "station.BesetzungsDefizitSpaet", - "station.BesetzungsDefizitNacht" -}; - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.Models.FiliP.ModellStationen.Station1_res.mat", - "../../ReferenceFiles/PNlib.Examples.Models.FiliP.ModellStationen.Station1.mat", - "PNlib.Examples.Models.FiliP.ModellStationen.Station1_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.Models.FiliP.ModellStationen.Station1_res.mat", "../../ReferenceFiles/PNlib.Examples.Models.FiliP.ModellStationen.Station1_minimal.mat", vars, 0); getErrorString(); -end if; - -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.Models.FiliP.ModellStationen.Station1_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 365.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.Models.FiliP.ModellStationen.Station1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"pflegekraft.HatFruehDienst","pflegekraft.HatSpaetDienst","pflegekraft.HatNachtDienst","pflegekraft.IstKrank","pflegekraft.HatUrlaubt","pflegekraft.HatWochenende","pflegekraft.HatRuhezeit","pflegekraft.Dienstfaehig","pflegekraft.ArbeitszeitKontingentPlanungsPeriode","pflegekraft.GeleisteteArbeistzeitGesammt","station.BesetzungFruehDienst","station.BesetzungSpaetDienst","station.BesetzungNachtDienst","station.BesetzungsDefizitFrueh","station.BesetzungsDefizitSpaet","station.BesetzungsDefizitNacht"} -// -// "" -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station7.mos b/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station7.mos deleted file mode 100644 index af21d762..00000000 --- a/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station7.mos +++ /dev/null @@ -1,133 +0,0 @@ -// name: PNlib.Examples.Models.FiliP.ModellStationen.Station7 -// keywords: PNlib, colored places -// status: correct - - - -/*varsfilter := { - "pflegekraft1.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt"+ - "pflegekraft2.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt"+ - "pflegekraft3.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt"+ - "pflegekraft4.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt"+ - "pflegekraft5.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt"+ - "pflegekraft6.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt"+ - "pflegekraft7.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt"+ - "station.BesetzungFruehDienst+BesetzungSpaetDienst+BesetzungNachtDienst+BesetzungsDefizit" -};*/ - - - -loadFile("../../PNlib/package.mo"); getErrorString(); -/*simulate(PNlib.Examples.Models.FiliP.ModellStationen.Station7, startTime=0.0, stopTime=100.0, tolerance=1e-06, variableFilter=pflegekraft1.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt+pflegekraft2.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt+pflegekraft3.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt+pflegekraft4.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt+pflegekraft5.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt+pflegekraft6.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt+pflegekraft7.HatFruehDienst+HatSpaetDienst+HatNachtDienst+IstKrank+HatUrlaubt+HatWochenende+HatRuhezeit+Dienstfaehig+ArbeitszeitKontingentPlanungsPeriode+GeleisteteArbeistzeitGesammt+station.BesetzungFruehDienst+BesetzungSpaetDienst+BesetzungNachtDienst+BesetzungsDefizit); getErrorString();*/ - -simulate(PNlib.Examples.Models.FiliP.ModellStationen.Station7, startTime=0.0, stopTime=365.0, tolerance=1e-06/*, variableFilter=varsfilter*/); getErrorString(); - - -vars := { - "pflegekraft1.HatFruehDienst", - "pflegekraft1.HatSpaetDienst", - "pflegekraft1.HatNachtDienst", - "pflegekraft1.IstKrank", - "pflegekraft1.HatUrlaubt", - "pflegekraft1.HatWochenende", - "pflegekraft1.HatRuhezeit", - "pflegekraft1.Dienstfaehig", - "pflegekraft1.ArbeitszeitKontingentPlanungsPeriode", - "pflegekraft1.GeleisteteArbeistzeitGesammt", - "pflegekraft2.HatFruehDienst", - "pflegekraft2.HatSpaetDienst", - "pflegekraft2.HatNachtDienst", - "pflegekraft2.IstKrank", - "pflegekraft2.HatUrlaubt", - "pflegekraft2.HatWochenende", - "pflegekraft2.HatRuhezeit", - "pflegekraft2.Dienstfaehig", - "pflegekraft2.ArbeitszeitKontingentPlanungsPeriode", - "pflegekraft2.GeleisteteArbeistzeitGesammt", - "pflegekraft3.HatFruehDienst", - "pflegekraft3.HatSpaetDienst", - "pflegekraft3.HatNachtDienst", - "pflegekraft3.IstKrank", - "pflegekraft3.HatUrlaubt", - "pflegekraft3.HatWochenende", - "pflegekraft3.HatRuhezeit", - "pflegekraft3.Dienstfaehig", - "pflegekraft3.ArbeitszeitKontingentPlanungsPeriode", - "pflegekraft3.GeleisteteArbeistzeitGesammt", - "pflegekraft4.HatFruehDienst", - "pflegekraft4.HatSpaetDienst", - "pflegekraft4.HatNachtDienst", - "pflegekraft4.IstKrank", - "pflegekraft4.HatUrlaubt", - "pflegekraft4.HatWochenende", - "pflegekraft4.HatRuhezeit", - "pflegekraft4.Dienstfaehig", - "pflegekraft4.ArbeitszeitKontingentPlanungsPeriode", - "pflegekraft4.GeleisteteArbeistzeitGesammt", - "pflegekraft5.HatFruehDienst", - "pflegekraft5.HatSpaetDienst", - "pflegekraft5.HatNachtDienst", - "pflegekraft5.IstKrank", - "pflegekraft5.HatUrlaubt", - "pflegekraft5.HatWochenende", - "pflegekraft5.HatRuhezeit", - "pflegekraft5.Dienstfaehig", - "pflegekraft5.ArbeitszeitKontingentPlanungsPeriode", - "pflegekraft5.GeleisteteArbeistzeitGesammt", - "pflegekraft6.HatFruehDienst", - "pflegekraft6.HatSpaetDienst", - "pflegekraft6.HatNachtDienst", - "pflegekraft6.IstKrank", - "pflegekraft6.HatUrlaubt", - "pflegekraft6.HatWochenende", - "pflegekraft6.HatRuhezeit", - "pflegekraft6.Dienstfaehig", - "pflegekraft6.ArbeitszeitKontingentPlanungsPeriode", - "pflegekraft6.GeleisteteArbeistzeitGesammt", - "pflegekraft7.HatFruehDienst", - "pflegekraft7.HatSpaetDienst", - "pflegekraft7.HatNachtDienst", - "pflegekraft7.IstKrank", - "pflegekraft7.HatUrlaubt", - "pflegekraft7.HatWochenende", - "pflegekraft7.HatRuhezeit", - "pflegekraft7.Dienstfaehig", - "pflegekraft7.ArbeitszeitKontingentPlanungsPeriode", - "pflegekraft7.GeleisteteArbeistzeitGesammt", - "station.BesetzungFruehDienst", - "station.BesetzungSpaetDienst", - "station.BesetzungNachtDienst", - "station.BesetzungsDefizit" -}; - - -(success, failVars) := OpenModelica.Scripting.diffSimulationResults("PNlib.Examples.Models.FiliP.ModellStationen.Station7_res.mat", - "../../ReferenceFiles/PNlib.Examples.Models.FiliP.ModellStationen.Station7.mat", - "PNlib.Examples.Models.FiliP.ModellStationen.Station7_diff", vars=vars); getErrorString(); - -if success then - print("Files Equal!"); -else - filterSimulationResults("PNlib.Examples.Models.FiliP.ModellStationen.Station7_res.mat", "../../ReferenceFiles/PNlib.Examples.Models.FiliP.ModellStationen.Station7_minimal.mat", vars, 0); getErrorString(); -end if; -// Result: -// true -// "Notification: Automatically loaded package Modelica 4.0.0 due to uses annotation from PNlib. -// Notification: Automatically loaded package Complex 4.0.0 due to uses annotation from Modelica. -// Notification: Automatically loaded package ModelicaServices 4.0.0 due to uses annotation from Modelica. -// " -// record SimulationResult -// resultFile = "PNlib.Examples.Models.FiliP.ModellStationen.Station7_res.mat", -// simulationOptions = "startTime = 0.0, stopTime = 365.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.Models.FiliP.ModellStationen.Station7', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''", -// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. -// LOG_SUCCESS | info | The simulation finished successfully. -// " -// end SimulationResult; -// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->Show additional information from the initialization process, in OMNotebook call setCommandLineOptions(\"-d=initialization\"). -// " -// {"pflegekraft1.HatFruehDienst","pflegekraft1.HatSpaetDienst","pflegekraft1.HatNachtDienst","pflegekraft1.IstKrank","pflegekraft1.HatUrlaubt","pflegekraft1.HatWochenende","pflegekraft1.HatRuhezeit","pflegekraft1.Dienstfaehig","pflegekraft1.ArbeitszeitKontingentPlanungsPeriode","pflegekraft1.GeleisteteArbeistzeitGesammt","pflegekraft2.HatFruehDienst","pflegekraft2.HatSpaetDienst","pflegekraft2.HatNachtDienst","pflegekraft2.IstKrank","pflegekraft2.HatUrlaubt","pflegekraft2.HatWochenende","pflegekraft2.HatRuhezeit","pflegekraft2.Dienstfaehig","pflegekraft2.ArbeitszeitKontingentPlanungsPeriode","pflegekraft2.GeleisteteArbeistzeitGesammt","pflegekraft3.HatFruehDienst","pflegekraft3.HatSpaetDienst","pflegekraft3.HatNachtDienst","pflegekraft3.IstKrank","pflegekraft3.HatUrlaubt","pflegekraft3.HatWochenende","pflegekraft3.HatRuhezeit","pflegekraft3.Dienstfaehig","pflegekraft3.ArbeitszeitKontingentPlanungsPeriode","pflegekraft3.GeleisteteArbeistzeitGesammt","pflegekraft4.HatFruehDienst","pflegekraft4.HatSpaetDienst","pflegekraft4.HatNachtDienst","pflegekraft4.IstKrank","pflegekraft4.HatUrlaubt","pflegekraft4.HatWochenende","pflegekraft4.HatRuhezeit","pflegekraft4.Dienstfaehig","pflegekraft4.ArbeitszeitKontingentPlanungsPeriode","pflegekraft4.GeleisteteArbeistzeitGesammt","pflegekraft5.HatFruehDienst","pflegekraft5.HatSpaetDienst","pflegekraft5.HatNachtDienst","pflegekraft5.IstKrank","pflegekraft5.HatUrlaubt","pflegekraft5.HatWochenende","pflegekraft5.HatRuhezeit","pflegekraft5.Dienstfaehig","pflegekraft5.ArbeitszeitKontingentPlanungsPeriode","pflegekraft5.GeleisteteArbeistzeitGesammt","pflegekraft6.HatFruehDienst","pflegekraft6.HatSpaetDienst","pflegekraft6.HatNachtDienst","pflegekraft6.IstKrank","pflegekraft6.HatUrlaubt","pflegekraft6.HatWochenende","pflegekraft6.HatRuhezeit","pflegekraft6.Dienstfaehig","pflegekraft6.ArbeitszeitKontingentPlanungsPeriode","pflegekraft6.GeleisteteArbeistzeitGesammt","pflegekraft7.HatFruehDienst","pflegekraft7.HatSpaetDienst","pflegekraft7.HatNachtDienst","pflegekraft7.IstKrank","pflegekraft7.HatUrlaubt","pflegekraft7.HatWochenende","pflegekraft7.HatRuhezeit","pflegekraft7.Dienstfaehig","pflegekraft7.ArbeitszeitKontingentPlanungsPeriode","pflegekraft7.GeleisteteArbeistzeitGesammt","station.BesetzungFruehDienst","station.BesetzungSpaetDienst","station.BesetzungNachtDienst","station.BesetzungsDefizit"} -// -// "Error: Failed to open simulation result /mnt/c/Users/lenna/Repositories/PNlib/Testing/OpenModelica/../../ReferenceFiles/PNlib.Examples.Models.FiliP.ModellStationen.Station7.mat: No such file or directory -// " -// Files Equal! -// endResult diff --git a/Testing/OpenModelica/rtest b/Testing/OpenModelica/rtest deleted file mode 100755 index db85c004..00000000 --- a/Testing/OpenModelica/rtest +++ /dev/null @@ -1,435 +0,0 @@ -#!/usr/bin/perl -w - -use Cwd; -use File::Temp qw/ tempfile /; - -#delete($ENV{'OPENMODELICALIBRARY'}); -if (defined $ENV{"RTEST_OMCFLAGS"}) { - $omcflags=$ENV{"RTEST_OMCFLAGS"}; -} else { - $omcflags=""; -} - -(undef,$testTempFile) = tempfile("rtest$$.XXXXX", TMPDIR => 1, SUFFIX => ".tmp", UNLINK => 1); -$cwd = getcwd; -if ($cwd =~ m/(.*)PNlib\/(.+)$/) { - $OPENMODELICAHOME=$ENV{'OPENMODELICAHOME'}; - $dirname=$2; -} else { - print "You must run rtest from the PNlib (was run from $cwd)\n"; - exit 0; -} - -# Windows (MinGW) prints 3 digits exponent ( vs *nix 2) by default -# and perl prints them as mismatches if there are other actual mismatches. -# makes actual testsuite mismatches harder to find -# print only 2 exponent digits -$ENV{'PRINTF_EXPONENT_DIGITS'} = 2; - -$successes=0; -$total=0; -$setbaseline=0; -$verbose="yes"; -$returnwitherror=0; -$pager="cat"; -$diffcmd="diff -U 5 -w"; -$dwdiffcmd="dwdiff '-d()' -l -C 3 -c -L"; -$log=""; -$tmpdir = "/tmp/omc-rtest-".(getpwuid($<)||getlogin()||"unknown")."/$dirname"; -$tmpdir =~ s/\s/_/g; -system "mkdir -p $tmpdir"; -$got = "$tmpdir/equations-got"; -$expected = "$tmpdir/equations-expected"; -$difference = "$tmpdir/equations-diff"; -$baseline = "$tmpdir/baseline"; -@keys = (); -$collectkeys = 0; -$collectcases = 0; -%knownkeys = (); -$filearg = 0; -$status = 0; -$statusfilter = "all"; -$eps_mo = 1.0e-7; -$eps_mos = 5e-3; -$set_modelica_lib = 1; -$nodelete = 0; -$OMCEXE = "omc"; - -sub ulimit_cmd -{ - my $stack_size = shift; - if ($ENV{'OMDEV'}) { - return ""; - } - if ($stack_size eq "") { - return ""; - } - return "ulimit -s $stack_size ; "; -} - -# Creates a baseline, i.e. the stores the actual result as the expected result -sub setbaselineone -{ - my $mismatch = 0; - my ($f,%info) = @_; - my $setup_command = $info{"setup_command"}; - my $cflags = $info{"cflags"}; - my $env = $info{"env"}; - my $teardown_command = $info{"teardown_command"}; - my $stack_size = $info{"stack_size"}; - my $ulimit = ulimit_cmd($stack_size); - - $log = "$tmpdir/log-$f"; - system "rm -f $log"; - if ($setup_command) { - if ( system "$setup_command" ) { - print "== Failed to set baseline for $f (system $setup_command failed)"; - return 1; - } - } - if (!$cflags) { - $cflags = ""; - } - if (!$env) { - $env = ""; - } - if ($ENV{'OMDEV'}) { - $env =~ s/:/\\;/g; - } - unlink "$testTempFile$f"; - system "$env $ulimit $OPENMODELICAHOME/bin/$OMCEXE --running-testsuite=$testTempFile$f +locale=C $omcflags $cflags $f >>$log 2>&1"; - if ($nodelete == 0 && open(TOREMOVE,"<$testTempFile$f")) { - while(my $line = ) { - $line =~ s/^\s*(.*?)\s*$/$1/; - unlink $line; - } - } - unlink "$testTempFile$f"; - if ($teardown_command) { - system $teardown_command; - } - - open(RES,">$baseline"); - open(LOG,"<$log"); - open(SRC,"<$f"); - - while() { - if (/^\/\/ Result:/../^\/\/ endResult/) { - - } else { - my $x = $_; - $x =~ s/^ *\/\/ *Result:/\/\/ Result:/; - print RES "$x"; - } - } - print RES "// Result:\n"; - while() { - my $x = $_; - if ($x ne "\n") { - print RES "// $x"; - } else { - print RES "//\n"; - } - } - print RES "// endResult\n"; - close RES; - close LOG; - close SRC; - print "Set baseline for ";print $f;print "\n"; - - open(SRC,"<$baseline"); - open(DST,">$f"); - # write in bin-mode to force LF instead of CRLF on windows! - binmode(DST); - - while() { - $_ =~ s/[\n\r]$//g; - print DST "$_\x{0A}"; - } - close DST; - - return 0; -} - -sub runone -{ - my $retval = 0; - my $mismatch = 0; - my ($f,%info) = @_; - my $setup_command = $info{"setup_command"}; - my $cflags = $info{"cflags"}; - my $env = $info{"env"}; - my $teardown_command = $info{"teardown_command"}; - my $stack_size = $info{"stack_size"}; - my $ulimit = ulimit_cmd($stack_size); - my $start_t = time; - - $log = "$tmpdir/log-$f"; - system "rm -f $log"; - if ($setup_command) { - if ( system "$setup_command >>$log 2>&1" ) { - print " setup_command failed"; - return 1; - } - } - if (!$cflags) { - $cflags = ""; - } - if (!$env) { - $env = ""; - } - if ($ENV{'OMDEV'}) { - $env =~ s/:/\\;/g; - } - unlink "$testTempFile$f"; - system "$env $ulimit $OPENMODELICAHOME/bin/$OMCEXE --running-testsuite=$testTempFile$f +locale=C $omcflags $cflags $f >>$log 2>&1"; - $retval = $?; - if ($nodelete==0 && open(TOREMOVE,"<$testTempFile$f")) { - while(my $line = ) { - $line =~ s/^\s*(.*?)\s*$/$1/; - unlink $line; - } - } - unlink "$testTempFile$f"; - if ($teardown_command) { - system "$teardown_command >>$log 2>&1"; - } - my $end_t = time-$start_t; - - if ($info{"status"} eq "erroneous") { - print "erroneous\n"; - return 0; - } - - if ( $retval != 0 ) { - if ($info{"status"} eq "correct") { - print "execution failed\n"; - return 1; - } - } elsif ($info{"status"} ne "correct") { - print "this test should have failed\n"; - return 1; - } - - # Extract the result - open(RES,">$got"); - open(LOG,"<$log"); - while() { - s/^[ \t]*//; - s/[ \t]+/ /; - print RES $_; - } - close LOG; - close RES; - - # Compare - my $epsilon; - if ($f =~ /mos$/) { - $epsilon = $eps_mos; - } else { - $epsilon = $eps_mo; - } - system "$OPENMODELICAHOME/bin/omc-diff $epsilon $expected $got > $difference"; - - if ( $? != 0 ) { - print "equation mismatch [time:$end_t]\n"; - ## make a newline - system "echo '' >> $log"; - system "echo Equation mismatch: diff says: >> $log"; - system "$diffcmd $expected $got >> $log"; - - ## make a newline - system "echo '' >> $log"; - system "echo Equation mismatch: omc-diff says: >> $log"; - system "cat $difference >> $log"; - return 1; - } - - print "ok [time:$end_t]\n"; - return 0; -} - -sub dofile -{ - my $f = shift; - my %info = ("status" => "unknown", - "name" => $f, - "keywords" => "unknown", - "setup_command" => "", - "cflags" => "", - "env" => "", - "teardown_command" => "", - "stack_size" => ""); - $log = "$tmpdir/log-$f"; - $tc_err = 1; - # Find the expected result - open(OUT,">$expected"); - open(IN,"<$f"); - while() { - # @adrpo - uncomment for debugging - # print ($_); - if (/^\/\/ Result:/../^\/\/ endResult/) { - s/^[ \t]*//; - s/^\/\/ Result://; - s/^\/\/ endResult//; - s/[ \t]+/ /; - if (/^\/\/ /) { - print OUT substr($_,3); - } elsif (/^\/\/$/) { - print OUT substr($_,2); - } elsif ($tc_err == 0) { - print "Error in testcase: $f\n"; - $tc_err = 1; - } - } elsif (/^\/\/[ \\|]*([a-z_]*):[ \\|]*([^\012\015\n\r]*)/) { - # @adrpo - uncomment for debugging - # print "Noticed: $1 = $2\n"; - # $info{$1} = $value; - if($1 ne "env" or $set_modelica_lib) { - $info{$1} = $2; - } - } - } - close IN; - close OUT; - - # Check for keyword match - if ($#keys >=0) { - my %ks; - for (split(/ *, */,$info{"keywords"})) { $ks{$_} = 1; } - for (@keys) { - if (! $ks{$_}) { - return 0; - } - } - } - - # Check for status match - if ($statusfilter ne "all") { - if ($info{"status"} ne $statusfilter) { - return 0; - } - } - - # Collecting files - if ($collectcases) { - if ($info{'status'} ne "unknown") { - print $info{'name'}."\n"; - } - return 0; - } - - # Collecting keys? - if ($collectkeys) { - if ($info{"keywords"}) { - for (split(/ *, */, $info{"keywords"})) { - if (!$knownkeys{$_}) { - $knownkeys{$_} = 1; - } else { - $knownkeys{$_} += 1; - } - } - } - return 0; - } - - if (!$setbaseline) { - printf(" %s %-82s... ", - $info{'status'} eq 'correct'?'+':'-', $info{'name'}); - } - $total = $total + 1; - - if ( $info{"status"} !~ /^(erroneous|(in|)correct)$/ ) { - print "unknown testcase status\n"; - return 1; - } - - if ($setbaseline) { - setbaselineone $f,%info; - $status = 0; - } else { - $status = runone $f,%info; - } - - if ($status == 0) { - $successes = $successes + 1; - } else { - if ($verbose eq "yes" ) { - print "\n"; - print "==== Log $log\n"; - system "$pager $log"; - } - } -} - -$start_t = time; -while ($#ARGV >= 0) { - $arg = shift(@ARGV); - - if ($arg =~ m/^\+/) { - $omcflags .= " $arg"; - } elsif ($arg =~ m"^--with-omc=(.*)$") { - $OMCEXE="$1"; - } elsif ($arg eq "--return-with-error-code") { - $returnwitherror=1; - } elsif ($arg eq "-v") { - $verbose="yes"; - } elsif ($arg eq "-b") { - $setbaseline = 1; - } elsif ($arg eq "-c") { - $diffcmd = $dwdiffcmd - } elsif ($arg eq "-nodelete") { - $nodelete = 1; - } elsif ($arg eq "-p") { - if ($ENV{"PAGER"} eq "") { - $pager="more"; - } else { - $pager=$ENV{"PAGER"}; - } - } elsif ($arg eq "-k") { - if ($#ARGV < 0) { - print "-m needs an argument\n"; - exit 1; - } - @keys = split(/,/,shift(@ARGV)); - } elsif ($arg eq "-s") { - if ($#ARGV < 0) { - print "-s needs an argument\n"; - exit 1; - } - $statusfilter = shift; - } elsif ($arg eq "-l") { - $collectkeys = 1; - } elsif ($arg eq "-L") { - $collectcases = 1; - } elsif ($arg eq "-nolib") { - $set_modelica_lib = 0; - } else { - $filearg = 1; - dofile $arg; - } -} -$end_t = time-$start_t; - -# Check for no file args -# adrpo: 2013-11-13 DO NOT RUN ALL MOS IF NO FILES ARE GIVEN! -if ($filearg == 0) { -# for (glob '*.mos ') { dofile $_; } - print "No test files given at command line!\n"; - exit 0; -} - -# Final output. Statistics and stuff -if ($collectkeys || $collectcases) { - for (sort(keys %knownkeys)) { - printf " %3d %s\n", $knownkeys{$_}, $_; - } -} elsif ($setbaseline) { - printf "\n== set new baseline for %d tests\n",$total; -} else { - printf "\n== %d out of %d tests failed [%s, time: %d]\n", $total-$successes, $total, $dirname, $end_t; -} - -if ($returnwitherror && $total!=$successes) { - exit 1; -} From 4ce2863a0667b0ca1782a90126e1d219e33cae6b Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:04:50 +0100 Subject: [PATCH 02/12] Fixing version, adding deploy --- .github/workflows/Test.yml | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 53e599cb..18094c19 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -10,7 +10,7 @@ on: tags: 'v*' jobs: - linux: + test: runs-on: ubuntu-latest timeout-minutes: 60 strategy: @@ -37,7 +37,7 @@ jobs: Modelica 4.0.0 omc-diff: true - - uses: OpenModelica/openmodelica-library-testing@v0.1 + - uses: OpenModelica/openmodelica-library-testing@v0.1.0 with: library: 'PNlib' library-version: '2.2' @@ -47,3 +47,28 @@ jobs: reference-files-extension: 'mat' reference-files-delimiter: '.' pages-root-url: 'https://anheuermann.github.io/pnlib/' + + deploy: + needs: test + permissions: + contents: write + if: ${{ always() }} + concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession. + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Get HTML artifact + uses: actions/download-artifact@v4 + with: + path: html-artifacts/ + pattern: '*.html' + merge-multiple: true + + - name: Deploy 🚀 + uses: JamesIves/github-pages-deploy-action@v4 + with: + folder: html-artifacts/ + branch: gh-pages From 2d101bc26fd5089a9426dc388f6480604a9325e5 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:07:58 +0100 Subject: [PATCH 03/12] Fixing action name --- .github/workflows/Test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 18094c19..086f03bc 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -37,7 +37,8 @@ jobs: Modelica 4.0.0 omc-diff: true - - uses: OpenModelica/openmodelica-library-testing@v0.1.0 + - name: openmodelica-library-testing + uses: OpenModelica/openmodelica-library-testing-action@v0.1.0 with: library: 'PNlib' library-version: '2.2' From a72151d8485feaf98133a97e3ead8e2fe8594c1c Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:51:24 +0100 Subject: [PATCH 04/12] Fixing ci --- .github/workflows/Test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 086f03bc..a7b968b7 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -30,7 +30,7 @@ jobs: - name: Setup OpenModelica uses: OpenModelica/setup-openmodelica@v1 with: - version: stable + version: ${{ matrix.omc-version }} packages: | omc libraries: | @@ -40,14 +40,14 @@ jobs: - name: openmodelica-library-testing uses: OpenModelica/openmodelica-library-testing-action@v0.1.0 with: - library: 'PNlib' + library: PNlib library-version: '2.2' - modelica-file: 'PNlib/package.mo' - omc-version: 'stable' - reference-files-dir: 'ReferenceFiles' - reference-files-extension: 'mat' - reference-files-delimiter: '.' - pages-root-url: 'https://anheuermann.github.io/pnlib/' + modelica-file: PNlib/package.mo + omc-version: ${{ matrix.omc-version }} + reference-files-dir: ReferenceFiles + reference-files-extension: mat + reference-files-delimiter: . + pages-root-url: https://anheuermann.github.io/PNlib/ deploy: needs: test From 2f4977a8c51800b4bf9c773dcdeb61849b49f198 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:35:44 +0100 Subject: [PATCH 05/12] Adding 3-Clause BSD --- .github/CODEOWNERS | 5 +++++ .github/workflows/Test.yml | 4 ++-- LICENSE | 26 ++++++++++++++++++++++++++ README.md | 4 +--- 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 .github/CODEOWNERS create mode 100644 LICENSE diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..a93e1dca --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,5 @@ +# Each line is a file pattern followed by one or more owners. + +# License changes +*license* +*LICENSE+ @bernhardbachmann diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index a7b968b7..76beee4b 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -15,7 +15,7 @@ jobs: timeout-minutes: 60 strategy: matrix: - omc-version: ['1.18', 'stable', 'nightly'] + omc-version: ['stable', 'nightly'] fail-fast: false steps: @@ -38,7 +38,7 @@ jobs: omc-diff: true - name: openmodelica-library-testing - uses: OpenModelica/openmodelica-library-testing-action@v0.1.0 + uses: OpenModelica/openmodelica-library-testing-action@main with: library: PNlib library-version: '2.2' diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..a0a3217e --- /dev/null +++ b/LICENSE @@ -0,0 +1,26 @@ +Copyright 2013 - 2024 Sabrina Proß, Lennart Ochel, Timo Lask, Bernhard Bachmann + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/README.md b/README.md index 11552b21..bc52b847 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,7 @@ Download [PNlib v2.2 (2019-10-24)][release-v-2-2] ## License -This Modelica package is free software and the use is completely at your own -risk; it can be redistributed and/or modified under the terms of the -[Modelica License 2][license-link]. +This package is licensed with the [3-Clause BSD License](./LICENSE). ## Development and contribution From 1c30b0b89ebe07f7377be36f32975ad7467c173f Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:44:50 +0100 Subject: [PATCH 06/12] Stuff --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bc52b847..f5c16b8b 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,10 @@ Download [PNlib v2.2 (2019-10-24)][release-v-2-2] ## Compatibility * Works in OpenModelica (latest release) - ([trend][trend-img], - [coverage](http://libraries.openmodelica.org/branches/master/PNlib/PNlib.html)) + + ![Pnlib omc-master](https://libraries.openmodelica.org/branches/history/master/PNlib.svg) + + Latest [Coverage][coverage-link] with OpenModelica. * Works in Dymola 2017/2019/2020 ## License @@ -60,6 +62,6 @@ You may report feedback, issues or feature-requests using [test-link]: https://github.com/AMIT-HSBI/PNlib/actions/workflows/Test.yml [pnlib-img]: PNlib/Resources/Images/iconsxHPN.png "xHPN: Extended Hybrid PetriNets" [release-v-2-2]: https://github.com/AMIT-HSBI/PNlib/releases/tag/v2.2 -[trend-img]: http://libraries.openmodelica.org/branches/history/master/PNlib.svg +[coverage-link]: http://libraries.openmodelica.org/branches/master/PNlib/PNlib.html [license-link]: https://modelica.org/licenses/ModelicaLicense2 [issues]: https://github.com/AMIT-HSBI/PNlib/issues From 669158bd1054fc48d8b89712f9776d9d76e6f4f3 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:45:52 +0100 Subject: [PATCH 07/12] change root url to hsbi --- .github/workflows/Test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 76beee4b..c96ab1e8 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -47,7 +47,7 @@ jobs: reference-files-dir: ReferenceFiles reference-files-extension: mat reference-files-delimiter: . - pages-root-url: https://anheuermann.github.io/PNlib/ + pages-root-url: https://amit-hsbi.github.io/PNlib/ deploy: needs: test From 942da3bb28386d3bbf4a7d167a0222b3a90d9eb5 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:48:20 +0100 Subject: [PATCH 08/12] Fix version --- .github/workflows/Test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index c96ab1e8..bae41984 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -15,7 +15,7 @@ jobs: timeout-minutes: 60 strategy: matrix: - omc-version: ['stable', 'nightly'] + omc-version: ['stable'] fail-fast: false steps: @@ -38,7 +38,7 @@ jobs: omc-diff: true - name: openmodelica-library-testing - uses: OpenModelica/openmodelica-library-testing-action@main + uses: OpenModelica/openmodelica-library-testing-action@v0.1.0 with: library: PNlib library-version: '2.2' From f78140954faab738e9cb525786af2e4cb63baa0c Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:54:17 +0100 Subject: [PATCH 09/12] Fixing CODEOWNERS --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a93e1dca..c88bab57 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ # Each line is a file pattern followed by one or more owners. # License changes -*license* -*LICENSE+ @bernhardbachmann +*license* @bernhardbachmann +*LICENSE* @bernhardbachmann From 5dd6ef77a1a5f0e11b83accc6962b8818d96f4e5 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Fri, 2 Feb 2024 08:31:17 +0100 Subject: [PATCH 10/12] Updating reference file --- ...PNlib.Examples.ExtTest.ArcswithPCtoTC3.mat | Bin 99251 -> 78787 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mat b/ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mat index 5bd4d045b671cda71090b92c578afe3d1f2f98a8..edeec5d923eae987d99c0fc4266aa71e26afe4b8 100644 GIT binary patch literal 78787 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 U1BwR}4=5f`JfL{s|B?s(6T}O&$^ZZW literal 99251 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 Date: Fri, 2 Feb 2024 08:32:06 +0100 Subject: [PATCH 11/12] No deploy, doesn't work with forks --- .github/workflows/Test.yml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index bae41984..c17b22e8 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -48,28 +48,3 @@ jobs: reference-files-extension: mat reference-files-delimiter: . pages-root-url: https://amit-hsbi.github.io/PNlib/ - - deploy: - needs: test - permissions: - contents: write - if: ${{ always() }} - concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession. - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Get HTML artifact - uses: actions/download-artifact@v4 - with: - path: html-artifacts/ - pattern: '*.html' - merge-multiple: true - - - name: Deploy 🚀 - uses: JamesIves/github-pages-deploy-action@v4 - with: - folder: html-artifacts/ - branch: gh-pages From 5b606258bc0160b30ba89b23b704e24ecdb92017 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Fri, 2 Feb 2024 10:50:51 +0100 Subject: [PATCH 12/12] Revert rtest removal --- .github/workflows/Test.yml | 2 +- Testing/Dymola/Makefile | 2 +- Testing/rtrest | 435 +++++++++++++++++++++++++++++++++++++ 3 files changed, 437 insertions(+), 2 deletions(-) create mode 100644 Testing/rtrest diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index c17b22e8..9498eb9c 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -47,4 +47,4 @@ jobs: reference-files-dir: ReferenceFiles reference-files-extension: mat reference-files-delimiter: . - pages-root-url: https://amit-hsbi.github.io/PNlib/ + diff --git a/Testing/Dymola/Makefile b/Testing/Dymola/Makefile index ac52ab0c..33530f72 100644 --- a/Testing/Dymola/Makefile +++ b/Testing/Dymola/Makefile @@ -1,4 +1,4 @@ -TEST = ./../OpenModelica/rtest -v +TEST = ../rtest -v DYMOLA = Dymola TESTFILES = \ diff --git a/Testing/rtrest b/Testing/rtrest new file mode 100644 index 00000000..db85c004 --- /dev/null +++ b/Testing/rtrest @@ -0,0 +1,435 @@ +#!/usr/bin/perl -w + +use Cwd; +use File::Temp qw/ tempfile /; + +#delete($ENV{'OPENMODELICALIBRARY'}); +if (defined $ENV{"RTEST_OMCFLAGS"}) { + $omcflags=$ENV{"RTEST_OMCFLAGS"}; +} else { + $omcflags=""; +} + +(undef,$testTempFile) = tempfile("rtest$$.XXXXX", TMPDIR => 1, SUFFIX => ".tmp", UNLINK => 1); +$cwd = getcwd; +if ($cwd =~ m/(.*)PNlib\/(.+)$/) { + $OPENMODELICAHOME=$ENV{'OPENMODELICAHOME'}; + $dirname=$2; +} else { + print "You must run rtest from the PNlib (was run from $cwd)\n"; + exit 0; +} + +# Windows (MinGW) prints 3 digits exponent ( vs *nix 2) by default +# and perl prints them as mismatches if there are other actual mismatches. +# makes actual testsuite mismatches harder to find +# print only 2 exponent digits +$ENV{'PRINTF_EXPONENT_DIGITS'} = 2; + +$successes=0; +$total=0; +$setbaseline=0; +$verbose="yes"; +$returnwitherror=0; +$pager="cat"; +$diffcmd="diff -U 5 -w"; +$dwdiffcmd="dwdiff '-d()' -l -C 3 -c -L"; +$log=""; +$tmpdir = "/tmp/omc-rtest-".(getpwuid($<)||getlogin()||"unknown")."/$dirname"; +$tmpdir =~ s/\s/_/g; +system "mkdir -p $tmpdir"; +$got = "$tmpdir/equations-got"; +$expected = "$tmpdir/equations-expected"; +$difference = "$tmpdir/equations-diff"; +$baseline = "$tmpdir/baseline"; +@keys = (); +$collectkeys = 0; +$collectcases = 0; +%knownkeys = (); +$filearg = 0; +$status = 0; +$statusfilter = "all"; +$eps_mo = 1.0e-7; +$eps_mos = 5e-3; +$set_modelica_lib = 1; +$nodelete = 0; +$OMCEXE = "omc"; + +sub ulimit_cmd +{ + my $stack_size = shift; + if ($ENV{'OMDEV'}) { + return ""; + } + if ($stack_size eq "") { + return ""; + } + return "ulimit -s $stack_size ; "; +} + +# Creates a baseline, i.e. the stores the actual result as the expected result +sub setbaselineone +{ + my $mismatch = 0; + my ($f,%info) = @_; + my $setup_command = $info{"setup_command"}; + my $cflags = $info{"cflags"}; + my $env = $info{"env"}; + my $teardown_command = $info{"teardown_command"}; + my $stack_size = $info{"stack_size"}; + my $ulimit = ulimit_cmd($stack_size); + + $log = "$tmpdir/log-$f"; + system "rm -f $log"; + if ($setup_command) { + if ( system "$setup_command" ) { + print "== Failed to set baseline for $f (system $setup_command failed)"; + return 1; + } + } + if (!$cflags) { + $cflags = ""; + } + if (!$env) { + $env = ""; + } + if ($ENV{'OMDEV'}) { + $env =~ s/:/\\;/g; + } + unlink "$testTempFile$f"; + system "$env $ulimit $OPENMODELICAHOME/bin/$OMCEXE --running-testsuite=$testTempFile$f +locale=C $omcflags $cflags $f >>$log 2>&1"; + if ($nodelete == 0 && open(TOREMOVE,"<$testTempFile$f")) { + while(my $line = ) { + $line =~ s/^\s*(.*?)\s*$/$1/; + unlink $line; + } + } + unlink "$testTempFile$f"; + if ($teardown_command) { + system $teardown_command; + } + + open(RES,">$baseline"); + open(LOG,"<$log"); + open(SRC,"<$f"); + + while() { + if (/^\/\/ Result:/../^\/\/ endResult/) { + + } else { + my $x = $_; + $x =~ s/^ *\/\/ *Result:/\/\/ Result:/; + print RES "$x"; + } + } + print RES "// Result:\n"; + while() { + my $x = $_; + if ($x ne "\n") { + print RES "// $x"; + } else { + print RES "//\n"; + } + } + print RES "// endResult\n"; + close RES; + close LOG; + close SRC; + print "Set baseline for ";print $f;print "\n"; + + open(SRC,"<$baseline"); + open(DST,">$f"); + # write in bin-mode to force LF instead of CRLF on windows! + binmode(DST); + + while() { + $_ =~ s/[\n\r]$//g; + print DST "$_\x{0A}"; + } + close DST; + + return 0; +} + +sub runone +{ + my $retval = 0; + my $mismatch = 0; + my ($f,%info) = @_; + my $setup_command = $info{"setup_command"}; + my $cflags = $info{"cflags"}; + my $env = $info{"env"}; + my $teardown_command = $info{"teardown_command"}; + my $stack_size = $info{"stack_size"}; + my $ulimit = ulimit_cmd($stack_size); + my $start_t = time; + + $log = "$tmpdir/log-$f"; + system "rm -f $log"; + if ($setup_command) { + if ( system "$setup_command >>$log 2>&1" ) { + print " setup_command failed"; + return 1; + } + } + if (!$cflags) { + $cflags = ""; + } + if (!$env) { + $env = ""; + } + if ($ENV{'OMDEV'}) { + $env =~ s/:/\\;/g; + } + unlink "$testTempFile$f"; + system "$env $ulimit $OPENMODELICAHOME/bin/$OMCEXE --running-testsuite=$testTempFile$f +locale=C $omcflags $cflags $f >>$log 2>&1"; + $retval = $?; + if ($nodelete==0 && open(TOREMOVE,"<$testTempFile$f")) { + while(my $line = ) { + $line =~ s/^\s*(.*?)\s*$/$1/; + unlink $line; + } + } + unlink "$testTempFile$f"; + if ($teardown_command) { + system "$teardown_command >>$log 2>&1"; + } + my $end_t = time-$start_t; + + if ($info{"status"} eq "erroneous") { + print "erroneous\n"; + return 0; + } + + if ( $retval != 0 ) { + if ($info{"status"} eq "correct") { + print "execution failed\n"; + return 1; + } + } elsif ($info{"status"} ne "correct") { + print "this test should have failed\n"; + return 1; + } + + # Extract the result + open(RES,">$got"); + open(LOG,"<$log"); + while() { + s/^[ \t]*//; + s/[ \t]+/ /; + print RES $_; + } + close LOG; + close RES; + + # Compare + my $epsilon; + if ($f =~ /mos$/) { + $epsilon = $eps_mos; + } else { + $epsilon = $eps_mo; + } + system "$OPENMODELICAHOME/bin/omc-diff $epsilon $expected $got > $difference"; + + if ( $? != 0 ) { + print "equation mismatch [time:$end_t]\n"; + ## make a newline + system "echo '' >> $log"; + system "echo Equation mismatch: diff says: >> $log"; + system "$diffcmd $expected $got >> $log"; + + ## make a newline + system "echo '' >> $log"; + system "echo Equation mismatch: omc-diff says: >> $log"; + system "cat $difference >> $log"; + return 1; + } + + print "ok [time:$end_t]\n"; + return 0; +} + +sub dofile +{ + my $f = shift; + my %info = ("status" => "unknown", + "name" => $f, + "keywords" => "unknown", + "setup_command" => "", + "cflags" => "", + "env" => "", + "teardown_command" => "", + "stack_size" => ""); + $log = "$tmpdir/log-$f"; + $tc_err = 1; + # Find the expected result + open(OUT,">$expected"); + open(IN,"<$f"); + while() { + # @adrpo - uncomment for debugging + # print ($_); + if (/^\/\/ Result:/../^\/\/ endResult/) { + s/^[ \t]*//; + s/^\/\/ Result://; + s/^\/\/ endResult//; + s/[ \t]+/ /; + if (/^\/\/ /) { + print OUT substr($_,3); + } elsif (/^\/\/$/) { + print OUT substr($_,2); + } elsif ($tc_err == 0) { + print "Error in testcase: $f\n"; + $tc_err = 1; + } + } elsif (/^\/\/[ \\|]*([a-z_]*):[ \\|]*([^\012\015\n\r]*)/) { + # @adrpo - uncomment for debugging + # print "Noticed: $1 = $2\n"; + # $info{$1} = $value; + if($1 ne "env" or $set_modelica_lib) { + $info{$1} = $2; + } + } + } + close IN; + close OUT; + + # Check for keyword match + if ($#keys >=0) { + my %ks; + for (split(/ *, */,$info{"keywords"})) { $ks{$_} = 1; } + for (@keys) { + if (! $ks{$_}) { + return 0; + } + } + } + + # Check for status match + if ($statusfilter ne "all") { + if ($info{"status"} ne $statusfilter) { + return 0; + } + } + + # Collecting files + if ($collectcases) { + if ($info{'status'} ne "unknown") { + print $info{'name'}."\n"; + } + return 0; + } + + # Collecting keys? + if ($collectkeys) { + if ($info{"keywords"}) { + for (split(/ *, */, $info{"keywords"})) { + if (!$knownkeys{$_}) { + $knownkeys{$_} = 1; + } else { + $knownkeys{$_} += 1; + } + } + } + return 0; + } + + if (!$setbaseline) { + printf(" %s %-82s... ", + $info{'status'} eq 'correct'?'+':'-', $info{'name'}); + } + $total = $total + 1; + + if ( $info{"status"} !~ /^(erroneous|(in|)correct)$/ ) { + print "unknown testcase status\n"; + return 1; + } + + if ($setbaseline) { + setbaselineone $f,%info; + $status = 0; + } else { + $status = runone $f,%info; + } + + if ($status == 0) { + $successes = $successes + 1; + } else { + if ($verbose eq "yes" ) { + print "\n"; + print "==== Log $log\n"; + system "$pager $log"; + } + } +} + +$start_t = time; +while ($#ARGV >= 0) { + $arg = shift(@ARGV); + + if ($arg =~ m/^\+/) { + $omcflags .= " $arg"; + } elsif ($arg =~ m"^--with-omc=(.*)$") { + $OMCEXE="$1"; + } elsif ($arg eq "--return-with-error-code") { + $returnwitherror=1; + } elsif ($arg eq "-v") { + $verbose="yes"; + } elsif ($arg eq "-b") { + $setbaseline = 1; + } elsif ($arg eq "-c") { + $diffcmd = $dwdiffcmd + } elsif ($arg eq "-nodelete") { + $nodelete = 1; + } elsif ($arg eq "-p") { + if ($ENV{"PAGER"} eq "") { + $pager="more"; + } else { + $pager=$ENV{"PAGER"}; + } + } elsif ($arg eq "-k") { + if ($#ARGV < 0) { + print "-m needs an argument\n"; + exit 1; + } + @keys = split(/,/,shift(@ARGV)); + } elsif ($arg eq "-s") { + if ($#ARGV < 0) { + print "-s needs an argument\n"; + exit 1; + } + $statusfilter = shift; + } elsif ($arg eq "-l") { + $collectkeys = 1; + } elsif ($arg eq "-L") { + $collectcases = 1; + } elsif ($arg eq "-nolib") { + $set_modelica_lib = 0; + } else { + $filearg = 1; + dofile $arg; + } +} +$end_t = time-$start_t; + +# Check for no file args +# adrpo: 2013-11-13 DO NOT RUN ALL MOS IF NO FILES ARE GIVEN! +if ($filearg == 0) { +# for (glob '*.mos ') { dofile $_; } + print "No test files given at command line!\n"; + exit 0; +} + +# Final output. Statistics and stuff +if ($collectkeys || $collectcases) { + for (sort(keys %knownkeys)) { + printf " %3d %s\n", $knownkeys{$_}, $_; + } +} elsif ($setbaseline) { + printf "\n== set new baseline for %d tests\n",$total; +} else { + printf "\n== %d out of %d tests failed [%s, time: %d]\n", $total-$successes, $total, $dirname, $end_t; +} + +if ($returnwitherror && $total!=$successes) { + exit 1; +}