Skip to content

Commit

Permalink
Updated the "About" page (#176)
Browse files Browse the repository at this point in the history
  • Loading branch information
@srba
srba authored Sep 19, 2024
2 parents 2ad8c7b + f7006cd commit 28b5790
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 336 deletions.
4 changes: 2 additions & 2 deletions src/main/java/dk/aau/cs/io/TapnEngineXmlLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ private SharedTransition parseSharedTransition(Element element, ConstantStore co
String firingModeStr = element.getAttribute("firingMode");
SMCDistribution distribution = SMCDistribution.defaultDistribution();
Probability weight = new DoubleProbability(1.0);
FiringMode firingMode = new OldestFiringMode();
FiringMode firingMode = new RandomFiringMode();
if(!distrib.isEmpty()){
distribution = SMCDistribution.parseXml(element);
}
Expand Down Expand Up @@ -423,7 +423,7 @@ private TimedTransitionComponent parseTransition(Element transition, TimedArcPet
int priority = 0;
SMCDistribution distribution = SMCDistribution.defaultDistribution();
Probability weight = new DoubleProbability(1.0);
FiringMode firingMode = new OldestFiringMode();
FiringMode firingMode = new RandomFiringMode();
if(!posX.isEmpty()){
positionXInput = (int)Double.parseDouble(posX);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/dk/aau/cs/io/TapnXmlLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ private SharedTransition parseSharedTransition(Element element, ConstantStore co
String firingModeStr = element.getAttribute("firingMode");
SMCDistribution distribution = SMCDistribution.defaultDistribution();
Probability weight = new DoubleProbability(1.0);
FiringMode firingMode = new OldestFiringMode();
FiringMode firingMode = new RandomFiringMode();
if(!distrib.isEmpty()){
distribution = SMCDistribution.parseXml(element);
}
Expand Down Expand Up @@ -461,7 +461,7 @@ private TimedTransitionComponent parseTransition(Element transition, TimedArcPet
int priority = 0;
SMCDistribution distribution = SMCDistribution.defaultDistribution();
Probability weight = new DoubleProbability(1.0);
FiringMode firingMode = new OldestFiringMode();
FiringMode firingMode = new RandomFiringMode();

if(!posX.isEmpty()){
positionXInput = (int)Double.parseDouble(posX);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/dk/aau/cs/model/tapn/SharedTransition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import dk.aau.cs.model.CPN.Expressions.GuardExpression;
import dk.aau.cs.model.tapn.simulation.FiringMode;
import dk.aau.cs.model.tapn.simulation.OldestFiringMode;
import dk.aau.cs.model.tapn.simulation.RandomFiringMode;
import dk.aau.cs.util.IntervalOperations;
import dk.aau.cs.util.Require;

Expand All @@ -20,7 +21,7 @@ public class SharedTransition {
private boolean isUncontrollable = false;
private SMCDistribution distribution = SMCDistribution.defaultDistribution();
private Probability weight = new DoubleProbability(1.0);
private FiringMode firingMode = new OldestFiringMode();
private FiringMode firingMode = new RandomFiringMode();
private GuardExpression guard = null;

private TimedArcPetriNetNetwork network;
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/dk/aau/cs/model/tapn/TimedTransition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import dk.aau.cs.model.CPN.ColoredTimeInterval;
import dk.aau.cs.model.CPN.Expressions.GuardExpression;
import dk.aau.cs.model.tapn.simulation.OldestFiringMode;
import dk.aau.cs.model.tapn.simulation.RandomFiringMode;
import pipe.gui.petrinet.animation.Animator;

import dk.aau.cs.model.tapn.Bound.InfBound;
Expand All @@ -31,7 +32,7 @@ public class TimedTransition extends TAPNElement {
private boolean isUncontrollable = false;
private SMCDistribution distribution = SMCDistribution.defaultDistribution();
private Probability weight = new DoubleProbability(1.0);
private FiringMode firingMode = new OldestFiringMode();
private FiringMode firingMode = new RandomFiringMode();
private GuardExpression guard;

private SharedTransition sharedTransition;
Expand Down Expand Up @@ -139,7 +140,7 @@ public void setFiringMode(FiringMode firingMode) {

public FiringMode getFiringMode() {
if (firingMode == null) {
firingMode = new OldestFiringMode();
firingMode = new RandomFiringMode();
}

return firingMode;
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/net/tapaal/gui/GuiFrameController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,28 +243,28 @@ public void showAbout() {

buffer.append("Credits\n\n");
buffer.append("TAPAAL GUI and Translations:\n");
buffer.append("Mathias Andersen, Sine V. Birch, Jacob Hjort Bundgaard, Joakim Byg, Malo Dautry, \nJakob Dyhr, Louise Foshammer, Malte Neve-Gr\u00E6sb\u00F8ll, ");
buffer.append("Lasse Jacobsen, Morten Jacobsen,\nThomas S. Jacobsen, Jacob J. Jensen, Peter G. Jensen, ");
buffer.append("Mathias Andersen, Sine V. Birch, Jacob Hjort Bundgaard, Joakim Byg, Malo Dautry, \nTanguy Dubois, Jakob Dyhr, Louise Foshammer, Malte Neve-Gr\u00E6sb\u00F8ll, ");
buffer.append("Lasse Jacobsen, \nMorten Jacobsen,Thomas S. Jacobsen, Jacob J. Jensen, Peter G. Jensen, ");
buffer.append("Mads Johannsen,\nKenneth Y. J\u00F8rgensen, Mikael H. M\u00F8ller, Christoffer Moesgaard, Kristian Morsing Pedersen,\nThomas Pedersen, Lena S. Ernstsen, Niels N. Samuelsen, Jiri Srba, Mathias G. S\u00F8rensen,\nJakob H. Taankvist, Peter H. Taankvist and Mikkel Tygesen\n");

buffer.append("Aalborg University 2008-2023\n\n");
buffer.append("Aalborg University 2008-2024\n\n");

buffer.append("TAPAAL Continuous Engine (verifytapn):\n");
buffer.append("Alexandre David, Lasse Jacobsen, Morten Jacobsen and Jiri Srba\n");
buffer.append("Aalborg University 2011-2023\n\n");
buffer.append("Aalborg University 2011-2024\n\n");

buffer.append("TAPAAL Discrete Engine (verifydtapn):\n");
buffer.append("Mathias Andersen, Peter G. Jensen, Heine G. Larsen, Jiri Srba,\n");
buffer.append("Mathias Andersen, Tanguy Dubois, Peter G. Jensen, Heine G. Larsen, Jiri Srba,\n");
buffer.append("Mathias G. S\u00F8rensen and Jakob H. Taankvist\n");
buffer.append("Aalborg University 2012-2023\n\n");
buffer.append("Aalborg University 2012-2024\n\n");

buffer.append("TAPAAL Untimed Engine (verifypn):\n");
buffer.append("Alexander Bilgram, Frederik M. B\u00F8nneland, Jakob Dyhr, Malo Dautry, Peter Fogh, ");
buffer.append("Jonas F. Jensen,\nLasse S. Jensen, Peter G. Jensen, Nicolaj \u00D8. Jensen,");
buffer.append("Tobias S. Jepsen,\nMads Johannsen, Kenneth Y. J\u00F8rgensen, Mads Johannsen, Isabella Kaufmann,\n");
buffer.append("Andreas H. Klostergaard, S\u00F8ren M. Nielsen, Thomas S. Nielsen, ");
buffer.append("Samuel Pastva,\nThomas Pedersen, Jiri Srba, Mathias M. S\u00F8rensen, Peter H. Taankvist, Rasmus G. Tollund,\nNikolaj J. Ulrik, Simon M. Virenfeldt, Lars K. Oestergaard, Emil G. Henriksen,\nAlan M. Khorsid, Esben Nielsen, Theodor Risager, Adam M. St\u00FCck and Andreas S. S\u00F8rensen\n");
buffer.append("Aalborg University 2014-2023\n\n");
buffer.append("Aalborg University 2014-2024\n\n");


buffer.append("\n");
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/pipe/gui/petrinet/graphicElements/tapn/TimedTransitionComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import javax.swing.*;

import dk.aau.cs.model.tapn.*;
import dk.aau.cs.model.tapn.simulation.RandomFiringMode;
import net.tapaal.gui.petrinet.TAPNLens;
import dk.aau.cs.model.CPN.Expressions.GuardExpression;
import pipe.gui.TAPAALGUI;
Expand Down Expand Up @@ -216,6 +217,11 @@ public void update(boolean displayConstantNames) {
( underlyingTransition().getWeight() instanceof ConstantProbability ||
underlyingTransition().getWeight().value() != 1 ?
"\nW=" + underlyingTransition().getWeight().toString() : ""
) +
(
underlyingTransition().getFiringMode() instanceof RandomFiringMode ?
"" :
"\nM=" + underlyingTransition().getFiringMode().toString()
)
);
}
Expand Down
Loading

0 comments on commit 28b5790

Please sign in to comment.