5 files changed, 13 insertions, 7 deletions

diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/propagation/impl/PropagationAdapterImpl.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/propagation/impl/PropagationAdapterImpl.java
index 586a8d7a..fdd19217 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/propagation/impl/PropagationAdapterImpl.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/propagation/impl/PropagationAdapterImpl.java
@@ -31,6 +31,7 @@ class PropagationAdapterImpl implements PropagationAdapter {
                 PropagationResult result = PropagationResult.UNCHANGED;
                 PropagationResult lastResult;
                 do {
+                        model.checkCancelled();
                         lastResult = propagateOne();
                         result = result.andThen(lastResult);
                 } while (lastResult.isChanged());
@@ -40,6 +41,7 @@ class PropagationAdapterImpl implements PropagationAdapter {
         private PropagationResult propagateOne() {
                 PropagationResult result = PropagationResult.UNCHANGED;
                 for (int i = 0; i < boundPropagators.length; i++) {
+                        model.checkCancelled();
                         var lastResult = propagateUntilFixedPoint(i);
                         result = result.andThen(lastResult);
                         if (result.isRejected()) {
@@ -54,6 +56,7 @@ class PropagationAdapterImpl implements PropagationAdapter {
                 PropagationResult result = PropagationResult.UNCHANGED;
                 PropagationResult lastResult;
                 do {
+                        model.checkCancelled();
                         lastResult = propagator.propagateOne();
                         result = result.andThen(lastResult);
                 } while (lastResult.isChanged());
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/propagation/impl/rule/BoundPropagationRule.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/propagation/impl/rule/BoundPropagationRule.java
index 6e6a78d2..a70292ad 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/propagation/impl/rule/BoundPropagationRule.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/propagation/impl/rule/BoundPropagationRule.java
@@ -13,10 +13,12 @@ import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.resultset.ResultSet;
 
 class BoundPropagationRule {
+        private final Model model;
         private final ResultSet<Boolean> resultSet;
         private final BoundAction action;
 
         public BoundPropagationRule(Model model, Rule rule) {
+                this.model = model;
                 resultSet = model.getAdapter(ModelQueryAdapter.class).getResultSet(rule.getPrecondition());
                 action = rule.createAction(model);
         }
@@ -27,6 +29,7 @@ class BoundPropagationRule {
                 }
                 var cursor = resultSet.getAll();
                 while (cursor.move()) {
+                        model.checkCancelled();
                         var result = action.fire(cursor.getKey());
                         if (!result) {
                                 return PropagationResult.REJECTED;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstExplorer.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstExplorer.java
index 4a75a3a6..5e2f8fa9 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstExplorer.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstExplorer.java
@@ -19,14 +19,9 @@ public class BestFirstExplorer extends BestFirstWorker {
                 this.random = new Random(id);
         }
 
-        private boolean interrupted = false;
-
-        public void interrupt() {
-                this.interrupted = true;
-        }
-
         private boolean shouldRun() {
-                return !interrupted && !hasEnoughSolution();
+                model.checkCancelled();
+                return !hasEnoughSolution();
         }
 
         public void explore() {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/BoundAction.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/BoundAction.java
index ed2ff33d..4da609fa 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/BoundAction.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/BoundAction.java
@@ -23,6 +23,7 @@ public class BoundAction {
         }
 
         public boolean fire(Tuple activation) {
+                model.checkCancelled();
                 if (this.activation != null) {
                         throw new IllegalStateException("Reentrant firing is not allowed");
                 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationAdapterImpl.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationAdapterImpl.java
index e1a29d40..23325a1f 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationAdapterImpl.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationAdapterImpl.java
@@ -56,6 +56,7 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
         @Override
         public boolean checkAccept() {
                 for (var accept : this.accepts) {
+                        model.checkCancelled();
                         if (!accept.isSatisfied()) {
                                 return false;
                         }
@@ -66,6 +67,7 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
         @Override
         public boolean checkExclude() {
                 for (var exclude : this.excludes) {
+                        model.checkCancelled();
                         if (exclude.isSatisfied()) {
                                 return true;
                         }
@@ -75,6 +77,7 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
 
         @Override
         public ObjectiveValue getObjectiveValue() {
+                model.checkCancelled();
                 if (objectives.size() == 1) {
                         return ObjectiveValue.of(objectives.get(0).getValue());
                 } else if (objectives.size() == 2) {
@@ -82,6 +85,7 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
                 } else {
                         double[] res = new double[objectives.size()];
                         for (int i = 0; i < objectives.size(); i++) {
+                                model.checkCancelled();
                                 res[i] = objectives.get(i).getValue();
                         }
                         return ObjectiveValue.of(res);