StateCoderBuilder improvement with individuals, and customizable calculators.

1 files changed, 48 insertions, 3 deletions

diff --git a/subprojects/store/src/test/java/tools/refinery/store/statecoding/StateCoderBuildTest.java b/subprojects/store/src/test/java/tools/refinery/store/statecoding/StateCoderBuildTest.java
index b0b80af7..a4e953ea 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/statecoding/StateCoderBuildTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/statecoding/StateCoderBuildTest.java
@@ -19,11 +19,10 @@ class StateCoderBuildTest {
         Symbol<Boolean> friend = new Symbol<>("friend", 2, Boolean.class, false);
 
         @Test
-        void simpleStateCoderTest() {
+        void simpleStateCoderBuildTest() {
                 var store = ModelStore.builder()
                                 .symbols(person, age, friend)
-                                .with(StateCoderAdapter
-                                                .builder())
+                                .with(StateCoderAdapter.builder())
                                 .build();
 
                 var model = store.createEmptyModel();
@@ -33,6 +32,7 @@ class StateCoderBuildTest {
                 var personI = model.getInterpretation(person);
                 var friendI = model.getInterpretation(friend);
                 var ageI = model.getInterpretation(age);
+
                 fill(personI, friendI, ageI);
 
                 stateCoder.calculateStateCode();
@@ -68,6 +68,51 @@ class StateCoderBuildTest {
                 assertEquals(code,stateCoder.calculateStateCode().modelCode());
         }
 
+        @Test
+        void notIndividualTest() {
+                var store = ModelStore.builder()
+                                .symbols(friend)
+                                .with(StateCoderAdapter.builder())
+                                .build();
+
+                var model = store.createEmptyModel();
+                var stateCoder = model.getAdapter(StateCoderAdapter.class);
+
+                var friendI = model.getInterpretation(friend);
+
+                friendI.put(Tuple.of(1,2),true);
+                int code1 = stateCoder.calculateModelCode();
+
+                friendI.put(Tuple.of(1,2),false);
+                friendI.put(Tuple.of(2,1),true);
+                int code2 = stateCoder.calculateModelCode();
+
+                assertEquals(code1,code2);
+        }
+
+        @Test
+        void individualTest() {
+                var store = ModelStore.builder()
+                                .symbols(friend)
+                                .with(StateCoderAdapter.builder()
+                                                .individual(Tuple.of(1)))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var stateCoder = model.getAdapter(StateCoderAdapter.class);
+
+                var friendI = model.getInterpretation(friend);
+
+                friendI.put(Tuple.of(1,2),true);
+                int code1 = stateCoder.calculateModelCode();
+
+                friendI.put(Tuple.of(1,2),false);
+                friendI.put(Tuple.of(2,1),true);
+                int code2 = stateCoder.calculateModelCode();
+
+                assertNotEquals(code1,code2);
+        }
+
         private static void fill(Interpretation<Boolean> personI, Interpretation<Boolean> friendI, Interpretation<Integer> ageI) {
                 personI.put(Tuple.of(1), true);
                 personI.put(Tuple.of(2), true);