restructured DSE framework, failing build

5 files changed, 81 insertions, 7 deletions

diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
index 225de32e..b0b416e1 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
@@ -8,13 +8,13 @@ package tools.refinery.store.dse;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.dse.objectives.AlwaysSatisfiedRandomHardObjective;
+import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.dse.internal.TransformationRule;
+import tools.refinery.store.dse.transition.TransformationRule;
 import tools.refinery.store.dse.strategy.BestFirstStrategy;
-import tools.refinery.store.dse.strategy.DepthFirstStrategy;
 import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.KeyOnlyView;
@@ -282,5 +282,5 @@ class CRAExamplesTest {
                 var states = dseAdapter.explore();
                 System.out.println("states size: " + states.size());
         }
-
+*/
 }
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
index c6da896c..461d9353 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
@@ -8,11 +8,11 @@ package tools.refinery.store.dse;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.dse.objectives.AlwaysSatisfiedRandomHardObjective;
+import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.dse.internal.TransformationRule;
-import tools.refinery.store.dse.strategy.BestFirstStrategy;
+import tools.refinery.store.dse.transition.TransformationRule;
 import tools.refinery.store.dse.strategy.DepthFirstStrategy;
 import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
 import tools.refinery.store.query.view.AnySymbolView;
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DesignSpaceExplorationTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DesignSpaceExplorationTest.java
index 91e33f4a..083f7ec3 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DesignSpaceExplorationTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DesignSpaceExplorationTest.java
@@ -6,10 +6,11 @@
 package tools.refinery.store.dse;
 
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.dse.internal.TransformationRule;
+import tools.refinery.store.dse.transition.TransformationRule;
 import tools.refinery.store.dse.strategy.BestFirstStrategy;
 import tools.refinery.store.dse.strategy.DepthFirstStrategy;
 import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/TransformationRuleTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/TransformationRuleTest.java
index 5d24d712..1672b63a 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/TransformationRuleTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/TransformationRuleTest.java
@@ -7,10 +7,11 @@ package tools.refinery.store.dse;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.dse.strategy.DepthFirstStrategy;
+import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.dse.internal.TransformationRule;
+import tools.refinery.store.dse.transition.TransformationRule;
 import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.KeyOnlyView;
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/statespace/internal/ActivationUnitTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/statespace/internal/ActivationUnitTest.java
new file mode 100644
index 00000000..e7960a06
--- /dev/null
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/statespace/internal/ActivationUnitTest.java
@@ -0,0 +1,72 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.statespace.internal;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+class ActivationUnitTest {
+        private final static int SMALL_SIZE = 5;
+
+        private static Stream<ActivationStoreEntry> entries() {
+                return Stream.of(
+                                new ActivationStoreBitVectorEntry(SMALL_SIZE),
+                                new ActivationStoreListEntry(SMALL_SIZE));
+        }
+
+        void addTest(ActivationStoreEntry entry, int elementsAdded) {
+                Assertions.assertEquals(elementsAdded,entry.getNumberOfVisitedActivations());
+                Assertions.assertEquals(SMALL_SIZE-elementsAdded,entry.getNumberOfUnvisitedActivations());
+        }
+
+        @ParameterizedTest
+        @MethodSource("entries")
+        void testDifferent(ActivationStoreEntry entry) {
+                int elementsAdded = 0;
+                addTest(entry,elementsAdded);
+                Assertions.assertEquals(2, entry.getAndAddActivationAfter(2));
+                addTest(entry,++elementsAdded);
+                Assertions.assertEquals(3,entry.getAndAddActivationAfter(3));
+                addTest(entry,++elementsAdded);
+                Assertions.assertEquals(1,entry.getAndAddActivationAfter(1));
+                addTest(entry,++elementsAdded);
+                Assertions.assertEquals(4,entry.getAndAddActivationAfter(4));
+                addTest(entry,++elementsAdded);
+                Assertions.assertEquals(0,entry.getAndAddActivationAfter(0));
+                addTest(entry,++elementsAdded);
+        }
+
+        @ParameterizedTest
+        @MethodSource("entries")
+        void testSame(ActivationStoreEntry entry) {
+                int elementsAdded = 0;
+                addTest(entry,elementsAdded);
+                entry.getAndAddActivationAfter(2);
+                addTest(entry,++elementsAdded);
+                entry.getAndAddActivationAfter(2);
+                addTest(entry,++elementsAdded);
+                entry.getAndAddActivationAfter(2);
+                addTest(entry,++elementsAdded);
+                entry.getAndAddActivationAfter(2);
+                addTest(entry,++elementsAdded);
+                entry.getAndAddActivationAfter(2);
+                addTest(entry,++elementsAdded);
+        }
+
+        @ParameterizedTest
+        @MethodSource("entries")
+        void testFilling(ActivationStoreEntry entry) {
+                int elementsAdded = 0;
+                while(elementsAdded < SMALL_SIZE) {
+                        entry.getAndAddActivationAfter(2);
+                        elementsAdded++;
+                }
+                Assertions.assertThrows(IllegalArgumentException.class,()-> entry.getAndAddActivationAfter(2));
+        }
+}