Add return value to fireRandomActivation

3 files changed, 7 insertions, 8 deletions

diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/DesignSpaceExplorationAdapter.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/DesignSpaceExplorationAdapter.java
index c45f088a..5aed5298 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/DesignSpaceExplorationAdapter.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/DesignSpaceExplorationAdapter.java
@@ -50,7 +50,7 @@ public interface DesignSpaceExplorationAdapter extends ModelAdapter {
 
         public boolean fireActivation(Activation activation);
 
-        public void fireRandomActivation();
+        public boolean fireRandomActivation();
 
         public List<Version> getTrajectory();
 
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/DesignSpaceExplorationAdapterImpl.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/DesignSpaceExplorationAdapterImpl.java
index 04bba885..220f0b2d 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/DesignSpaceExplorationAdapterImpl.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/DesignSpaceExplorationAdapterImpl.java
@@ -252,7 +252,6 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
                         if (isNewState) {
                                 modelVisualizerAdapter.addState(newState, getFitness().values());
                         }
-                        // TODO: Change to this:
                         modelVisualizerAdapter.addTransition(previousState, newState, activation.transformationRule().getName(),
                                         activation.activation());
                 }
@@ -260,11 +259,10 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
         }
 
         @Override
-        public void fireRandomActivation() {
+        public boolean fireRandomActivation() {
                 var activations = getUntraversedActivations();
                 if (activations.isEmpty()) {
-//                      TODO: throw exception
-                        return;
+                        return false;
                 }
                 int index = random.nextInt(activations.size());
                 var iterator = activations.iterator();
@@ -272,7 +270,7 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
                         iterator.next();
                 }
                 var activationId = iterator.next();
-                fireActivation(activationId);
+                return fireActivation(activationId);
         }
 
         public List<Activation> getAllActivations() {
@@ -284,7 +282,6 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
         }
 
         public boolean isCurrentStateAlreadyTraversed() {
-//              TODO: check isomorphism?
                 return !isNewState;
         }
 
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java
index 5f7f61b8..0a0caa7e 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java
@@ -67,7 +67,9 @@ public class DepthFirstStrategy implements Strategy {
                                 return;
                         }
 
-                        dseAdapter.fireRandomActivation();
+                        if (!dseAdapter.fireRandomActivation()) {
+                                return;
+                        }
                 }
         }