missing synchronized statements and flush added

4 files changed, 14 insertions, 10 deletions

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 b8662d8d..f28505c3 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
@@ -11,6 +11,7 @@ import tools.refinery.store.dse.transition.VersionWithObjectiveValue;
 import tools.refinery.store.dse.transition.statespace.internal.ActivationStoreWorker;
 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 java.util.Random;
@@ -21,6 +22,7 @@ public class BestFirstWorker {
         final ActivationStoreWorker activationStoreWorker;
         final StateCoderAdapter stateCoderAdapter;
         final DesignSpaceExplorationAdapter explorationAdapter;
+        final ModelQueryAdapter queryAdapter;
 
         public BestFirstWorker(BestFirstStoreManager storeManager, Model model) {
                 this.storeManager = storeManager;
@@ -28,9 +30,9 @@ public class BestFirstWorker {
 
                 explorationAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
                 stateCoderAdapter = model.getAdapter(StateCoderAdapter.class);
+                queryAdapter = model.getAdapter(ModelQueryAdapter.class);
                 activationStoreWorker = new ActivationStoreWorker(storeManager.getActivationStore(),
                                 explorationAdapter.getTransformations());
-
         }
 
         private VersionWithObjectiveValue last = null;
@@ -93,7 +95,9 @@ public class BestFirstWorker {
 
         public RandomVisitResult visitRandomUnvisited(Random random) {
                 if (!model.hasUncommittedChanges()) {
+                        queryAdapter.flushChanges();
                         var visitResult = activationStoreWorker.fireRandomActivation(this.last, random);
+
                         if (visitResult.successfulVisit()) {
                                 return new RandomVisitResult(submit(), visitResult.mayHaveMore());
                         } else {
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 559c715a..fbd5b17f 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
@@ -29,7 +29,7 @@ public class ActivationStoreImpl implements ActivationStore {
                         successful[0] = true;
                         List<ActivationStoreEntry> result = new ArrayList<>(emptyEntrySizes.length);
                         for(int emptyEntrySize : emptyEntrySizes) {
-                                result.add(ActivationStoreListEntry.create(emptyEntrySize));
+                                result.add(ActivationStoreEntry.create(emptyEntrySize));
                         }
                         return result;
                 });
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 75e117c0..faeedba5 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
@@ -15,13 +15,14 @@ public abstract class FastEquivalenceClassStore extends AbstractEquivalenceClass
 
         final IntHashSet codes;
 
-        public FastEquivalenceClassStore(StateCoderStoreAdapter stateCoderStoreAdapter) {
+        protected FastEquivalenceClassStore(StateCoderStoreAdapter stateCoderStoreAdapter) {
                 super(stateCoderStoreAdapter);
                 this.codes = new IntHashSet();
         }
 
         @Override
-        protected boolean tryToAdd(StateCoderResult stateCoderResult, VersionWithObjectiveValue newVersion, int[] emptyActivations, boolean accept) {
+        protected synchronized boolean tryToAdd(StateCoderResult stateCoderResult, VersionWithObjectiveValue newVersion,
+                                                                int[] emptyActivations, boolean accept) {
                 return this.codes.add(stateCoderResult.modelCode());
         }
 
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ObjectivePriorityQueueImpl.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ObjectivePriorityQueueImpl.java
index c88a411f..2f3e142a 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ObjectivePriorityQueueImpl.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ObjectivePriorityQueueImpl.java
@@ -9,7 +9,6 @@ import tools.refinery.store.dse.transition.ObjectiveValues;
 import tools.refinery.store.dse.transition.VersionWithObjectiveValue;
 import tools.refinery.store.dse.transition.objectives.Objective;
 import tools.refinery.store.dse.transition.statespace.ObjectivePriorityQueue;
-import tools.refinery.store.map.Version;
 
 import java.util.Comparator;
 import java.util.List;
@@ -37,27 +36,27 @@ public class ObjectivePriorityQueueImpl implements ObjectivePriorityQueue {
         }
 
         @Override
-        public void submit(VersionWithObjectiveValue versionWithObjectiveValue) {
+        public synchronized void submit(VersionWithObjectiveValue versionWithObjectiveValue) {
                 priorityQueue.add(versionWithObjectiveValue);
         }
 
         @Override
-        public void remove(VersionWithObjectiveValue versionWithObjectiveValue) {
+        public synchronized void remove(VersionWithObjectiveValue versionWithObjectiveValue) {
                 priorityQueue.remove(versionWithObjectiveValue);
         }
 
         @Override
-        public int getSize() {
+        public synchronized int getSize() {
                 return priorityQueue.size();
         }
 
         @Override
-        public VersionWithObjectiveValue getBest() {
+        public synchronized VersionWithObjectiveValue getBest() {
                 return priorityQueue.peek();
         }
 
         @Override
-        public VersionWithObjectiveValue getRandom(Random random) {
+        public synchronized VersionWithObjectiveValue getRandom(Random random) {
                 int randomPosition = random.nextInt(getSize());
                 for (VersionWithObjectiveValue entry : this.priorityQueue) {
                         if (randomPosition-- == 0) {