fix issues with DSE framework

8 files changed, 69 insertions, 39 deletions

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 9a03b0b8..a2b6268f 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
@@ -36,7 +36,6 @@ public class BestFirstExplorer extends BestFirstWorker {
                         if (lastVisited == null) {
                                 lastVisited = this.restoreToBest();
                                 if(lastVisited == null) {
-                                        visualizerAdapter.visualize();
                                         return;
                                 }
                         }
@@ -162,7 +161,6 @@ public class BestFirstExplorer extends BestFirstWorker {
 */
                 }
                 // Interrupted.
-                visualizerAdapter.visualize();
 
         }
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStoreManager.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStoreManager.java
index 3795daa4..0b9aae9c 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStoreManager.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStoreManager.java
@@ -18,14 +18,20 @@ import tools.refinery.store.dse.transition.statespace.internal.ObjectivePriority
 import tools.refinery.store.dse.transition.statespace.internal.SolutionStoreImpl;
 import tools.refinery.store.map.Version;
 import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.statecoding.StateCoderResult;
 import tools.refinery.store.statecoding.StateCoderStoreAdapter;
+import tools.refinery.visualization.ModelVisualizerStoreAdapter;
+import tools.refinery.visualization.statespace.VisualizationStore;
+import tools.refinery.visualization.statespace.internal.VisualizationStoreImpl;
 
 public class BestFirstStoreManager {
+
         ModelStore modelStore;
         ObjectivePriorityQueue objectiveStore;
         ActivationStore activationStore;
         SolutionStore solutionStore;
         EquivalenceClassStore equivalenceClassStore;
+        VisualizationStore visualizationStore;
 
         public BestFirstStoreManager(ModelStore modelStore) {
                 this.modelStore = modelStore;
@@ -35,17 +41,17 @@ public class BestFirstStoreManager {
                 objectiveStore = new ObjectivePriorityQueueImpl(storeAdapter.getObjectives());
                 Procedure<VersionWithObjectiveValue> whenAllActivationsVisited = x -> objectiveStore.remove(x);
                 activationStore = new ActivationStoreImpl(storeAdapter.getTransformations().size(), whenAllActivationsVisited);
-                solutionStore = new SolutionStoreImpl(10);
+                solutionStore = new SolutionStoreImpl(50);
                 equivalenceClassStore = new FastEquivalenceClassStore(modelStore.getAdapter(StateCoderStoreAdapter.class)) {
                         @Override
                         protected void delegate(VersionWithObjectiveValue version, int[] emptyActivations, boolean accept) {
-                                objectiveStore.submit(version);
-                                activationStore.markNewAsVisited(version, emptyActivations);
-                                if(accept) {
-                                        solutionStore.submit(version);
-                                }
+                                throw new UnsupportedOperationException("This equivalence storage is not prepared to resolve symmetries!");
                         }
                 };
+                visualizationStore = new VisualizationStoreImpl();
+        }
+        public ModelStore getModelStore() {
+                return modelStore;
         }
 
         ObjectivePriorityQueue getObjectiveStore() {
@@ -64,6 +70,10 @@ public class BestFirstStoreManager {
                 return equivalenceClassStore;
         }
 
+        public VisualizationStore getVisualizationStore() {
+                return visualizationStore;
+        }
+
         public void startExploration(Version initial) {
                 BestFirstExplorer bestFirstExplorer = new BestFirstExplorer(this, modelStore.createModelForState(initial), 1);
                 bestFirstExplorer.explore();
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstWorker.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstWorker.java
index 0f1702ea..f1bec14f 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstWorker.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstWorker.java
@@ -13,7 +13,7 @@ import tools.refinery.store.map.Version;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.statecoding.StateCoderAdapter;
-import tools.refinery.visualization.ModelVisualizerAdapter;
+import tools.refinery.visualization.statespace.VisualizationStore;
 
 import java.util.Random;
 
@@ -24,7 +24,7 @@ public class BestFirstWorker {
         final StateCoderAdapter stateCoderAdapter;
         final DesignSpaceExplorationAdapter explorationAdapter;
         final ModelQueryAdapter queryAdapter;
-        final ModelVisualizerAdapter visualizerAdapter;
+        final VisualizationStore visualizationStore;
         final boolean isVisualizationEnabled;
 
         public BestFirstWorker(BestFirstStoreManager storeManager, Model model) {
@@ -36,9 +36,8 @@ public class BestFirstWorker {
                 queryAdapter = model.getAdapter(ModelQueryAdapter.class);
                 activationStoreWorker = new ActivationStoreWorker(storeManager.getActivationStore(),
                                 explorationAdapter.getTransformations());
-                visualizerAdapter = model.getAdapter(ModelVisualizerAdapter.class);
-                System.out.println("visualizerAdapter = " + visualizerAdapter);
-                isVisualizationEnabled = visualizerAdapter != null;
+                visualizationStore = storeManager.getVisualizationStore();
+                isVisualizationEnabled = visualizationStore != null;
         }
 
         private VersionWithObjectiveValue last = null;
@@ -47,28 +46,41 @@ public class BestFirstWorker {
 
         public SubmitResult submit() {
                 if (explorationAdapter.checkExclude()) {
-                        last = null;
                         return new SubmitResult(false, false, null, null);
                 }
 
-                Version version = model.commit();
-                queryAdapter.flushChanges();
-                ObjectiveValue objectiveValue = explorationAdapter.getObjectiveValue();
-                last = new VersionWithObjectiveValue(version, objectiveValue);
                 var code = stateCoderAdapter.calculateStateCode();
-                var accepted = explorationAdapter.checkAccept();
-                boolean isNew = storeManager.getEquivalenceClassStore().submit(last, code,
-                                activationStoreWorker.calculateEmptyActivationSize(), accepted);
-                return new SubmitResult(isNew, accepted, objectiveValue, isNew ? last : null);
+
+                boolean isNew = storeManager.getEquivalenceClassStore().submit(code);
+                if (isNew) {
+                        Version version = model.commit();
+                        ObjectiveValue objectiveValue = explorationAdapter.getObjectiveValue();
+                        var versionWithObjectiveValue = new VersionWithObjectiveValue(version, objectiveValue);
+                        last = versionWithObjectiveValue;
+                        var accepted = explorationAdapter.checkAccept();
+
+                        storeManager.getObjectiveStore().submit(versionWithObjectiveValue);
+                        storeManager.getActivationStore().markNewAsVisited(versionWithObjectiveValue, activationStoreWorker.calculateEmptyActivationSize());
+                        if(accepted) {
+                                storeManager.solutionStore.submit(versionWithObjectiveValue);
+                        }
+
+                        if (isVisualizationEnabled) {
+                                visualizationStore.addState(last.version(), last.objectiveValue().toString());
+                                if (accepted) {
+                                        visualizationStore.addSolution(last.version());
+                                }
+                        }
+
+                        return new SubmitResult(true, accepted, objectiveValue, last);
+                }
+
+                return new SubmitResult(false, false, null, null);
         }
 
         public void restoreToLast() {
                 if (explorationAdapter.getModel().hasUncommittedChanges()) {
-                        var oldVersion = model.getState();
                         explorationAdapter.getModel().restore(last.version());
-                        if (isVisualizationEnabled) {
-                                visualizerAdapter.addTransition(oldVersion, last.version(), "");
-                        }
                 }
         }
 
@@ -78,7 +90,7 @@ public class BestFirstWorker {
                         var oldVersion = model.getState();
                         this.model.restore(bestVersion.version());
                         if (isVisualizationEnabled) {
-                                visualizerAdapter.addTransition(oldVersion, last.version(), "");
+                                visualizationStore.addTransition(oldVersion, last.version(), "");
                         }
                 }
                 return bestVersion;
@@ -105,7 +117,7 @@ public class BestFirstWorker {
                 }
         }
 
-        record RandomVisitResult(SubmitResult submitResult, boolean shouldRetry) {
+        public record RandomVisitResult(SubmitResult submitResult, boolean shouldRetry) {
         }
 
         public RandomVisitResult visitRandomUnvisited(Random random) {
@@ -119,15 +131,9 @@ public class BestFirstWorker {
                                         oldVersion = last.version();
                                 }
                                 var submitResult = submit();
-                                if (isVisualizationEnabled) {
-
-                                        Version newVersion = null;
-                                        if (submitResult.newVersion() != null) {
-                                                newVersion = submitResult.newVersion().version();
-                                                visualizerAdapter.addState(newVersion, submitResult.newVersion().objectiveValue().toString());
-                                                visualizerAdapter.addSolution(newVersion);
-                                        }
-                                        visualizerAdapter.addTransition(oldVersion, newVersion, "");
+                                if (isVisualizationEnabled && submitResult.newVersion() != null) {
+                                        var newVersion = submitResult.newVersion().version();
+                                        visualizationStore.addTransition(oldVersion, newVersion, "");
                                 }
                                 return new RandomVisitResult(submitResult, visitResult.mayHaveMore());
                         } else {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/EquivalenceClassStore.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/EquivalenceClassStore.java
index bbe26fe5..28d1488b 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/EquivalenceClassStore.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/EquivalenceClassStore.java
@@ -10,6 +10,7 @@ import tools.refinery.store.statecoding.StateCoderResult;
 
 public interface EquivalenceClassStore {
         boolean submit(VersionWithObjectiveValue version, StateCoderResult stateCoderResult, int[] emptyActivations, boolean accept);
+        boolean submit(StateCoderResult stateCoderResult);
         boolean hasUnresolvedSymmetry();
         void resolveOneSymmetry();
         int getNumberOfUnresolvedSymmetries();
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/AbstractEquivalenceClassStore.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/AbstractEquivalenceClassStore.java
index 8466a0f3..b5087e86 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/AbstractEquivalenceClassStore.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/AbstractEquivalenceClassStore.java
@@ -22,6 +22,13 @@ public abstract class AbstractEquivalenceClassStore implements EquivalenceClassS
         protected abstract boolean tryToAdd(StateCoderResult stateCoderResult, VersionWithObjectiveValue newVersion,
                                                            int[] emptyActivations, boolean accept);
 
+        public abstract boolean tryToAdd(StateCoderResult stateCoderResult);
+
+        @Override
+        public boolean submit(StateCoderResult stateCoderResult) {
+                return tryToAdd(stateCoderResult);
+        }
+
         @Override
         public synchronized boolean submit(VersionWithObjectiveValue version, StateCoderResult stateCoderResult,
                                                                            int[] emptyActivations, boolean accept) {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreImpl.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreImpl.java
index fbd5b17f..9186741f 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreImpl.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreImpl.java
@@ -69,7 +69,7 @@ public class ActivationStoreImpl implements ActivationStore {
                 if(!hasMoreInActivation) {
                         boolean hasMoreInOtherTransformation = false;
                         for (var e : entries) {
-                                if (e != entry && e.getNumberOfVisitedActivations() > 0) {
+                                if (e != entry && e.getNumberOfUnvisitedActivations() > 0) {
                                         hasMoreInOtherTransformation = true;
                                         break;
                                 }
@@ -108,6 +108,11 @@ public class ActivationStoreImpl implements ActivationStore {
                         sum1 += entry.getNumberOfUnvisitedActivations();
                 }
 
+                if(sum1 == 0) {
+                        this.actionWhenAllActivationVisited.accept(version);
+                        return new VisitResult(false, false, -1, -1);
+                }
+
                 int selected = random.nextInt(sum1);
                 int sum2 = 0;
                 int transformation = 0;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreWorker.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreWorker.java
index e05f5122..881b133c 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreWorker.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreWorker.java
@@ -8,7 +8,6 @@ package tools.refinery.store.dse.transition.statespace.internal;
 import tools.refinery.store.dse.transition.Transformation;
 import tools.refinery.store.dse.transition.VersionWithObjectiveValue;
 import tools.refinery.store.dse.transition.statespace.ActivationStore;
-import tools.refinery.store.map.Version;
 
 import java.util.List;
 import java.util.Random;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/FastEquivalenceClassStore.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/FastEquivalenceClassStore.java
index faeedba5..6eba87d4 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/FastEquivalenceClassStore.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/FastEquivalenceClassStore.java
@@ -26,6 +26,10 @@ public abstract class FastEquivalenceClassStore extends AbstractEquivalenceClass
                 return this.codes.add(stateCoderResult.modelCode());
         }
 
+        public synchronized boolean tryToAdd(StateCoderResult stateCoderResult) {
+                return this.codes.add(stateCoderResult.modelCode());
+        }
+
         @Override
         public void resolveOneSymmetry() {
                 throw new IllegalArgumentException("This equivalence storage is not prepared to resolve symmetries!");