From 3426614185b7cc84734869d221e6735cfab19ffb Mon Sep 17 00:00:00 2001 From: SebastianEbert <sebastian.ebert@tu-dresden.de> Date: Mon, 5 Jun 2023 15:49:18 +0200 Subject: [PATCH] signal integration finished --- build.gradle | 3 +-- .../de/tudresden/inf/st/pnml/engine/ros/DiNeRosNode.java | 5 ++--- .../inf/st/pnml/engine/testNodes/DinerosTestNode.java | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index a31c9c7..f1fccff 100644 --- a/build.gradle +++ b/build.gradle @@ -230,8 +230,7 @@ task ragConnect(type: JavaExec) { '--tracing=flush', '--experimental-jastadd-329', '--logReads', - '--logWrites', - '--logIncremental' + '--logWrites' ]) } diff --git a/src/main/java/de/tudresden/inf/st/pnml/engine/ros/DiNeRosNode.java b/src/main/java/de/tudresden/inf/st/pnml/engine/ros/DiNeRosNode.java index 425542c..76f99e1 100644 --- a/src/main/java/de/tudresden/inf/st/pnml/engine/ros/DiNeRosNode.java +++ b/src/main/java/de/tudresden/inf/st/pnml/engine/ros/DiNeRosNode.java @@ -72,14 +72,13 @@ public abstract class DiNeRosNode extends AbstractNodeMain { this.connectedNode.shutdown(); } - public void notify(java.lang.String notificationType){ + public synchronized void notify(java.lang.String notificationType){ Set<Transition> signalFilteredTransitions = getSignalFilteredTransitions(); if (notificationType.equals(NOTIFICATION_MARKING_CHANGE)) { onMarkingChangeInternal(signalFilteredTransitions); } else if (notificationType.equals(NOTIFICATION_SIGNAL_CHANGE)) { - System.out.println("NOTIFICATION_SIGNAL_CHANGE"); onSignalChangeInternal(signalFilteredTransitions); } else if (notificationType.equals(NOTIFICATION_WAIT_ENDED)) { onWaitEndedInternal(signalFilteredTransitions); @@ -90,7 +89,7 @@ public abstract class DiNeRosNode extends AbstractNodeMain { } @NotNull - private Set<Transition> getSignalFilteredTransitions() { + protected Set<Transition> getSignalFilteredTransitions() { Set<Transition> signalFilteredTransitions = new HashSet<>(); ClauseValuesDefinition clauseValuesDefinition = new ClauseValuesDefinition(); diff --git a/src/main/java/de/tudresden/inf/st/pnml/engine/testNodes/DinerosTestNode.java b/src/main/java/de/tudresden/inf/st/pnml/engine/testNodes/DinerosTestNode.java index b39ed23..d931a9e 100644 --- a/src/main/java/de/tudresden/inf/st/pnml/engine/testNodes/DinerosTestNode.java +++ b/src/main/java/de/tudresden/inf/st/pnml/engine/testNodes/DinerosTestNode.java @@ -16,7 +16,7 @@ public class DinerosTestNode extends DiNeRosNode { } public DinerosTestNode(String nodeName, PetriNet petriNet, BalloonMarking marking, BalloonCallbackStorage callbackStorage) { - super(nodeName, petriNet, "localhost:2000", "mqtt"); + super(nodeName, petriNet, "localhost", "mqtt"); this.marking = marking; this.callbackStorage = callbackStorage; } @@ -46,9 +46,8 @@ public class DinerosTestNode extends DiNeRosNode { FiringSelectionSuccess fsc = new FiringSelectionSuccess(); System.out.println("#EnabledTrans: " + marking.enabledBalloonTransitions().size()); - for(Transition t : marking.enabledBalloonTransitions()){ + for(Transition t : getSignalFilteredTransitions()){ System.out.println("Firing transition: " + t.getId()); - //System.out.println(marking.print()); fsc.setTransition(t); break; } -- GitLab