refactor: Model store and query API

Use Adapters to simplify API usage.

10 files changed, 123 insertions, 107 deletions

diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java
index 081112cc..77c62305 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java
@@ -1,18 +1,17 @@
 package tools.refinery.store.map.tests;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.Test;
-
 import tools.refinery.store.map.VersionedMapStore;
 import tools.refinery.store.map.VersionedMapStoreImpl;
-import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.model.TupleHashProvider;
+import tools.refinery.store.tuple.Tuple;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class MapUnitTests {
         @Test
         void defaultTest() {
-                VersionedMapStore<Tuple, Boolean> store = new VersionedMapStoreImpl<Tuple, Boolean>(TupleHashProvider.singleton(), false);
+                VersionedMapStore<Tuple, Boolean> store = new VersionedMapStoreImpl<>(TupleHashProvider.INSTANCE, false);
                 var map = store.createMap();
                 var out1 = map.put(Tuple.of(0), true);
                 assertEquals(false, out1);
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java b/subprojects/store/src/test/java/tools/refinery/store/model/hashtests/HashEfficiencyTest.java
index ceec40f5..bb083805 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/model/hashtests/HashEfficiencyTest.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.model.hashTests;
+package tools.refinery.store.model.hashtests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
index 7a89daeb..e7bff1f9 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
@@ -1,145 +1,149 @@
 package tools.refinery.store.model.tests;
 
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.model.ModelStoreImpl;
-import tools.refinery.store.model.representation.Relation;
+import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
 
-import java.util.Set;
-
 import static org.junit.jupiter.api.Assertions.*;
 
 class ModelTest {
-
         @Test
         void modelConstructionTest() {
-                Relation<Boolean> person = new Relation<>("Person", 1, Boolean.class, false);
-                Relation<Boolean> friend = new Relation<>("friend", 2, Boolean.class, false);
+                var person = new Symbol<>("Person", 1, Boolean.class, false);
+                var friend = new Symbol<>("friend", 2, Boolean.class, false);
 
-                ModelStore store = new ModelStoreImpl(Set.of(person, friend));
-                Model model = store.createModel();
+                var store = ModelStore.builder().symbols(person, friend).build();
+                var symbols = store.getSymbols();
 
-                assertTrue(store.getDataRepresentations().contains(person));
-                assertTrue(store.getDataRepresentations().contains(friend));
-                assertTrue(model.getDataRepresentations().contains(person));
-                assertTrue(model.getDataRepresentations().contains(friend));
+                assertTrue(symbols.contains(person));
+                assertTrue(symbols.contains(friend));
 
-                Relation<Integer> other = new Relation<Integer>("other", 2, Integer.class, null);
-                assertFalse(model.getDataRepresentations().contains(other));
+                var other = new Symbol<>("other", 2, Integer.class, null);
+                assertFalse(symbols.contains(other));
         }
 
         @Test
         void modelBuildingTest() {
-                Relation<Boolean> person = new Relation<>("Person", 1, Boolean.class, false);
-                Relation<Integer> age = new Relation<Integer>("age", 1, Integer.class, null);
-                Relation<Boolean> friend = new Relation<>("friend", 2, Boolean.class, false);
-
-                ModelStore store = new ModelStoreImpl(Set.of(person, age, friend));
-                Model model = store.createModel();
-
-                model.put(person, Tuple.of(0), true);
-                model.put(person, Tuple.of(1), true);
-                model.put(age, Tuple.of(0), 3);
-                model.put(age, Tuple.of(1), 1);
-                model.put(friend, Tuple.of(0, 1), true);
-                model.put(friend, Tuple.of(1, 0), true);
-
-                assertTrue(model.get(person, Tuple.of(0)));
-                assertTrue(model.get(person, Tuple.of(1)));
-                assertFalse(model.get(person, Tuple.of(2)));
-
-                assertEquals(3, model.get(age, Tuple.of(0)));
-                assertEquals(1, model.get(age, Tuple.of(1)));
-                assertNull(model.get(age, Tuple.of(2)));
-
-                assertTrue(model.get(friend, Tuple.of(0, 1)));
-                assertFalse(model.get(friend, Tuple.of(0, 5)));
+                var person = new Symbol<>("Person", 1, Boolean.class, false);
+                var age = new Symbol<>("age", 1, Integer.class, null);
+                var friend = new Symbol<>("friend", 2, Boolean.class, false);
+
+                var store = ModelStore.builder().symbols(person, age, friend).build();
+                var model = store.createModel();
+                var personInterpretation = model.getInterpretation(person);
+                var ageInterpretation = model.getInterpretation(age);
+                var friendInterpretation = model.getInterpretation(friend);
+
+                personInterpretation.put(Tuple.of(0), true);
+                personInterpretation.put(Tuple.of(1), true);
+                ageInterpretation.put(Tuple.of(0), 3);
+                ageInterpretation.put(Tuple.of(1), 1);
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
+
+                assertTrue(personInterpretation.get(Tuple.of(0)));
+                assertTrue(personInterpretation.get(Tuple.of(1)));
+                assertFalse(personInterpretation.get(Tuple.of(2)));
+
+                assertEquals(3, ageInterpretation.get(Tuple.of(0)));
+                assertEquals(1, ageInterpretation.get(Tuple.of(1)));
+                assertNull(ageInterpretation.get( Tuple.of(2)));
+
+                assertTrue(friendInterpretation.get(Tuple.of(0, 1)));
+                assertFalse(friendInterpretation.get(Tuple.of(0, 5)));
         }
 
         @Test
         void modelBuildingArityFailTest() {
-                Relation<Boolean> person = new Relation<>("Person", 1, Boolean.class, false);
+                var person = new Symbol<>("Person", 1, Boolean.class, false);
 
-                ModelStore store = new ModelStoreImpl(Set.of(person));
-                Model model = store.createModel();
+                var store = ModelStore.builder().symbols(person).build();
+                var model = store.createModel();
+                var personInterpretation = model.getInterpretation(person);
 
                 final Tuple tuple3 = Tuple.of(1, 1, 1);
-                assertThrows(IllegalArgumentException.class, () -> model.put(person, tuple3, true));
-                assertThrows(IllegalArgumentException.class, () -> model.get(person, tuple3));
+                assertThrows(IllegalArgumentException.class, () -> personInterpretation.put(tuple3, true));
+                assertThrows(IllegalArgumentException.class, () -> personInterpretation.get(tuple3));
         }
 
         @Test
         void modelBuildingNullFailTest() {
-                Relation<Integer> age = new Relation<Integer>("age", 1, Integer.class, null);
-                ModelStore store = new ModelStoreImpl(Set.of(age));
-                Model model = store.createModel();
+                var age = new Symbol<>("age", 1, Integer.class, null);
+
+                var store = ModelStore.builder().symbols(age).build();
+                var model = store.createModel();
+                var ageInterpretation = model.getInterpretation(age);
 
-                model.put(age, Tuple.of(1), null); // valid
-                assertThrows(IllegalArgumentException.class, () -> model.put(age, null, 1));
-                assertThrows(IllegalArgumentException.class, () -> model.get(age, null));
+                ageInterpretation.put(Tuple.of(1), null); // valid
+                assertThrows(IllegalArgumentException.class, () -> ageInterpretation.put(null, 1));
+                assertThrows(IllegalArgumentException.class, () -> ageInterpretation.get(null));
 
         }
 
         @Test
         void modelUpdateTest() {
-                Relation<Boolean> person = new Relation<>("Person", 1, Boolean.class, false);
-                Relation<Integer> age = new Relation<Integer>("age", 1, Integer.class, null);
-                Relation<Boolean> friend = new Relation<>("friend", 2, Boolean.class, false);
-
-                ModelStore store = new ModelStoreImpl(Set.of(person, age, friend));
-                Model model = store.createModel();
-
-                model.put(person, Tuple.of(0), true);
-                model.put(person, Tuple.of(1), true);
-                model.put(age, Tuple.of(0), 3);
-                model.put(age, Tuple.of(1), 1);
-                model.put(friend, Tuple.of(0, 1), true);
-                model.put(friend, Tuple.of(1, 0), true);
-
-                assertEquals(3, model.get(age, Tuple.of(0)));
-                assertTrue(model.get(friend, Tuple.of(0, 1)));
-
-                model.put(age, Tuple.of(0), 4);
-                model.put(friend, Tuple.of(0, 1), false);
-
-                assertEquals(4, model.get(age, Tuple.of(0)));
-                assertFalse(model.get(friend, Tuple.of(0, 1)));
+                var person = new Symbol<>("Person", 1, Boolean.class, false);
+                var age = new Symbol<>("age", 1, Integer.class, null);
+                var friend = new Symbol<>("friend", 2, Boolean.class, false);
+
+                var store = ModelStore.builder().symbols(person, age, friend).build();
+                var model = store.createModel();
+                var personInterpretation = model.getInterpretation(person);
+                var ageInterpretation = model.getInterpretation(age);
+                var friendInterpretation = model.getInterpretation(friend);
+
+                personInterpretation.put(Tuple.of(0), true);
+                personInterpretation.put(Tuple.of(1), true);
+                ageInterpretation.put(Tuple.of(0), 3);
+                ageInterpretation.put(Tuple.of(1), 1);
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
+
+                assertEquals(3, ageInterpretation.get(Tuple.of(0)));
+                assertTrue(friendInterpretation.get(Tuple.of(0, 1)));
+
+                ageInterpretation.put(Tuple.of(0), 4);
+                friendInterpretation.put(Tuple.of(0, 1), false);
+
+                assertEquals(4, ageInterpretation.get(Tuple.of(0)));
+                assertFalse(friendInterpretation.get(Tuple.of(0, 1)));
         }
 
         @Test
         void restoreTest() {
-                Relation<Boolean> person = new Relation<Boolean>("Person", 1, Boolean.class, false);
-                Relation<Boolean> friend = new Relation<Boolean>("friend", 2, Boolean.class, false);
-
-                ModelStore store = new ModelStoreImpl(Set.of(person, friend));
-                Model model = store.createModel();
-
-                model.put(person, Tuple.of(0), true);
-                model.put(person, Tuple.of(1), true);
-                model.put(friend, Tuple.of(0, 1), true);
-                model.put(friend, Tuple.of(1, 0), true);
+                var person = new Symbol<>("Person", 1, Boolean.class, false);
+                var friend = new Symbol<>("friend", 2, Boolean.class, false);
+
+                var store = ModelStore.builder().symbols(person, friend).build();
+                var model = store.createModel();
+                var personInterpretation = model.getInterpretation(person);
+                var friendInterpretation = model.getInterpretation(friend);
+
+                personInterpretation.put(Tuple.of(0), true);
+                personInterpretation.put(Tuple.of(1), true);
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
                 long state1 = model.commit();
 
-                assertFalse(model.get(person, Tuple.of(2)));
-                assertFalse(model.get(friend, Tuple.of(0, 2)));
+                assertFalse(personInterpretation.get(Tuple.of(2)));
+                assertFalse(friendInterpretation.get(Tuple.of(0, 2)));
 
-                model.put(person, Tuple.of(2), true);
-                model.put(friend, Tuple.of(0, 2), true);
+                personInterpretation.put(Tuple.of(2), true);
+                friendInterpretation.put(Tuple.of(0, 2), true);
                 long state2 = model.commit();
 
-                assertTrue(model.get(person, Tuple.of(2)));
-                assertTrue(model.get(friend, Tuple.of(0, 2)));
+                assertTrue(personInterpretation.get(Tuple.of(2)));
+                assertTrue(friendInterpretation.get(Tuple.of(0, 2)));
 
                 model.restore(state1);
 
-                assertFalse(model.get(person, Tuple.of(2)));
-                assertFalse(model.get(friend, Tuple.of(0, 2)));
+                assertFalse(personInterpretation.get(Tuple.of(2)));
+                assertFalse(friendInterpretation.get(Tuple.of(0, 2)));
 
                 model.restore(state2);
 
-                assertTrue(model.get(person, Tuple.of(2)));
-                assertTrue(model.get(friend, Tuple.of(0, 2)));
+                assertTrue(personInterpretation.get(Tuple.of(2)));
+                assertTrue(friendInterpretation.get(Tuple.of(0, 2)));
         }
 }
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/CardinalityIntervalTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalTest.java
index 8a39b9b5..96fdc49e 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/CardinalityIntervalTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalTest.java
@@ -1,14 +1,15 @@
-package tools.refinery.store.model.representation.cardinality;
+package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
 
 import java.util.stream.Stream;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static tools.refinery.store.model.representation.cardinality.CardinalityIntervals.*;
+import static tools.refinery.store.representation.cardinality.CardinalityIntervals.*;
 
 class CardinalityIntervalTest {
         @ParameterizedTest(name = "min({0}, {1}) == {2}")
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/CardinalityIntervalsTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalsTest.java
index ef68a607..4a9ef8da 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/CardinalityIntervalsTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalsTest.java
@@ -1,6 +1,8 @@
-package tools.refinery.store.model.representation.cardinality;
+package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.representation.cardinality.UpperCardinalities;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/EmptyCardinalityIntervalTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/EmptyCardinalityIntervalTest.java
index 41c884ec..e8b77b9f 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/EmptyCardinalityIntervalTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/EmptyCardinalityIntervalTest.java
@@ -1,6 +1,7 @@
-package tools.refinery.store.model.representation.cardinality;
+package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.lessThan;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/FiniteCardinalityIntervalTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteCardinalityIntervalTest.java
index dfb37786..9a190818 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/FiniteCardinalityIntervalTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteCardinalityIntervalTest.java
@@ -1,6 +1,9 @@
-package tools.refinery.store.model.representation.cardinality;
+package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.representation.cardinality.NonEmptyCardinalityInterval;
+import tools.refinery.store.representation.cardinality.UpperCardinalities;
+import tools.refinery.store.representation.cardinality.UpperCardinality;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/FiniteUpperCardinalityTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinalityTest.java
index 3f0f7a4a..90c21759 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/FiniteUpperCardinalityTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinalityTest.java
@@ -1,6 +1,7 @@
-package tools.refinery.store.model.representation.cardinality;
+package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/UpperCardinalitiesTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
index 13171ae5..3c7c0320 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/UpperCardinalitiesTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
@@ -1,8 +1,11 @@
-package tools.refinery.store.model.representation.cardinality;
+package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
+import tools.refinery.store.representation.cardinality.UnboundedUpperCardinality;
+import tools.refinery.store.representation.cardinality.UpperCardinalities;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/UpperCardinalityTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalityTest.java
index f5763c2d..e87ce29b 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/representation/cardinality/UpperCardinalityTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalityTest.java
@@ -1,8 +1,10 @@
-package tools.refinery.store.model.representation.cardinality;
+package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import tools.refinery.store.representation.cardinality.UpperCardinalities;
+import tools.refinery.store.representation.cardinality.UpperCardinality;
 
 import java.util.stream.Stream;