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/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..c88bab57 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,5 @@ +# Each line is a file pattern followed by one or more owners. + +# License changes +*license* @bernhardbachmann +*LICENSE* @bernhardbachmann diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index cb4e0b53..9498eb9c 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -1,41 +1,50 @@ 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' + runs-on: ubuntu-latest timeout-minutes: 60 + strategy: + matrix: + omc-version: ['stable'] + fail-fast: false steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v4 - - name: "Set up OpenModelica Compiler" - uses: AnHeuermann/setup-openmodelica@v0.6 + - name: Setup Python 3 + uses: actions/setup-python@v5 with: - version: 'stable' + python-version: '3.10' + + - name: Setup OpenModelica + uses: OpenModelica/setup-openmodelica@v1 + with: + version: ${{ matrix.omc-version }} 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 + - name: openmodelica-library-testing + uses: OpenModelica/openmodelica-library-testing-action@v0.1.0 with: - name: openmodelica.log - path: Testing/openmodelica.log + library: PNlib + library-version: '2.2' + modelica-file: PNlib/package.mo + omc-version: ${{ matrix.omc-version }} + reference-files-dir: ReferenceFiles + reference-files-extension: mat + reference-files-delimiter: . - - 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 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 a6d53517..f5c16b8b 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) + + ![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 -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 package is licensed with the [3-Clause BSD License](./LICENSE). ## 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 +[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 diff --git a/ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mat b/ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mat index 5bd4d045..edeec5d9 100644 Binary files a/ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mat and b/ReferenceFiles/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mat differ 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/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/rtrest old mode 100755 new mode 100644 similarity index 100% rename from Testing/OpenModelica/rtest rename to Testing/rtrest