diff --git a/PNlib/UsersGuide/Contact.mo b/PNlib/UsersGuide/Contact.mo index bdffd423..e359fef4 100644 --- a/PNlib/UsersGuide/Contact.mo +++ b/PNlib/UsersGuide/Contact.mo @@ -32,20 +32,20 @@ model Contact S. Proß
- mailto: sabrina.pross@fh-bielefeld.de
- University of Applied Sciences Bielefeld
- Department of engineering and mathematics
- 33609 Bielefeld
+ mailto: sabrina.pross@hsbi.de
+ Hochschule Bielefeld University of Applied Sciences and Arts (HSBI)
+ Faculty of Engineering and Mathematics
+ 33619 Bielefeld
Germany B. Bachmann
- mailto: bernhard.bachmann@fh-bielefeld.de
- University of Applied Sciences Bielefeld
- Department of engineering and mathematics
- 33609 Bielefeld
+ mailto: bernhard.bachmann@hsbi.de
+ Hochschule Bielefeld University of Applied Sciences and Arts (HSBI)
+ Faculty of Engineering and Mathematics
+ 33619 Bielefeld
Germany diff --git a/PNlib/UsersGuide/RevisionHistory.mo b/PNlib/UsersGuide/RevisionHistory.mo index ca941982..7060326a 100644 --- a/PNlib/UsersGuide/RevisionHistory.mo +++ b/PNlib/UsersGuide/RevisionHistory.mo @@ -93,6 +93,19 @@ model RevisionHistory
  • Minor bug fixes
    • + + + 3.0.0 + 2024-02-03 + Philip Hannebohm, Andreas Heuermann + + ")); end RevisionHistory; diff --git a/PNlib/UsersGuide/UserGuide.mo b/PNlib/UsersGuide/UserGuide.mo index a6b24c0f..49328fd0 100644 --- a/PNlib/UsersGuide/UserGuide.mo +++ b/PNlib/UsersGuide/UserGuide.mo @@ -148,8 +148,8 @@ This conflict can be solved by prioritization of the transitions. If T1 takes pr

    PNlib: A Modelica Library for Modeling xHPN

    Compatibility

    The advanced Petri Net library, called PNlib, enables the modeling of extended hybrid Petri Nets (xHPN). It comprises

    @@ -311,8 +311,8 @@ enablingProbOut={0.3, 0.25, 0.45}.

    a connected transition. In the case of the discrete place model, this is realized by the discrete equation

    -when tokeninout or<\b>  pre(reStart) then
-  t = if tokeninout then pre(t) + firingSumIn - firingSumOut else<\b> reStartTokens;
+when tokeninout or pre(reStart) then
+  t = if tokeninout then pre(t) + firingSumIn - firingSumOut else reStartTokens;
 end when;

    @@ -325,9 +325,9 @@ The marking of continuous places can change continuously as well as discretely. This is implemented by the following construct 

    -der(t) = conMarkChange;
+der(t) = conMarkChange;
 when disMarksInOut then
-  reinit(t, t+disMarkChange);
+  reinit(t, t + disMarkChange);
 end when;
 when reStart then
   reinit(t, reStartMarks);
@@ -421,7 +421,7 @@ arcWeightIn = {2*P1.t, 4} and arcWeightOut = {2, 1, 5*P1.t},
 whereby the expression P1.t accesses the current token number of P1. Thus, the weights of the arcs (P1-T1) and (T1-P5) are functions which depend on the token number of P1.
 Transitions can also be provided with additional conditions that have to be satisfied to permit the activation. The condition
    
 
    
-firingCon = time>9.7
+firingCon = time > 9.7
 
    
 
    
 causes that the transition cannot be activated as long as time is less than 9.7.
diff --git a/PNlib/package.mo b/PNlib/package.mo
index 13e1f982..5f63ffd7 100644
--- a/PNlib/package.mo
+++ b/PNlib/package.mo
@@ -1,5 +1,43 @@
 package PNlib
   annotation(
     uses(Modelica(version = "4.0.0")),
-    version = "2.2");
+    version = "3.0.0",
+    Documentation(info = "
+    
    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\"
    
+    
    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.
      • 
+    
    
+    
    License
    
+    
    This package is licensed with the 3-Clause BSD License.
    
+    
    Development and contribution
    
+    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.
+    
    
+    ")
+  );
 end PNlib;
diff --git a/README.md b/README.md
index 9440071e..1e12cd04 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ Hochschule Bielefeld – University of Applied Sciences and Arts
 Faculty of Engineering and Mathematics
 ```
 
-  * Sabrina Proß
+  * Sabrina Proß
   * Lennart Ochel
   * Timo Lask
   * Bernhard Bachmann
diff --git a/Testing/Dymola/Makefile b/Testing/Dymola/Makefile
deleted file mode 100644
index 33530f72..00000000
--- a/Testing/Dymola/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-TEST = ../rtest -v
-DYMOLA = Dymola
-
-TESTFILES = \
-PNlib.Examples.ConTest.Conflict.mos \
-PNlib.Examples.ConTest.ConflictLoop.mos \
-PNlib.Examples.ConTest.LoopAndArcweight.mos \
-PNlib.Examples.ConTest.PCtoTC.mos \
-PNlib.Examples.ConTest.SinglePC.mos \
-PNlib.Examples.ConTest.SingleTC.mos \
-PNlib.Examples.ConTest.Speed.mos \
-PNlib.Examples.ConTest.TCtoPC.mos \
-PNlib.Examples.ConTest.ZeroArcWeight.mos \
-PNlib.Examples.ConTest.ZeroPlace.mos \
-PNlib.Examples.DisTest.ConflictPrio.mos \
-PNlib.Examples.DisTest.ConflictProb.mos \
-PNlib.Examples.DisTest.DisLoopAndArcweight.mos \
-PNlib.Examples.DisTest.EightConflictProb.mos \
-PNlib.Examples.DisTest.InputConflictPrio.mos \
-PNlib.Examples.DisTest.InputConflictProb.mos \
-PNlib.Examples.DisTest.OutputConflictPrio.mos \
-PNlib.Examples.DisTest.OutputConflictProb.mos \
-PNlib.Examples.DisTest.PDtoTD.mos \
-PNlib.Examples.DisTest.SinglePD.mos \
-PNlib.Examples.DisTest.SingleTD.mos \
-PNlib.Examples.DisTest.SixConflictProb.mos \
-PNlib.Examples.DisTest.TDtoPD.mos \
-PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos \
-PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos \
-PNlib.Examples.ExtTest.IATest.mos \
-PNlib.Examples.ExtTest.IAwithPCtoTC.mos \
-PNlib.Examples.ExtTest.IAwithPDtoTD.mos \
-PNlib.Examples.ExtTest.TATest.mos \
-PNlib.Examples.ExtTest.TAwithPCtoTC.mos \
-PNlib.Examples.ExtTest.TAwithPDtoTD.mos \
-PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos \
-PNlib.Examples.ExtTest.TSTest.mos \
-PNlib.Examples.ExtTest.TStriangular.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.SixConflictProb.mos \
-PNlib.Examples.HybTest.TCwithPD.mos \
-PNlib.Examples.HybTest.TDtoPC.mos \
-PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos \
-
-
-# These tests are OS dependent. Move up when fixed.
-# Run make failingtest
-FAILINGTESTFILES = \
-
-
-# Dependency files that are not .mo  or Makefile
-# Add them here or they will be cleaned.
-DEPENDENCIES = \
-*.mos \
-Makefile \
-
-CLEAN = `ls | grep -w -v -f deps.tmp`
-
-.PHONY : test clean getdeps failingtest
-
-#@echo "openModel(\"../../PNlib/package.mo\");" > run-tests.mos
-#@echo "cd(\"../Testing/Dymola/\");" >> run-tests.mos
-#@for test in $(TESTFILES) ; do echo "simulateModel(\"$${test%.*}\", stopTime=10, resultFile=\"$${test%.*}_res\");" >> run-tests.mos ;	done
-#@echo "exit();" >> run-tests.mos
-
-test:
-	@echo
-	@echo Running tests...
-	@echo
-	@echo "OPENMODELICAHOME = $(OPENMODELICAHOME)"
-	#@echo -n "Using " && which $(DYMOLA)
-	#@$(DYMOLA) /noWindow run-tests.mos
-	@$(TEST) $(TESTFILES)
-
-# Cleans all files that are not listed as dependencies
-clean:
-	@echo $(DEPENDENCIES) | sed 's/ /\\\|/g' > deps.tmp
-	@rm -f $(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 tests...
-	@echo
-	@echo "OPENMODELICAHOME = $(OPENMODELICAHOME)"
-	@echo -n "Using " && which $(DYMOLA)
-	@echo "openModel(\"../../PNlib/package.mo\");" > run-tests.mos
-	@echo "cd(\"../Testing/Dymola/\");" >> run-tests.mos
-	@for test in $(FAILINGTESTFILES) ; do echo "simulateModel(\"$${test%.*}\", resultFile=\"$${test%.*}_res\");" >> run-tests.mos ;	done
-	@echo "exit();" >> run-tests.mos
-	@$(DYMOLA) /noWindow run-tests.mos
-	@$(TEST) $(FAILINGTESTFILES)
diff --git a/Testing/Dymola/PNlib.Examples.ConTest.Conflict.mos b/Testing/Dymola/PNlib.Examples.ConTest.Conflict.mos
deleted file mode 100644
index cc129b76..00000000
--- a/Testing/Dymola/PNlib.Examples.ConTest.Conflict.mos
+++ /dev/null
@@ -1,33 +0,0 @@
-// name: PNlib.Examples.ConTest.Conflict
-// keywords: PNlib, continuous
-// status: correct
-
-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"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.Conflict_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ConTest.Conflict.mat",
-  "PNlib.Examples.ConTest.Conflict_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ConTest.Conflict_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.Conflict_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.ConTest.ConflictLoop.mos b/Testing/Dymola/PNlib.Examples.ConTest.ConflictLoop.mos
deleted file mode 100644
index 30cef087..00000000
--- a/Testing/Dymola/PNlib.Examples.ConTest.ConflictLoop.mos
+++ /dev/null
@@ -1,32 +0,0 @@
-// name: PNlib.Examples.ConTest.ConflictLoop
-// keywords: PNlib, continuous
-// status: correct
-
-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"
-};
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.ConflictLoop_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ConTest.ConflictLoop.mat",
-  "PNlib.Examples.ConTest.ConflictLoop_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ConTest.ConflictLoop_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.ConflictLoop_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.ConTest.LoopAndArcweight.mos b/Testing/Dymola/PNlib.Examples.ConTest.LoopAndArcweight.mos
deleted file mode 100644
index 13e5fc4f..00000000
--- a/Testing/Dymola/PNlib.Examples.ConTest.LoopAndArcweight.mos
+++ /dev/null
@@ -1,26 +0,0 @@
-// name: PNlib.Examples.ConTest.LoopAndArcweight
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.LoopAndArcweight_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ConTest.LoopAndArcweight.mat",
-  "PNlib.Examples.ConTest.LoopAndArcweight_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ConTest.LoopAndArcweight_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.LoopAndArcweight_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","P2.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ConTest.PCtoTC.mos b/Testing/Dymola/PNlib.Examples.ConTest.PCtoTC.mos
deleted file mode 100644
index b6e454c2..00000000
--- a/Testing/Dymola/PNlib.Examples.ConTest.PCtoTC.mos
+++ /dev/null
@@ -1,25 +0,0 @@
-// name: PNlib.Examples.ConTest.PCtoTC
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.PCtoTC_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ConTest.PCtoTC.mat",
-  "PNlib.Examples.ConTest.PCtoTC_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ConTest.PCtoTC_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.PCtoTC_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ConTest.SinglePC.mos b/Testing/Dymola/PNlib.Examples.ConTest.SinglePC.mos
deleted file mode 100644
index 0b630681..00000000
--- a/Testing/Dymola/PNlib.Examples.ConTest.SinglePC.mos
+++ /dev/null
@@ -1,22 +0,0 @@
-// name: PNlib.Examples.ConTest.SinglePC
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.SinglePC_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ConTest.SinglePC.mat",
-  "PNlib.Examples.ConTest.SinglePC_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ConTest.SinglePC_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.SinglePC_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ConTest.SingleTC.mos b/Testing/Dymola/PNlib.Examples.ConTest.SingleTC.mos
deleted file mode 100644
index 08e13c9d..00000000
--- a/Testing/Dymola/PNlib.Examples.ConTest.SingleTC.mos
+++ /dev/null
@@ -1,24 +0,0 @@
-// name: PNlib.Examples.ConTest.SingleTC
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.SingleTC_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ConTest.SingleTC.mat",
-  "PNlib.Examples.ConTest.SingleTC_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ConTest.SingleTC_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.SingleTC_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ConTest.Speed.mos b/Testing/Dymola/PNlib.Examples.ConTest.Speed.mos
deleted file mode 100644
index 64ed1969..00000000
--- a/Testing/Dymola/PNlib.Examples.ConTest.Speed.mos
+++ /dev/null
@@ -1,32 +0,0 @@
-// name: PNlib.Examples.ConTest.Speed
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed",
-  "T2.fire",
-  "T2.instantaneousSpeed",
-  "T2.maximumSpeed",
-  "T3.fire",
-  "T3.instantaneousSpeed",
-  "T3.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.Speed_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ConTest.Speed.mat",
-  "PNlib.Examples.ConTest.Speed_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ConTest.Speed_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.Speed_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.ConTest.TCtoPC.mos b/Testing/Dymola/PNlib.Examples.ConTest.TCtoPC.mos
deleted file mode 100644
index f321ff2c..00000000
--- a/Testing/Dymola/PNlib.Examples.ConTest.TCtoPC.mos
+++ /dev/null
@@ -1,25 +0,0 @@
-// name: PNlib.Examples.ConTest.TCtoPC
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.TCtoPC_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ConTest.TCtoPC.mat",
-  "PNlib.Examples.ConTest.TCtoPC_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ConTest.TCtoPC_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.TCtoPC_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ConTest.ZeroArcWeight.mos b/Testing/Dymola/PNlib.Examples.ConTest.ZeroArcWeight.mos
deleted file mode 100644
index 6746cbcf..00000000
--- a/Testing/Dymola/PNlib.Examples.ConTest.ZeroArcWeight.mos
+++ /dev/null
@@ -1,26 +0,0 @@
-// name: PNlib.Examples.ConTest.ZeroArcWeight
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed"
-};
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.ZeroArcWeight_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ConTest.ZeroArcWeight.mat",
-  "PNlib.Examples.ConTest.ZeroArcWeight_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ConTest.ZeroArcWeight_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.ZeroArcWeight_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ConTest.ZeroPlace.mos b/Testing/Dymola/PNlib.Examples.ConTest.ZeroPlace.mos
deleted file mode 100644
index ef3a2ea5..00000000
--- a/Testing/Dymola/PNlib.Examples.ConTest.ZeroPlace.mos
+++ /dev/null
@@ -1,29 +0,0 @@
-// name: PNlib.Examples.ConTest.ZeroPlace
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed",
-  "T2.fire",
-  "T2.instantaneousSpeed",
-  "T2.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.ZeroPlace_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ConTest.ZeroPlace.mat",
-  "PNlib.Examples.ConTest.ZeroPlace_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ConTest.ZeroPlace_res.mat", "../../ReferenceFiles/PNlib.Examples.ConTest.ZeroPlace_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","P2.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.DisTest.ConflictPrio.mos b/Testing/Dymola/PNlib.Examples.DisTest.ConflictPrio.mos
deleted file mode 100644
index 32f17163..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.ConflictPrio.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.DisTest.ConflictPrio
-// keywords: PNlib, discrete
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.ConflictPrio_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictPrio.mat",
-  "PNlib.Examples.DisTest.ConflictPrio_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.ConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictPrio_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.DisTest.ConflictProb.mos b/Testing/Dymola/PNlib.Examples.DisTest.ConflictProb.mos
deleted file mode 100644
index 8ca683c0..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.ConflictProb.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.DisTest.ConflictProb
-// keywords: PNlib, discrete
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.ConflictProb_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictProb.mat",
-  "PNlib.Examples.DisTest.ConflictProb_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.ConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictProb_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.DisTest.DisLoopAndArcweight.mos b/Testing/Dymola/PNlib.Examples.DisTest.DisLoopAndArcweight.mos
deleted file mode 100644
index c3ce3734..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.DisLoopAndArcweight.mos
+++ /dev/null
@@ -1,25 +0,0 @@
-// name: PNlib.Examples.DisTest.DisLoopAndArcweight
-// keywords: PNlib, discrete
-// status: correct
-
-vars := {
-  "P1.t",
-  "T1.fire",
-  "T1.active",
-  "T1.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.DisLoopAndArcweight_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.DisLoopAndArcweight.mat",
-  "PNlib.Examples.DisTest.DisLoopAndArcweight_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.DisLoopAndArcweight_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.DisLoopAndArcweight_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","T1.fire","T1.active","T1.fire"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.DisTest.EightConflictProb.mos b/Testing/Dymola/PNlib.Examples.DisTest.EightConflictProb.mos
deleted file mode 100644
index 9a0efa81..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.EightConflictProb.mos
+++ /dev/null
@@ -1,38 +0,0 @@
-// name: PNlib.Examples.DisTest.EightConflictProb
-// keywords: PNlib, discrete
-// status: correct
-
-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"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.EightConflictProb_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.EightConflictProb.mat",
-  "PNlib.Examples.DisTest.EightConflictProb_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.EightConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.EightConflictProb_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.DisTest.InputConflictPrio.mos b/Testing/Dymola/PNlib.Examples.DisTest.InputConflictPrio.mos
deleted file mode 100644
index 61a66aed..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.InputConflictPrio.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.DisTest.InputConflictPrio
-// keywords: PNlib, discrete
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.InputConflictPrio_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictPrio.mat",
-  "PNlib.Examples.DisTest.InputConflictPrio_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.InputConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictPrio_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.DisTest.InputConflictProb.mos b/Testing/Dymola/PNlib.Examples.DisTest.InputConflictProb.mos
deleted file mode 100644
index bbc11798..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.InputConflictProb.mos
+++ /dev/null
@@ -1,31 +0,0 @@
-// name: PNlib.Examples.DisTest.InputConflictProb
-// keywords: PNlib, discrete
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.fire",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.InputConflictProb_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictProb.mat",
-  "PNlib.Examples.DisTest.InputConflictProb_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.InputConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictProb_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.DisTest.OutputConflictPrio.mos b/Testing/Dymola/PNlib.Examples.DisTest.OutputConflictPrio.mos
deleted file mode 100644
index 6fea0979..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.OutputConflictPrio.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.DisTest.OutputConflictPrio
-// keywords: PNlib, discrete
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.OutputConflictPrio_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictPrio.mat",
-  "PNlib.Examples.DisTest.OutputConflictPrio_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.OutputConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictPrio_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.DisTest.OutputConflictProb.mos b/Testing/Dymola/PNlib.Examples.DisTest.OutputConflictProb.mos
deleted file mode 100644
index 79caa674..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.OutputConflictProb.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.DisTest.OutputConflictProb
-// keywords: PNlib, discrete
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.OutputConflictProb_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictProb.mat",
-  "PNlib.Examples.DisTest.OutputConflictProb_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.OutputConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictProb_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.DisTest.PDtoTD.mos b/Testing/Dymola/PNlib.Examples.DisTest.PDtoTD.mos
deleted file mode 100644
index 3e0bcde3..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.PDtoTD.mos
+++ /dev/null
@@ -1,24 +0,0 @@
-// name: PNlib.Examples.DisTest.PDtoTD
-// keywords: PNlib, discrete
-// status: correct
-
-vars := {
-  "P1.t",
-  "T1.active",
-  "T1.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.PDtoTD_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.PDtoTD.mat",
-  "PNlib.Examples.DisTest.PDtoTD_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.PDtoTD_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.PDtoTD_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","T1.active","T1.fire"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.DisTest.SinglePD.mos b/Testing/Dymola/PNlib.Examples.DisTest.SinglePD.mos
deleted file mode 100644
index d3df2784..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.SinglePD.mos
+++ /dev/null
@@ -1,22 +0,0 @@
-// name: PNlib.Examples.DisTest.SinglePD
-// keywords: PNlib, discrete
-// status: correct
-
-vars := {
-  "P1.t"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.SinglePD_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.SinglePD.mat",
-  "PNlib.Examples.DisTest.SinglePD_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.SinglePD_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.SinglePD_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.DisTest.SingleTD.mos b/Testing/Dymola/PNlib.Examples.DisTest.SingleTD.mos
deleted file mode 100644
index 158fc875..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.SingleTD.mos
+++ /dev/null
@@ -1,23 +0,0 @@
-// name: PNlib.Examples.DisTest.SingleTD
-// keywords: PNlib, discrete
-// status: correct
-
-vars := {
-  "T1.active",
-  "T1.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.SingleTD_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.SingleTD.mat",
-  "PNlib.Examples.DisTest.SingleTD_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.SingleTD_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.SingleTD_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"T1.active","T1.fire"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.DisTest.SixConflictProb.mos b/Testing/Dymola/PNlib.Examples.DisTest.SixConflictProb.mos
deleted file mode 100644
index 18c730e2..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.SixConflictProb.mos
+++ /dev/null
@@ -1,34 +0,0 @@
-// name: PNlib.Examples.DisTest.SixConflictProb
-// keywords: PNlib, discrete
-// status: correct
-
-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"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.SixConflictProb_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.SixConflictProb.mat",
-  "PNlib.Examples.DisTest.SixConflictProb_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.SixConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.SixConflictProb_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.DisTest.TDtoPD.mos b/Testing/Dymola/PNlib.Examples.DisTest.TDtoPD.mos
deleted file mode 100644
index bea362b0..00000000
--- a/Testing/Dymola/PNlib.Examples.DisTest.TDtoPD.mos
+++ /dev/null
@@ -1,24 +0,0 @@
-// name: PNlib.Examples.DisTest.TDtoPD
-// keywords: PNlib, discrete
-// status: correct
-
-vars := {
-  "P1.t",
-  "T1.active",
-  "T1.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.TDtoPD_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.DisTest.TDtoPD.mat",
-  "PNlib.Examples.DisTest.TDtoPD_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.DisTest.TDtoPD_res.mat", "../../ReferenceFiles/PNlib.Examples.DisTest.TDtoPD_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","T1.active","T1.fire"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos b/Testing/Dymola/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos
deleted file mode 100644
index 4e4cbdff..00000000
--- a/Testing/Dymola/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.ExtTest.DoubleArcwithPCtoTC
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed",
-  "T2.fire",
-  "T2.instantaneousSpeed",
-  "T2.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ExtTest.DoubleArcwithPCtoTC_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mat",
-  "PNlib.Examples.ExtTest.DoubleArcwithPCtoTC_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ExtTest.DoubleArcwithPCtoTC_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos b/Testing/Dymola/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos
deleted file mode 100644
index 2fbfbea7..00000000
--- a/Testing/Dymola/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos
+++ /dev/null
@@ -1,28 +0,0 @@
-// name: PNlib.Examples.ExtTest.DoubleArcwithPTtoTD
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ExtTest.DoubleArcwithPTtoTD_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mat",
-  "PNlib.Examples.ExtTest.DoubleArcwithPTtoTD_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ExtTest.DoubleArcwithPTtoTD_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ExtTest.IATest.mos b/Testing/Dymola/PNlib.Examples.ExtTest.IATest.mos
deleted file mode 100644
index 622e0c1e..00000000
--- a/Testing/Dymola/PNlib.Examples.ExtTest.IATest.mos
+++ /dev/null
@@ -1,33 +0,0 @@
-// name: PNlib.Examples.ExtTest.IATest
-// keywords: PNlib, continuous
-// status: correct
-
-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"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ExtTest.IATest_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ExtTest.IATest.mat",
-  "PNlib.Examples.ExtTest.IATest_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ExtTest.IATest_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.IATest_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.ExtTest.IAwithPCtoTC.mos b/Testing/Dymola/PNlib.Examples.ExtTest.IAwithPCtoTC.mos
deleted file mode 100644
index f2c244c6..00000000
--- a/Testing/Dymola/PNlib.Examples.ExtTest.IAwithPCtoTC.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.ExtTest.IAwithPCtoTC
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed",
-  "T2.fire",
-  "T2.instantaneousSpeed",
-  "T2.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ExtTest.IAwithPCtoTC_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ExtTest.IAwithPCtoTC.mat",
-  "PNlib.Examples.ExtTest.IAwithPCtoTC_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ExtTest.IAwithPCtoTC_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.IAwithPCtoTC_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.ExtTest.IAwithPDtoTD.mos b/Testing/Dymola/PNlib.Examples.ExtTest.IAwithPDtoTD.mos
deleted file mode 100644
index cd4a07f4..00000000
--- a/Testing/Dymola/PNlib.Examples.ExtTest.IAwithPDtoTD.mos
+++ /dev/null
@@ -1,28 +0,0 @@
-// name: PNlib.Examples.ExtTest.IAwithPDtoTD
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ExtTest.IAwithPDtoTD_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ExtTest.IAwithPDtoTD.mat",
-  "PNlib.Examples.ExtTest.IAwithPDtoTD_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ExtTest.IAwithPDtoTD_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.IAwithPDtoTD_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ExtTest.TATest.mos b/Testing/Dymola/PNlib.Examples.ExtTest.TATest.mos
deleted file mode 100644
index 834406bb..00000000
--- a/Testing/Dymola/PNlib.Examples.ExtTest.TATest.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.ExtTest.TATest
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "T1.fire",
-  "T1.maximumSpeed",
-  "T2.fire",
-  "T2.instantaneousSpeed",
-  "T2.maximumSpeed",
-  "T3.fire",
-  "T3.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ExtTest.TATest_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ExtTest.TATest.mat",
-  "PNlib.Examples.ExtTest.TATest_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ExtTest.TATest_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TATest_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","P2.t","T1.fire","T1.maximumSpeed","T2.fire","T2.instantaneousSpeed","T2.maximumSpeed","T3.fire","T3.maximumSpeed"}
-// {"Files Equal!"}
-// ""
-//
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ExtTest.TAwithPCtoTC.mos b/Testing/Dymola/PNlib.Examples.ExtTest.TAwithPCtoTC.mos
deleted file mode 100644
index f4a1331e..00000000
--- a/Testing/Dymola/PNlib.Examples.ExtTest.TAwithPCtoTC.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.ExtTest.TAwithPCtoTC
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed",
-  "T2.fire",
-  "T2.instantaneousSpeed",
-  "T2.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ExtTest.TAwithPCtoTC_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithPCtoTC.mat",
-  "PNlib.Examples.ExtTest.TAwithPCtoTC_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ExtTest.TAwithPCtoTC_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithPCtoTC_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.ExtTest.TAwithPDtoTD.mos b/Testing/Dymola/PNlib.Examples.ExtTest.TAwithPDtoTD.mos
deleted file mode 100644
index d5fc2c1a..00000000
--- a/Testing/Dymola/PNlib.Examples.ExtTest.TAwithPDtoTD.mos
+++ /dev/null
@@ -1,28 +0,0 @@
-// name: PNlib.Examples.ExtTest.TAwithPDtoTD
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ExtTest.TAwithPDtoTD_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithPDtoTD.mat",
-  "PNlib.Examples.ExtTest.TAwithPDtoTD_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ExtTest.TAwithPDtoTD_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithPDtoTD_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","P2.t","P3.t","T1.active","T1.fire","T2.active","T2.fire"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos b/Testing/Dymola/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos
deleted file mode 100644
index 040b44f8..00000000
--- a/Testing/Dymola/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos
+++ /dev/null
@@ -1,32 +0,0 @@
-// name: PNlib.Examples.ExtTest.TAwithWeaklyActivation
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed",
-  "T2.fire",
-  "T2.instantaneousSpeed",
-  "T2.maximumSpeed",
-  "T3.fire",
-  "T3.instantaneousSpeed",
-  "T3.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ExtTest.TAwithWeaklyActivation_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mat",
-  "PNlib.Examples.ExtTest.TAwithWeaklyActivation_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ExtTest.TAwithWeaklyActivation_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TAwithWeaklyActivation_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.ExtTest.TSTest.mos b/Testing/Dymola/PNlib.Examples.ExtTest.TSTest.mos
deleted file mode 100644
index 2eb595ce..00000000
--- a/Testing/Dymola/PNlib.Examples.ExtTest.TSTest.mos
+++ /dev/null
@@ -1,26 +0,0 @@
-// name: PNlib.Examples.ExtTest.TSTest
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "T1.active",
-  "T1.fire",
-  "T1.putFireTime"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ExtTest.TSTest_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ExtTest.TSTest.mat",
-  "PNlib.Examples.ExtTest.TSTest_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ExtTest.TSTest_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TSTest_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","P2.t","T1.active","T1.fire","T1.putFireTime"}
-// {"Files Equal!"}
-// ""
-//
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.ExtTest.TStriangular.mos b/Testing/Dymola/PNlib.Examples.ExtTest.TStriangular.mos
deleted file mode 100644
index 7c2f0051..00000000
--- a/Testing/Dymola/PNlib.Examples.ExtTest.TStriangular.mos
+++ /dev/null
@@ -1,26 +0,0 @@
-// name: PNlib.Examples.ExtTest.TStriangular
-// keywords: PNlib, continuous
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "T1.active",
-  "T1.fire",
-  "T1.putFireTime"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ExtTest.TStriangular_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.ExtTest.TStriangular.mat",
-  "PNlib.Examples.ExtTest.TSTest_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.ExtTest.TStriangular_res.mat", "../../ReferenceFiles/PNlib.Examples.ExtTest.TStriangular_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","P2.t","T1.active","T1.fire","T1.putFireTime"}
-// {"Files Equal!"}
-// ""
-//
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.HybTest.ConflictPrio.mos b/Testing/Dymola/PNlib.Examples.HybTest.ConflictPrio.mos
deleted file mode 100644
index bdcd15bb..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.ConflictPrio.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.HybTest.ConflictPrio
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.ConflictPrio_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictPrio.mat",
-  "PNlib.Examples.HybTest.ConflictPrio_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.ConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictPrio_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.ConflictProb.mos b/Testing/Dymola/PNlib.Examples.HybTest.ConflictProb.mos
deleted file mode 100644
index 9ba4335f..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.ConflictProb.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.HybTest.ConflictProb
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.ConflictProb_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictProb.mat",
-  "PNlib.Examples.HybTest.ConflictProb_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.ConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictProb_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.ConflictType3.mos b/Testing/Dymola/PNlib.Examples.HybTest.ConflictType3.mos
deleted file mode 100644
index 4202d975..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.ConflictType3.mos
+++ /dev/null
@@ -1,32 +0,0 @@
-// name: PNlib.Examples.HybTest.ConflictType3
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed",
-  "T2.active",
-  "T2.fire",
-  "T3.fire",
-  "T3.instantaneousSpeed",
-  "T3.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.ConflictType3_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictType3.mat",
-  "PNlib.Examples.HybTest.ConflictType3_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.ConflictType3_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictType3_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.ConflictType4.mos b/Testing/Dymola/PNlib.Examples.HybTest.ConflictType4.mos
deleted file mode 100644
index 8c3f2dce..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.ConflictType4.mos
+++ /dev/null
@@ -1,32 +0,0 @@
-// name: PNlib.Examples.HybTest.ConflictType4
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "P4.t",
-  "P5.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed",
-  "T2.fire",
-  "T2.instantaneousSpeed",
-  "T2.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.ConflictType4_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictType4.mat",
-  "PNlib.Examples.HybTest.ConflictType4_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.ConflictType4_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.ConflictType4_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.EightConflictProb.mos b/Testing/Dymola/PNlib.Examples.HybTest.EightConflictProb.mos
deleted file mode 100644
index 7a1ed516..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.EightConflictProb.mos
+++ /dev/null
@@ -1,38 +0,0 @@
-// name: PNlib.Examples.HybTest.EightConflictProb
-// keywords: PNlib, hybrid
-// status: correct
-
-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"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.EightConflictProb_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.EightConflictProb.mat",
-  "PNlib.Examples.HybTest.EightConflictProb_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.EightConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.EightConflictProb_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.HybLoopAndArcweight.mos b/Testing/Dymola/PNlib.Examples.HybTest.HybLoopAndArcweight.mos
deleted file mode 100644
index 885a49da..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.HybLoopAndArcweight.mos
+++ /dev/null
@@ -1,24 +0,0 @@
-// name: PNlib.Examples.HybTest.HybLoopAndArcweight
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "T1.active",
-  "T1.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.HybLoopAndArcweight_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.HybLoopAndArcweight.mat",
-  "PNlib.Examples.HybTest.HybLoopAndArcweight_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.HybLoopAndArcweight_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.HybLoopAndArcweight_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","T1.active","T1.fire"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.HybTest.InputConflictPrio.mos b/Testing/Dymola/PNlib.Examples.HybTest.InputConflictPrio.mos
deleted file mode 100644
index ea2ff150..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.InputConflictPrio.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.HybTest.InputConflictPrio
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.InputConflictPrio_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictPrio.mat",
-  "PNlib.Examples.HybTest.InputConflictPrio_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.InputConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictPrio_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.InputConflictProb.mos b/Testing/Dymola/PNlib.Examples.HybTest.InputConflictProb.mos
deleted file mode 100644
index f85c809c..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.InputConflictProb.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.HybTest.InputConflictProb
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.InputConflictProb_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictProb.mat",
-  "PNlib.Examples.HybTest.InputConflictProb_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.InputConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictProb_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.InputConflictType3.mos b/Testing/Dymola/PNlib.Examples.HybTest.InputConflictType3.mos
deleted file mode 100644
index 1e62b337..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.InputConflictType3.mos
+++ /dev/null
@@ -1,32 +0,0 @@
-// name: PNlib.Examples.HybTest.InputConflictType3
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed",
-  "T2.active",
-  "T2.fire",
-  "T3.fire",
-  "T3.instantaneousSpeed",
-  "T3.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.InputConflictType3_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictType3.mat",
-  "PNlib.Examples.HybTest.InputConflictType3_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.InputConflictType3_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.InputConflictType3_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.OutputConflictPrio.mos b/Testing/Dymola/PNlib.Examples.HybTest.OutputConflictPrio.mos
deleted file mode 100644
index a948fb2a..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.OutputConflictPrio.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.HybTest.OutputConflictPrio
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.OutputConflictPrio_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictPrio.mat",
-  "PNlib.Examples.HybTest.OutputConflictPrio_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.OutputConflictPrio_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictPrio_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.OutputConflictProb.mos b/Testing/Dymola/PNlib.Examples.HybTest.OutputConflictProb.mos
deleted file mode 100644
index 6cddaaa3..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.OutputConflictProb.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-// name: PNlib.Examples.HybTest.OutputConflictProb
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.active",
-  "T1.fire",
-  "T2.active",
-  "T2.fire",
-  "T3.active",
-  "T3.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.OutputConflictProb_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictProb.mat",
-  "PNlib.Examples.HybTest.OutputConflictProb_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.OutputConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictProb_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.OutputConflictType3.mos b/Testing/Dymola/PNlib.Examples.HybTest.OutputConflictType3.mos
deleted file mode 100644
index 77558dce..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.OutputConflictType3.mos
+++ /dev/null
@@ -1,32 +0,0 @@
-// name: PNlib.Examples.HybTest.OutputConflictType3
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed",
-  "T2.active",
-  "T2.fire",
-  "T3.fire",
-  "T3.instantaneousSpeed",
-  "T3.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.OutputConflictType3_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictType3.mat",
-  "PNlib.Examples.HybTest.OutputConflictType3_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.OutputConflictType3_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.OutputConflictType3_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.PCtoTD.mos b/Testing/Dymola/PNlib.Examples.HybTest.PCtoTD.mos
deleted file mode 100644
index 66caeee7..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.PCtoTD.mos
+++ /dev/null
@@ -1,24 +0,0 @@
-// name: PNlib.Examples.HybTest.PCtoTD
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "T1.active",
-  "T1.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.PCtoTD_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.PCtoTD.mat",
-  "PNlib.Examples.HybTest.PCtoTD_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.PCtoTD_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.PCtoTD_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","T1.active","T1.fire"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.HybTest.SixConflictProb.mos b/Testing/Dymola/PNlib.Examples.HybTest.SixConflictProb.mos
deleted file mode 100644
index ae3e5e98..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.SixConflictProb.mos
+++ /dev/null
@@ -1,34 +0,0 @@
-// name: PNlib.Examples.HybTest.SixConflictProb
-// keywords: PNlib, hybrid
-// status: correct
-
-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"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.SixConflictProb_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.SixConflictProb.mat",
-  "PNlib.Examples.HybTest.SixConflictProb_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.SixConflictProb_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.SixConflictProb_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/PNlib.Examples.HybTest.TCwithPD.mos b/Testing/Dymola/PNlib.Examples.HybTest.TCwithPD.mos
deleted file mode 100644
index 7a6c0141..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.TCwithPD.mos
+++ /dev/null
@@ -1,27 +0,0 @@
-// name: PNlib.Examples.HybTest.TCwithPD
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "P2.t",
-  "P3.t",
-  "T1.fire",
-  "T1.instantaneousSpeed",
-  "T1.maximumSpeed"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.TCwithPD_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.TCwithPD.mat",
-  "PNlib.Examples.HybTest.TCwithPD_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.TCwithPD_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.TCwithPD_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","P2.t","P3.t","T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.HybTest.TDtoPC.mos b/Testing/Dymola/PNlib.Examples.HybTest.TDtoPC.mos
deleted file mode 100644
index d20d5345..00000000
--- a/Testing/Dymola/PNlib.Examples.HybTest.TDtoPC.mos
+++ /dev/null
@@ -1,24 +0,0 @@
-// name: PNlib.Examples.HybTest.TDtoPC
-// keywords: PNlib, hybrid
-// status: correct
-
-vars := {
-  "P1.t",
-  "T1.active",
-  "T1.fire"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.HybTest.TDtoPC_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.HybTest.TDtoPC.mat",
-  "PNlib.Examples.HybTest.TDtoPC_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.HybTest.TDtoPC_res.mat", "../../ReferenceFiles/PNlib.Examples.HybTest.TDtoPC_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"P1.t","T1.active","T1.fire"}
-// {"Files Equal!"}
-// ""
-// 
-// endResult
diff --git a/Testing/Dymola/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos b/Testing/Dymola/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos
deleted file mode 100644
index 3f6f6fef..00000000
--- a/Testing/Dymola/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos
+++ /dev/null
@@ -1,34 +0,0 @@
-// name: PNlib.Examples.Models.BicoloredPlaces.Aquarium
-// keywords: PNlib, colored places
-// status: correct
-
-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"
-};
-
-res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.Models.BicoloredPlaces.Aquarium_res.mat",
-  "../../ReferenceFiles/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mat",
-  "PNlib.Examples.Models.BicoloredPlaces.Aquarium_diff.csv", 0.01, 0.0001, vars); getErrorString();
-
-if res[1] <> "Files Equal!" then
-  filterSimulationResults("PNlib.Examples.Models.BicoloredPlaces.Aquarium_res.mat", "../../ReferenceFiles/PNlib.Examples.Models.BicoloredPlaces.Aquarium_Dymola_minimal.mat", vars, 0); getErrorString();
-end if;
-
-// Result:
-// {"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/Dymola/run-tests.mos b/Testing/Dymola/run-tests.mos
deleted file mode 100644
index 3d47de14..00000000
--- a/Testing/Dymola/run-tests.mos
+++ /dev/null
@@ -1,54 +0,0 @@
-openModel("../../PNlib/package.mo");
-cd("../Testing/Dymola/");
-simulateModel("PNlib.Examples.ConTest.Conflict", stopTime=10, resultFile="PNlib.Examples.ConTest.Conflict_res");
-simulateModel("PNlib.Examples.ConTest.ConflictLoop", stopTime=10, resultFile="PNlib.Examples.ConTest.ConflictLoop_res");
-simulateModel("PNlib.Examples.ConTest.LoopAndArcweight", stopTime=10, resultFile="PNlib.Examples.ConTest.LoopAndArcweight_res");
-simulateModel("PNlib.Examples.ConTest.PCtoTC", stopTime=10, resultFile="PNlib.Examples.ConTest.PCtoTC_res");
-simulateModel("PNlib.Examples.ConTest.SinglePC", stopTime=1, resultFile="PNlib.Examples.ConTest.SinglePC_res");
-simulateModel("PNlib.Examples.ConTest.SingleTC", stopTime=1, resultFile="PNlib.Examples.ConTest.SingleTC_res");
-simulateModel("PNlib.Examples.ConTest.Speed", stopTime=10, resultFile="PNlib.Examples.ConTest.Speed_res");
-simulateModel("PNlib.Examples.ConTest.TCtoPC", stopTime=10, resultFile="PNlib.Examples.ConTest.TCtoPC_res");
-simulateModel("PNlib.Examples.ConTest.ZeroArcWeight", stopTime=12, resultFile="PNlib.Examples.ConTest.ZeroArcWeight_res");
-simulateModel("PNlib.Examples.ConTest.ZeroPlace", stopTime=10, resultFile="PNlib.Examples.ConTest.ZeroPlace_res");
-simulateModel("PNlib.Examples.DisTest.ConflictPrio", stopTime=10, resultFile="PNlib.Examples.DisTest.ConflictPrio_res");
-simulateModel("PNlib.Examples.DisTest.ConflictProb", stopTime=10, resultFile="PNlib.Examples.DisTest.ConflictProb_res");
-simulateModel("PNlib.Examples.DisTest.DisLoopAndArcweight", stopTime=10, resultFile="PNlib.Examples.DisTest.DisLoopAndArcweight_res");
-simulateModel("PNlib.Examples.DisTest.EightConflictProb", stopTime=10, resultFile="PNlib.Examples.DisTest.EightConflictProb_res");
-simulateModel("PNlib.Examples.DisTest.InputConflictPrio", stopTime=10, resultFile="PNlib.Examples.DisTest.InputConflictPrio_res");
-simulateModel("PNlib.Examples.DisTest.InputConflictProb", stopTime=10, resultFile="PNlib.Examples.DisTest.InputConflictProb_res");
-simulateModel("PNlib.Examples.DisTest.OutputConflictPrio", stopTime=10, resultFile="PNlib.Examples.DisTest.OutputConflictPrio_res");
-simulateModel("PNlib.Examples.DisTest.OutputConflictProb", stopTime=10, resultFile="PNlib.Examples.DisTest.OutputConflictProb_res");
-simulateModel("PNlib.Examples.DisTest.PDtoTD", stopTime=10, resultFile="PNlib.Examples.DisTest.PDtoTD_res");
-simulateModel("PNlib.Examples.DisTest.SinglePD", stopTime=1, resultFile="PNlib.Examples.DisTest.SinglePD_res");
-simulateModel("PNlib.Examples.DisTest.SingleTD", stopTime=1, resultFile="PNlib.Examples.DisTest.SingleTD_res");
-simulateModel("PNlib.Examples.DisTest.SixConflictProb", stopTime=10, resultFile="PNlib.Examples.DisTest.SixConflictProb_res");
-simulateModel("PNlib.Examples.DisTest.TDtoPD", stopTime=10, resultFile="PNlib.Examples.DisTest.TDtoPD_res");
-simulateModel("PNlib.Examples.ExtTest.DoubleArcwithPCtoTC", stopTime=10, resultFile="PNlib.Examples.ExtTest.DoubleArcwithPCtoTC_res");
-simulateModel("PNlib.Examples.ExtTest.DoubleArcwithPTtoTD", stopTime=10, resultFile="PNlib.Examples.ExtTest.DoubleArcwithPTtoTD_res");
-simulateModel("PNlib.Examples.ExtTest.IATest", stopTime=6, resultFile="PNlib.Examples.ExtTest.IATest_res");
-simulateModel("PNlib.Examples.ExtTest.IAwithPCtoTC", stopTime=10, resultFile="PNlib.Examples.ExtTest.IAwithPCtoTC_res");
-simulateModel("PNlib.Examples.ExtTest.IAwithPDtoTD", stopTime=10, resultFile="PNlib.Examples.ExtTest.IAwithPDtoTD_res");
-simulateModel("PNlib.Examples.ExtTest.TATest", stopTime=6, resultFile="PNlib.Examples.ExtTest.TATest_res");
-simulateModel("PNlib.Examples.ExtTest.TAwithPCtoTC", stopTime=10, resultFile="PNlib.Examples.ExtTest.TAwithPCtoTC_res");
-simulateModel("PNlib.Examples.ExtTest.TAwithPDtoTD", stopTime=10, resultFile="PNlib.Examples.ExtTest.TAwithPDtoTD_res");
-simulateModel("PNlib.Examples.ExtTest.TAwithWeaklyActivation", stopTime=5, resultFile="PNlib.Examples.ExtTest.TAwithWeaklyActivation_res");
-simulateModel("PNlib.Examples.ExtTest.TSTest", stopTime=10, resultFile="PNlib.Examples.ExtTest.TSTest_res");
-simulateModel("PNlib.Examples.ExtTest.TStriangular", stopTime=10, resultFile="PNlib.Examples.ExtTest.TSTest_res");
-simulateModel("PNlib.Examples.HybTest.ConflictPrio", stopTime=10, resultFile="PNlib.Examples.HybTest.ConflictPrio_res");
-simulateModel("PNlib.Examples.HybTest.ConflictProb", stopTime=10, resultFile="PNlib.Examples.HybTest.ConflictProb_res");
-simulateModel("PNlib.Examples.HybTest.ConflictType3", stopTime=10, resultFile="PNlib.Examples.HybTest.ConflictType3_res");
-simulateModel("PNlib.Examples.HybTest.ConflictType4", stopTime=10, resultFile="PNlib.Examples.HybTest.ConflictType4_res");
-simulateModel("PNlib.Examples.HybTest.EightConflictProb", stopTime=10, resultFile="PNlib.Examples.HybTest.EightConflictProb_res");
-simulateModel("PNlib.Examples.HybTest.HybLoopAndArcweight", stopTime=10, resultFile="PNlib.Examples.HybTest.HybLoopAndArcweight_res");
-simulateModel("PNlib.Examples.HybTest.InputConflictPrio", stopTime=10, resultFile="PNlib.Examples.HybTest.InputConflictPrio_res");
-simulateModel("PNlib.Examples.HybTest.InputConflictProb", stopTime=10, resultFile="PNlib.Examples.HybTest.InputConflictProb_res");
-simulateModel("PNlib.Examples.HybTest.InputConflictType3", stopTime=10, resultFile="PNlib.Examples.HybTest.InputConflictType3_res");
-simulateModel("PNlib.Examples.HybTest.OutputConflictPrio", stopTime=10, resultFile="PNlib.Examples.HybTest.OutputConflictPrio_res");
-simulateModel("PNlib.Examples.HybTest.OutputConflictProb", stopTime=10, resultFile="PNlib.Examples.HybTest.OutputConflictProb_res");
-simulateModel("PNlib.Examples.HybTest.OutputConflictType3", stopTime=10, resultFile="PNlib.Examples.HybTest.OutputConflictType3_res");
-simulateModel("PNlib.Examples.HybTest.PCtoTD", stopTime=10, resultFile="PNlib.Examples.HybTest.PCtoTD_res");
-simulateModel("PNlib.Examples.HybTest.SixConflictProb", stopTime=10, resultFile="PNlib.Examples.HybTest.SixConflictProb_res");
-simulateModel("PNlib.Examples.HybTest.TCwithPD", stopTime=10, resultFile="PNlib.Examples.HybTest.TCwithPD_res");
-simulateModel("PNlib.Examples.HybTest.TDtoPC", stopTime=10, resultFile="PNlib.Examples.HybTest.TDtoPC_res");
-simulateModel("PNlib.Examples.Models.BicoloredPlaces.Aquarium", stopTime=40, resultFile="PNlib.Examples.Models.BicoloredPlaces.Aquarium_res");
-exit();
diff --git a/Testing/Makefile b/Testing/Makefile
deleted file mode 100644
index fd8cbac6..00000000
--- a/Testing/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-.PHONY : test clean dymola
-
-test: dymola
-
-dymola:
-	@make -C Dymola | tee dymola.log
-	@make -C Dymola clean
-	@echo ""
-	@grep == dymola.log
-
-clean:
-	@make -C Dymola clean
-	@rm *.log
diff --git a/Testing/rtrest b/Testing/rtrest
deleted file mode 100644
index db85c004..00000000
--- a/Testing/rtrest
+++ /dev/null
@@ -1,435 +0,0 @@
-#!/usr/bin/perl -w
-
-use Cwd;
-use File::Temp qw/ tempfile /;
-
-#delete($ENV{'OPENMODELICALIBRARY'});
-if (defined $ENV{"RTEST_OMCFLAGS"}) {
-  $omcflags=$ENV{"RTEST_OMCFLAGS"};
-} else {
-  $omcflags="";
-}
-
-(undef,$testTempFile) = tempfile("rtest$$.XXXXX", TMPDIR => 1, SUFFIX => ".tmp", UNLINK => 1);
-$cwd = getcwd;
-if ($cwd =~ m/(.*)PNlib\/(.+)$/) {
-  $OPENMODELICAHOME=$ENV{'OPENMODELICAHOME'};
-  $dirname=$2;
-} else {
-  print "You must run rtest from the PNlib (was run from $cwd)\n";
-  exit 0;
-}
-
-# Windows (MinGW) prints 3 digits exponent ( vs *nix 2) by default
-# and perl prints them as mismatches if there are other actual mismatches.
-# makes actual testsuite mismatches harder to find
-# print only 2 exponent digits
-$ENV{'PRINTF_EXPONENT_DIGITS'} = 2;
-
-$successes=0;
-$total=0;
-$setbaseline=0;
-$verbose="yes";
-$returnwitherror=0;
-$pager="cat";
-$diffcmd="diff -U 5 -w";
-$dwdiffcmd="dwdiff '-d()' -l -C 3 -c -L";
-$log="";
-$tmpdir = "/tmp/omc-rtest-".(getpwuid($<)||getlogin()||"unknown")."/$dirname";
-$tmpdir =~ s/\s/_/g;
-system "mkdir -p $tmpdir";
-$got = "$tmpdir/equations-got";
-$expected = "$tmpdir/equations-expected";
-$difference = "$tmpdir/equations-diff";
-$baseline = "$tmpdir/baseline";
-@keys = ();
-$collectkeys = 0;
-$collectcases = 0;
-%knownkeys = ();
-$filearg = 0;
-$status = 0;
-$statusfilter = "all";
-$eps_mo = 1.0e-7;
-$eps_mos = 5e-3;
-$set_modelica_lib = 1;
-$nodelete = 0;
-$OMCEXE = "omc";
-
-sub ulimit_cmd
-{
-  my $stack_size = shift;
-  if ($ENV{'OMDEV'}) {
-    return "";
-  }
-  if ($stack_size eq "") {
-    return "";
-  }
-  return "ulimit -s $stack_size ; ";
-}
-
-# Creates a baseline, i.e. the stores the actual result as the expected result
-sub setbaselineone
-{
-  my $mismatch = 0;
-  my ($f,%info) = @_;
-  my $setup_command = $info{"setup_command"};
-  my $cflags = $info{"cflags"};
-  my $env = $info{"env"};
-  my $teardown_command = $info{"teardown_command"};
-  my $stack_size = $info{"stack_size"};
-  my $ulimit = ulimit_cmd($stack_size);
-
-  $log = "$tmpdir/log-$f";
-  system "rm -f $log";
-  if ($setup_command) {
-    if ( system "$setup_command" ) {
-      print "== Failed to set baseline for $f (system $setup_command failed)";
-      return 1;
-    }
-  }
-  if (!$cflags) {
-    $cflags = "";
-  }
-  if (!$env) {
-    $env = "";
-  }
-  if ($ENV{'OMDEV'}) {
-    $env =~ s/:/\\;/g;
-  }
-  unlink "$testTempFile$f";
-  system "$env $ulimit $OPENMODELICAHOME/bin/$OMCEXE --running-testsuite=$testTempFile$f +locale=C $omcflags $cflags $f >>$log 2>&1";
-  if ($nodelete == 0 && open(TOREMOVE,"<$testTempFile$f")) {
-    while(my $line = ) {
-      $line =~ s/^\s*(.*?)\s*$/$1/;
-      unlink $line;
-    }
-  }
-  unlink "$testTempFile$f";
-  if ($teardown_command) {
-    system $teardown_command;
-  }
-
-  open(RES,">$baseline");
-  open(LOG,"<$log");
-  open(SRC,"<$f");
-
-  while() {
-    if (/^\/\/ Result:/../^\/\/ endResult/) {
-
-    } else {
-      my $x = $_;
-      $x =~ s/^ *\/\/ *Result:/\/\/ Result:/;
-      print RES "$x";
-    }
-  }
-  print RES "// Result:\n";
-  while() {
-    my $x = $_;
-    if ($x ne "\n") {
-      print RES "// $x";
-    } else {
-      print RES "//\n";
-    }
-  }
-  print RES "// endResult\n";
-  close RES;
-  close LOG;
-  close SRC;
-  print "Set baseline for ";print $f;print "\n";
-
-  open(SRC,"<$baseline");
-  open(DST,">$f");
-  # write in bin-mode to force LF instead of CRLF on windows!
-  binmode(DST);
-
-  while() {
-    $_ =~ s/[\n\r]$//g;
-    print DST "$_\x{0A}";
-  }
-  close DST;
-
-  return 0;
-}
-
-sub runone
-{
-  my $retval = 0;
-  my $mismatch = 0;
-  my ($f,%info) = @_;
-  my $setup_command = $info{"setup_command"};
-  my $cflags = $info{"cflags"};
-  my $env = $info{"env"};
-  my $teardown_command = $info{"teardown_command"};
-  my $stack_size = $info{"stack_size"};
-  my $ulimit = ulimit_cmd($stack_size);
-  my $start_t = time;
-
-  $log = "$tmpdir/log-$f";
-  system "rm -f $log";
-  if ($setup_command) {
-    if ( system "$setup_command >>$log 2>&1" ) {
-      print " setup_command failed";
-      return 1;
-    }
-  }
-  if (!$cflags) {
-    $cflags = "";
-  }
-  if (!$env) {
-    $env = "";
-  }
-  if ($ENV{'OMDEV'}) {
-    $env =~ s/:/\\;/g;
-  }
-  unlink "$testTempFile$f";
-  system "$env $ulimit $OPENMODELICAHOME/bin/$OMCEXE --running-testsuite=$testTempFile$f +locale=C $omcflags $cflags $f >>$log 2>&1";
-  $retval = $?;
-  if ($nodelete==0 && open(TOREMOVE,"<$testTempFile$f")) {
-    while(my $line = ) {
-      $line =~ s/^\s*(.*?)\s*$/$1/;
-      unlink $line;
-    }
-  }
-  unlink "$testTempFile$f";
-  if ($teardown_command) {
-    system "$teardown_command >>$log 2>&1";
-  }
-  my $end_t = time-$start_t;
-
-  if ($info{"status"} eq "erroneous") {
-    print "erroneous\n";
-    return 0;
-  }
-
-  if ( $retval != 0 ) {
-    if ($info{"status"} eq "correct") {
-      print "execution failed\n";
-      return 1;
-    }
-  } elsif ($info{"status"} ne "correct") {
-    print "this test should have failed\n";
-    return 1;
-  }
-
-  # Extract the result
-  open(RES,">$got");
-  open(LOG,"<$log");
-  while() {
-    s/^[ \t]*//;
-    s/[ \t]+/ /;
-    print RES $_;
-  }
-  close LOG;
-  close RES;
-
-  # Compare
-  my $epsilon;
-  if ($f =~ /mos$/) {
-    $epsilon = $eps_mos;
-  } else {
-    $epsilon = $eps_mo;
-  }
-  system "$OPENMODELICAHOME/bin/omc-diff $epsilon $expected $got > $difference";
-
-  if ( $? != 0 ) {
-    print "equation mismatch [time:$end_t]\n";
-    ## make a newline
-    system "echo '' >> $log";
-    system "echo Equation mismatch: diff says: >> $log";
-    system "$diffcmd $expected $got >> $log";
-
-    ## make a newline
-    system "echo '' >> $log";
-    system "echo Equation mismatch: omc-diff says: >> $log";
-    system "cat $difference >> $log";
-    return 1;
-  }
-
-  print "ok [time:$end_t]\n";
-  return 0;
-}
-
-sub dofile
-{
-  my $f = shift;
-  my %info = ("status"   => "unknown",
-    "name"     => $f,
-    "keywords" => "unknown",
-    "setup_command" => "",
-    "cflags" => "",
-    "env" => "",
-    "teardown_command" => "",
-    "stack_size" => "");
-  $log = "$tmpdir/log-$f";
-  $tc_err = 1;
-  # Find the expected result
-  open(OUT,">$expected");
-  open(IN,"<$f");
-  while() {
-    # @adrpo - uncomment for debugging
-    # print ($_);
-    if (/^\/\/ Result:/../^\/\/ endResult/) {
-      s/^[ \t]*//;
-      s/^\/\/ Result://;
-      s/^\/\/ endResult//;
-      s/[ \t]+/ /;
-      if (/^\/\/ /) {
-        print OUT substr($_,3);
-      } elsif (/^\/\/$/) {
-        print OUT substr($_,2);
-      } elsif ($tc_err == 0)  {
-        print "Error in testcase: $f\n";
-        $tc_err = 1;
-      }
-    } elsif (/^\/\/[ \\|]*([a-z_]*):[ \\|]*([^\012\015\n\r]*)/) {
-      # @adrpo - uncomment for debugging
-      # print "Noticed: $1 = $2\n";
-      # $info{$1} = $value;
-      if($1 ne "env" or $set_modelica_lib) {
-        $info{$1} = $2;
-      }
-    }
-  }
-  close IN;
-  close OUT;
-
-  # Check for keyword match
-  if ($#keys >=0) {
-    my %ks;
-    for (split(/ *, */,$info{"keywords"})) { $ks{$_} = 1; }
-    for (@keys) {
-      if (! $ks{$_}) {
-        return 0;
-      }
-    }
-  }
-
-  # Check for status match
-  if ($statusfilter ne "all") {
-    if ($info{"status"} ne $statusfilter) {
-      return 0;
-    }
-  }
-
-  # Collecting files
-  if ($collectcases) {
-    if ($info{'status'} ne "unknown") {
-      print $info{'name'}."\n";
-    }
-    return 0;
-  }
-
-  # Collecting keys?
-  if ($collectkeys) {
-    if ($info{"keywords"}) {
-      for (split(/ *, */, $info{"keywords"})) {
-        if (!$knownkeys{$_}) {
-          $knownkeys{$_} = 1;
-        } else {
-          $knownkeys{$_} += 1;
-        }
-      }
-    }
-    return 0;
-  }
-
-  if (!$setbaseline) {
-    printf(" %s %-82s... ",
-        $info{'status'} eq 'correct'?'+':'-', $info{'name'});
-  }
-  $total = $total + 1;
-
-  if ( $info{"status"} !~ /^(erroneous|(in|)correct)$/ ) {
-    print "unknown testcase status\n";
-    return 1;
-  }
-
-  if ($setbaseline) {
-    setbaselineone $f,%info;
-    $status = 0;
-  } else {
-    $status = runone $f,%info;
-  }
-
-  if ($status == 0) {
-    $successes = $successes + 1;
-  } else {
-    if ($verbose eq "yes" ) {
-      print "\n";
-      print "==== Log $log\n";
-      system "$pager $log";
-    }
-  }
-}
-
-$start_t = time;
-while ($#ARGV >= 0) {
-  $arg = shift(@ARGV);
-
-  if ($arg =~ m/^\+/) {
-    $omcflags .= " $arg";
-  } elsif ($arg =~ m"^--with-omc=(.*)$") {
-    $OMCEXE="$1";
-  } elsif ($arg eq "--return-with-error-code") {
-    $returnwitherror=1;
-  } elsif ($arg eq "-v") {
-    $verbose="yes";
-  } elsif ($arg eq "-b") {
-    $setbaseline = 1;
-  } elsif ($arg eq "-c") {
-    $diffcmd = $dwdiffcmd
-  } elsif ($arg eq "-nodelete") {
-    $nodelete = 1;
-  } elsif ($arg eq "-p") {
-    if ($ENV{"PAGER"} eq "") {
-      $pager="more";
-    } else {
-      $pager=$ENV{"PAGER"};
-    }
-  } elsif ($arg eq "-k") {
-    if ($#ARGV < 0) {
-      print "-m needs an argument\n";
-      exit 1;
-    }
-    @keys = split(/,/,shift(@ARGV));
-  } elsif ($arg eq "-s") {
-    if ($#ARGV < 0) {
-      print "-s needs an argument\n";
-      exit 1;
-    }
-    $statusfilter = shift;
-  } elsif ($arg eq "-l") {
-    $collectkeys = 1;
-  } elsif ($arg eq "-L") {
-    $collectcases = 1;
-  } elsif ($arg eq "-nolib") {
-    $set_modelica_lib = 0;
-  } else {
-    $filearg = 1;
-    dofile $arg;
-  }
-}
-$end_t = time-$start_t;
-
-# Check for no file args
-# adrpo: 2013-11-13 DO NOT RUN ALL MOS IF NO FILES ARE GIVEN!
-if ($filearg == 0) {
-#   for (glob '*.mos ') { dofile $_; }
-  print "No test files given at command line!\n";
-  exit 0;
-}
-
-# Final output. Statistics and stuff
-if ($collectkeys || $collectcases) {
-  for (sort(keys %knownkeys)) {
-    printf "  %3d %s\n", $knownkeys{$_}, $_;
-  }
-} elsif ($setbaseline) {
-  printf "\n== set new baseline for %d tests\n",$total;
-} else {
-  printf "\n== %d out of %d tests failed [%s, time: %d]\n", $total-$successes, $total, $dirname, $end_t;
-}
-
-if ($returnwitherror && $total!=$successes) {
-  exit 1;
-}