Skip to content

Commit

Permalink
Release 3.0.0 (AMIT-HSBI#80)
Browse files Browse the repository at this point in the history
* Update RevisionHistory
* Removing broken Dymola Test scripts
* Adding documentation to root package.mo
* Updating README

---------

Co-authored-by: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com>
  • Loading branch information
phannebohm and AnHeuermann committed Feb 13, 2024
1 parent 2df1b91 commit cef401c
Show file tree
Hide file tree
Showing 60 changed files with 68 additions and 2,113 deletions.
16 changes: 8 additions & 8 deletions PNlib/UsersGuide/Contact.mo
Expand Up @@ -32,20 +32,20 @@ model Contact
<tr>
<td valign=top>
<a>S. Proß</a><br>
<a>mailto: sabrina.pross@fh-bielefeld.de</a><br>
<td valign=top>University of Applied Sciences Bielefeld<br>
<a>Department of engineering and mathematics</a><br>
33609 Bielefeld<br>
<a>mailto: sabrina.pross@hsbi.de</a><br>
<td valign=top>Hochschule Bielefeld University of Applied Sciences and Arts (HSBI)<br>
<a>Faculty of Engineering and Mathematics</a><br>
33619 Bielefeld<br>
Germany
</td>
</tr>
<tr>
<td valign=top>
<a>B. Bachmann</a><br>
<a>mailto: bernhard.bachmann@fh-bielefeld.de</a><br>
<td valign=top>University of Applied Sciences Bielefeld<br>
<a>Department of engineering and mathematics</a><br>
33609 Bielefeld<br>
<a>mailto: bernhard.bachmann@hsbi.de</a><br>
<td valign=top>Hochschule Bielefeld University of Applied Sciences and Arts (HSBI)<br>
<a>Faculty of Engineering and Mathematics</a><br>
33619 Bielefeld<br>
Germany
</td>
</tr>
Expand Down
13 changes: 13 additions & 0 deletions PNlib/UsersGuide/RevisionHistory.mo
Expand Up @@ -93,6 +93,19 @@ model RevisionHistory
<li>Minor bug fixes</li>
</ul></td>
</tr>
<tr>
<td valign=\"top\">3.0.0</td>
<td valign=\"top\">2024-02-03</td>
<td valign=\"top\">Philip Hannebohm, Andreas Heuermann</td>
<td valign=\"top\"><ul>
<li>Updated to use Modelica 4.0.0</li>
<li>Removed unused functions</li>
<li>Updated Contact information</li>
<li>Changed to 3-Clause BSD license</li>
<li>Added Continuous Integration GitHub workflow</li>
</ul></td>
</tr>
</table>
</html>"));
end RevisionHistory;
14 changes: 7 additions & 7 deletions PNlib/UsersGuide/UserGuide.mo
Expand Up @@ -148,8 +148,8 @@ This conflict can be solved by prioritization of the transitions. If T1 takes pr
<h1> PNlib: A Modelica Library for Modeling xHPN </h1>
<p>Compatibility</p>
<ul>
<li>PNlib works with OpenModelica 1.9.4</li>
<li>PNlib works with OpenModelica Dymola 2016</li>
<li>PNlib works with OpenModelica 1.22</li>
<li>PNlib works with Dymola 2017/2019/2020</li>
</ul>
<p>The advanced Petri Net library, called PNlib, enables the modeling of extended hybrid Petri Nets (xHPN).
It comprises</p>
Expand Down Expand Up @@ -311,8 +311,8 @@ enablingProbOut={0.3, 0.25, 0.45}.</p>
a connected transition. In the case of the discrete place model, this is realized by the
discrete equation</p>
<pre>
<b>when</b> tokeninout <b>or<\b> <b>pre</b>(reStart) <b>then</b>
t = <b>if</b> tokeninout <b>then</b> <b>pre</b>(t) + firingSumIn - firingSumOut <b>else<\b> reStartTokens;
<b>when</b> tokeninout <b>or</b> <b>pre</b>(reStart) <b>then</b>
t = <b>if</b> tokeninout <b>then</b> <b>pre</b>(t) + firingSumIn - firingSumOut <b>else</b> reStartTokens;
<b>end when</b>;
</pre>
<p>
Expand All @@ -325,9 +325,9 @@ The marking of continuous places can change continuously as well as discretely.
This is implemented by the following construct
</p>
<pre>
der(t) = conMarkChange;
<b>der</b>(t) = conMarkChange;
<b>when</b> disMarksInOut <b>then</b>
<b>reinit</b>(t, t+disMarkChange);
<b>reinit</b>(t, t + disMarkChange);
<b>end when</b>;
<b>when</b> reStart <b>then</b>
<b>reinit</b>(t, reStartMarks);
Expand Down Expand Up @@ -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</p>
<p>
firingCon = time>9.7
firingCon = time > 9.7
</p>
<p>
causes that the transition cannot be activated as long as time is less than 9.7.
Expand Down
40 changes: 39 additions & 1 deletion 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 = "<html>
<p>Free Modelica library for modelling xHPN.</p>
<h2 id=\"library-description\">Library description</h2>
<p>The advanced Petri Net library, called PNlib, enables the modeling of extended
hybrid Petri Nets (xHPN). It comprises</p>
<ul>
<li>discrete (PD) and continuous places (PC),</li>
<li>discrete (TD), stochastic (TS), and continuous transitions (TC), and</li>
<li>test (TA), inhibitor (IA), and read arcs (RA).</li>
</ul>
<p><img src=\"modelica://PNlib/Resources/Images/iconsxHPN.png\" alt=\"iconsxHPN\" title=\"xHPN: Extended Hybrid PetriNets\"></p>
<p>The main package PNlib is divided into the following sub-packages:</p>
<ul>
<li><em>Interfaces</em>: contains the connectors of the Petri net component models.</li>
<li><em>Blocks</em>: contains blocks with specific procedures that are used in the Petri
net component models.</li>
<li><em>Functions</em>: contains functions with specific algorithmic procedures which
are used in the Petri net component models.</li>
<li><em>Constants</em>: contains constants which are used in the Petri net component
models.</li>
<li><em>Examples</em>: contains several examples and unit tests.</li>
</ul>
<h2 id=\"license\">License</h2>
<p>This package is licensed with the <a href=\"https://github.com/AMIT-HSBI/PNlib/blob/v3.0.0/LICENSE\">3-Clause BSD License</a>.</p>
<h2 id=\"development-and-contribution\">Development and contribution</h2>
Hochschule Bielefeld - University of Applied Sciences and Arts<br>
Faculty of Engineering and Mathematics
<ul>
<li>Sabrina Proß</li>
<li>Lennart Ochel</li>
<li>Timo Lask</li>
<li>Bernhard Bachmann</li>
</ul>
<p>You may report feedback, issues or feature-requests using
<a href=\"https://github.com/AMIT-HSBI/PNlib/issues\">GitHub Issues</a>.
</p>
</html>")
);
end PNlib;
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -54,7 +54,7 @@ Hochschule Bielefeld – University of Applied Sciences and Arts
Faculty of Engineering and Mathematics
```

* Sabrina Pro&szlig;
* Sabrina Proß
* Lennart Ochel
* Timo Lask
* Bernhard Bachmann
Expand Down
115 changes: 0 additions & 115 deletions Testing/Dymola/Makefile

This file was deleted.

33 changes: 0 additions & 33 deletions Testing/Dymola/PNlib.Examples.ConTest.Conflict.mos

This file was deleted.

32 changes: 0 additions & 32 deletions Testing/Dymola/PNlib.Examples.ConTest.ConflictLoop.mos

This file was deleted.

26 changes: 0 additions & 26 deletions Testing/Dymola/PNlib.Examples.ConTest.LoopAndArcweight.mos

This file was deleted.

25 changes: 0 additions & 25 deletions Testing/Dymola/PNlib.Examples.ConTest.PCtoTC.mos

This file was deleted.

0 comments on commit cef401c

Please sign in to comment.