Merge remote-tracking branch 'oszkar/datastructure' into datastructure

5 files changed, 20 insertions, 18 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 b1c51506..0f1702ea 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,7 +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.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.statecoding.StateCoderAdapter;
 import tools.refinery.visualization.ModelVisualizerAdapter;
 
@@ -23,7 +23,7 @@ public class BestFirstWorker {
         final ActivationStoreWorker activationStoreWorker;
         final StateCoderAdapter stateCoderAdapter;
         final DesignSpaceExplorationAdapter explorationAdapter;
-        final ViatraModelQueryAdapter queryAdapter;
+        final ModelQueryAdapter queryAdapter;
         final ModelVisualizerAdapter visualizerAdapter;
         final boolean isVisualizationEnabled;
 
@@ -33,10 +33,10 @@ 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());
                 visualizerAdapter = model.getAdapter(ModelVisualizerAdapter.class);
-                queryAdapter = model.getAdapter(ViatraModelQueryAdapter.class);
                 System.out.println("visualizerAdapter = " + visualizerAdapter);
                 isVisualizationEnabled = visualizerAdapter != null;
         }
@@ -110,7 +110,9 @@ public class BestFirstWorker {
 
         public RandomVisitResult visitRandomUnvisited(Random random) {
                 if (!model.hasUncommittedChanges()) {
+                        queryAdapter.flushChanges();
                         var visitResult = activationStoreWorker.fireRandomActivation(this.last, random);
+
                         if (visitResult.successfulVisit()) {
                                 Version oldVersion = null;
                                 if (isVisualizationEnabled) {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriteria.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriteria.java
index e2260cca..e6dddd53 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriteria.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriteria.java
@@ -12,27 +12,27 @@ import tools.refinery.store.query.ModelQueryBuilder;
 import tools.refinery.store.query.dnf.AnyQuery;
 
 public class QueryCriteria implements Criterion {
-        protected final boolean acceptIfHasMatch;
+        protected final boolean satisfiedIfHasMatch;
         protected final AnyQuery query;
 
         /**
          * Criteria based on the existence of matches evaluated on the model.
          * @param query The query evaluated on the model.
-         * @param acceptIfHasMatch If true, the criteria satisfied if the query has any match on the model. Otherwise,
+         * @param satisfiedIfHasMatch If true, the criteria satisfied if the query has any match on the model. Otherwise,
          *                            the criteria satisfied if the query has no match on the model.
          */
-        public QueryCriteria(AnyQuery query, boolean acceptIfHasMatch) {
+        public QueryCriteria(AnyQuery query, boolean satisfiedIfHasMatch) {
                 this.query = query;
-                this.acceptIfHasMatch = acceptIfHasMatch;
+                this.satisfiedIfHasMatch = satisfiedIfHasMatch;
         }
 
         @Override
         public CriterionCalculator createCalculator(Model model) {
                 var resultSet = model.getAdapter(ModelQueryAdapter.class).getResultSet(query);
-                if(acceptIfHasMatch) {
+                if(satisfiedIfHasMatch) {
                         return () -> resultSet.size() > 0;
                 } else {
-                        return () -> resultSet.size() == 0;
+                        return () ->  resultSet.size() == 0;
                 }
         }
 
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) {