Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 3.0.0 #80

Merged
merged 6 commits into from
Feb 13, 2024
Merged

Release 3.0.0 #80

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd7f0c6
Release 3.0.0
phannebohm Aug 29, 2023
952894f
Merge branch 'master' into release-3.0.0
phannebohm Feb 3, 2024
1ea76ba
Update RevisionHistory
phannebohm Feb 3, 2024
cb7596d
Merge branch 'master' into release-3.0.0
phannebohm Feb 5, 2024
f77314b
Prepare README
phannebohm Feb 13, 2024
150e12b
Finalizing release
AnHeuermann Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions PNlib/UsersGuide/Contact.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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.21.0</li>
AnHeuermann marked this conversation as resolved.
Show resolved Hide resolved
<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
2 changes: 1 addition & 1 deletion PNlib/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package PNlib
annotation(
uses(Modelica(version = "4.0.0")),
version = "2.2");
version = "3.0.0");
AnHeuermann marked this conversation as resolved.
Show resolved Hide resolved
end PNlib;
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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