Skip to content
Snippets Groups Projects
Commit 34266141 authored by Sebastian Ebert's avatar Sebastian Ebert
Browse files

signal integration finished

parent 2cdab276
No related branches found
No related tags found
No related merge requests found
...@@ -230,8 +230,7 @@ task ragConnect(type: JavaExec) { ...@@ -230,8 +230,7 @@ task ragConnect(type: JavaExec) {
'--tracing=flush', '--tracing=flush',
'--experimental-jastadd-329', '--experimental-jastadd-329',
'--logReads', '--logReads',
'--logWrites', '--logWrites'
'--logIncremental'
]) ])
} }
......
...@@ -72,14 +72,13 @@ public abstract class DiNeRosNode extends AbstractNodeMain { ...@@ -72,14 +72,13 @@ public abstract class DiNeRosNode extends AbstractNodeMain {
this.connectedNode.shutdown(); this.connectedNode.shutdown();
} }
public void notify(java.lang.String notificationType){ public synchronized void notify(java.lang.String notificationType){
Set<Transition> signalFilteredTransitions = getSignalFilteredTransitions(); Set<Transition> signalFilteredTransitions = getSignalFilteredTransitions();
if (notificationType.equals(NOTIFICATION_MARKING_CHANGE)) { if (notificationType.equals(NOTIFICATION_MARKING_CHANGE)) {
onMarkingChangeInternal(signalFilteredTransitions); onMarkingChangeInternal(signalFilteredTransitions);
} else if (notificationType.equals(NOTIFICATION_SIGNAL_CHANGE)) { } else if (notificationType.equals(NOTIFICATION_SIGNAL_CHANGE)) {
System.out.println("NOTIFICATION_SIGNAL_CHANGE");
onSignalChangeInternal(signalFilteredTransitions); onSignalChangeInternal(signalFilteredTransitions);
} else if (notificationType.equals(NOTIFICATION_WAIT_ENDED)) { } else if (notificationType.equals(NOTIFICATION_WAIT_ENDED)) {
onWaitEndedInternal(signalFilteredTransitions); onWaitEndedInternal(signalFilteredTransitions);
...@@ -90,7 +89,7 @@ public abstract class DiNeRosNode extends AbstractNodeMain { ...@@ -90,7 +89,7 @@ public abstract class DiNeRosNode extends AbstractNodeMain {
} }
@NotNull @NotNull
private Set<Transition> getSignalFilteredTransitions() { protected Set<Transition> getSignalFilteredTransitions() {
Set<Transition> signalFilteredTransitions = new HashSet<>(); Set<Transition> signalFilteredTransitions = new HashSet<>();
ClauseValuesDefinition clauseValuesDefinition = new ClauseValuesDefinition(); ClauseValuesDefinition clauseValuesDefinition = new ClauseValuesDefinition();
......
...@@ -16,7 +16,7 @@ public class DinerosTestNode extends DiNeRosNode { ...@@ -16,7 +16,7 @@ public class DinerosTestNode extends DiNeRosNode {
} }
public DinerosTestNode(String nodeName, PetriNet petriNet, BalloonMarking marking, BalloonCallbackStorage callbackStorage) { 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.marking = marking;
this.callbackStorage = callbackStorage; this.callbackStorage = callbackStorage;
} }
...@@ -46,9 +46,8 @@ public class DinerosTestNode extends DiNeRosNode { ...@@ -46,9 +46,8 @@ public class DinerosTestNode extends DiNeRosNode {
FiringSelectionSuccess fsc = new FiringSelectionSuccess(); FiringSelectionSuccess fsc = new FiringSelectionSuccess();
System.out.println("#EnabledTrans: " + marking.enabledBalloonTransitions().size()); 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("Firing transition: " + t.getId());
//System.out.println(marking.print());
fsc.setTransition(t); fsc.setTransition(t);
break; break;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment