Merge remote-tracking branch 'origin/web-demo'

4 files changed, 24 insertions, 22 deletions

diff --git a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend b/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend
index fcf05d1d..11bfc6d9 100644
--- a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend
+++ b/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend
@@ -42,13 +42,14 @@ class ProblemParsingTest {
                         }
                         
                         % A child cannot have any dependents.
-                        error invalidTaxStatus(Person p) <=>
+                        error invalidTaxStatus(Person p) <->
                                 taxStatus(p, child), children(p, _q).
                         
-                        Family('family').
-                        members('family', anne): true.
-                        members('family', bob).
-                        members('family', ciri).
+                        unique family.
+                        Family(family).
+                        members(family, anne): true.
+                        members(family, bob).
+                        members(family, ciri).
                         children(anne, ciri).
                         ?children(bob, ciri).
                         taxStatus(anne, adult).
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalQuery.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/PredicateTranslator.java
index 39fc2482..54cb4bab 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalQuery.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/PredicateTranslator.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query;
+package org.eclipse.viatra.solver.data.query.internal;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,16 +28,17 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.solver.data.query.RelationalScope;
 import org.eclipse.viatra.solver.data.query.view.RelationView;
 
-public class RelationalQuery extends BasePQuery {
+public class PredicateTranslator extends BasePQuery {
 
         private final Map<String, PParameter> parameters = new HashMap<String, PParameter>();
         private String fullyQualifiedName;
         private LinkedList<PBody> bodies = new LinkedList<PBody>();
         private List<ExportedParameter> symbolicParameters;
 
-        public RelationalQuery(String fullyQualifiedName) {
+        public PredicateTranslator(String fullyQualifiedName) {
                 super(PVisibility.PUBLIC);
                 this.fullyQualifiedName = fullyQualifiedName;
                 PBody body = new PBody(this);
@@ -49,7 +50,7 @@ public class RelationalQuery extends BasePQuery {
                 return fullyQualifiedName;
         }
 
-        public RelationalQuery addParameter(String name, RelationView<?> type) {
+        public PredicateTranslator addParameter(String name, RelationView<?> type) {
                 PParameter parameter = new PParameter(name);
                 parameters.put(name, parameter);
                 
@@ -68,7 +69,7 @@ public class RelationalQuery extends BasePQuery {
         public List<PParameter> getParameters() {
                 return new ArrayList<PParameter>(parameters.values());
         }
-        public <D> RelationalQuery addConstraint(RelationView<D> view, String... name) {
+        public <D> PredicateTranslator addConstraint(RelationView<D> view, String... name) {
                 if(name.length != view.getArity()) {
                         throw new IllegalArgumentException("Arity ("+view.getArity()+") does not match parameter numbers ("+name.length+")");
                 }
@@ -100,7 +101,7 @@ public class RelationalQuery extends BasePQuery {
 //      }
 
         // Create new Body
-        public RelationalQuery or() {
+        public PredicateTranslator or() {
                 PBody body = new PBody(this);
                 List<ExportedParameter> symbolicParameters = new ArrayList<>();
                 parameters.forEach((name, parameter) -> {
@@ -113,7 +114,7 @@ public class RelationalQuery extends BasePQuery {
         }
 
         // Equality constraint
-        public RelationalQuery addEquality(String sourceName, String targetName) {
+        public PredicateTranslator addEquality(String sourceName, String targetName) {
                 PBody body = bodies.peekLast();
                 PVariable var_source = body.getOrCreateVariableByName(sourceName);
                 PVariable var_target = body.getOrCreateVariableByName(targetName);
@@ -122,7 +123,7 @@ public class RelationalQuery extends BasePQuery {
         }
 
         // Inequality constraint
-        public RelationalQuery addInequality(String sourceName, String targetName) {
+        public PredicateTranslator addInequality(String sourceName, String targetName) {
                 PBody body = bodies.peekLast();
                 PVariable var_source = body.getOrCreateVariableByName(sourceName);
                 PVariable var_target = body.getOrCreateVariableByName(targetName);
@@ -131,7 +132,7 @@ public class RelationalQuery extends BasePQuery {
         }
 
         // Positive pattern call
-        public RelationalQuery addPatternCall(PQuery query, String... names) {
+        public PredicateTranslator addPatternCall(PQuery query, String... names) {
                 PBody body = bodies.peekLast();
                 PVariable[] vars = new PVariable[names.length];
                 for (int i = 0; i < names.length; i++) {
@@ -142,7 +143,7 @@ public class RelationalQuery extends BasePQuery {
         }
 
         // Negative pattern call
-        public RelationalQuery addNegativePatternCall(PQuery query, String... names) {
+        public PredicateTranslator addNegativePatternCall(PQuery query, String... names) {
                 PBody body = bodies.peekLast();
                 PVariable[] vars = new PVariable[names.length];
                 for (int i = 0; i < names.length; i++) {
@@ -153,7 +154,7 @@ public class RelationalQuery extends BasePQuery {
         }
 
         // Binary transitive closure pattern call
-        public RelationalQuery addBinaryTransitiveClosure(PQuery query, String sourceName, String targetName) {
+        public PredicateTranslator addBinaryTransitiveClosure(PQuery query, String sourceName, String targetName) {
                 PBody body = bodies.peekLast();
                 PVariable var_source = body.getOrCreateVariableByName(sourceName);
                 PVariable var_target = body.getOrCreateVariableByName(targetName);
@@ -162,7 +163,7 @@ public class RelationalQuery extends BasePQuery {
         }
 
         // Binary reflexive transitive closure pattern call
-        public RelationalQuery addBinaryReflexiveTransitiveClosure(PQuery query, String sourceName, String targetName) {
+        public PredicateTranslator addBinaryReflexiveTransitiveClosure(PQuery query, String sourceName, String targetName) {
                 PBody body = bodies.peekLast();
                 PVariable var_source = body.getOrCreateVariableByName(sourceName);
                 PVariable var_target = body.getOrCreateVariableByName(targetName);
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java
index bb1ddaa8..11a24fc8 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java
@@ -3,9 +3,9 @@ package org.eclipse.viatra.solver.data.query.view;
 import org.eclipse.viatra.solver.data.model.Tuple;
 import org.eclipse.viatra.solver.data.model.representation.Relation;
 
-public class TupleRelationView extends FilteredRelationView<Boolean>{
+public class KeyOnlyRelationView extends FilteredRelationView<Boolean>{
 
-        public TupleRelationView(Relation<Boolean> representation) {
+        public KeyOnlyRelationView(Relation<Boolean> representation) {
                 super(representation, (k,v)->true);
         }
         @Override
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java
index 5555dac8..182f6c94 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java
@@ -18,8 +18,8 @@ import org.eclipse.viatra.solver.data.model.ModelStoreImpl;
 import org.eclipse.viatra.solver.data.model.Tuple;
 import org.eclipse.viatra.solver.data.model.representation.Relation;
 import org.eclipse.viatra.solver.data.model.representation.TruthValue;
-import org.eclipse.viatra.solver.data.query.RelationalQuery;
 import org.eclipse.viatra.solver.data.query.RelationalScope;
+import org.eclipse.viatra.solver.data.query.internal.PredicateTranslator;
 import org.eclipse.viatra.solver.data.query.view.FilteredRelationView;
 import org.eclipse.viatra.solver.data.query.view.FunctionalRelationView;
 import org.eclipse.viatra.solver.data.query.view.RelationView;
@@ -32,7 +32,7 @@ class QueryTest {
                 Relation<Boolean> person = new Relation<>("Person", 1, false);
 
                 RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
-                GenericQuerySpecification<GenericPatternMatcher> personQuery = (new RelationalQuery("PersonQuery"))
+                GenericQuerySpecification<GenericPatternMatcher> personQuery = (new PredicateTranslator("PersonQuery"))
                                 .addParameter("p", persionView).addConstraint(persionView, "p").build();
 
                 ModelStore store = new ModelStoreImpl(Set.of(person));
@@ -76,7 +76,7 @@ class QueryTest {
 
                 RelationalScope scope = new RelationalScope(model, Set.of(persionView, ageView, friendMustView, friendMayView));
 
-                GenericQuerySpecification<GenericPatternMatcher> personQuery = (new RelationalQuery("PersonQuery"))
+                GenericQuerySpecification<GenericPatternMatcher> personQuery = (new PredicateTranslator("PersonQuery"))
                                 .addParameter("p", persionView).addConstraint(persionView, "p").build();
 
                 ViatraQueryEngine engine = AdvancedViatraQueryEngine.on(scope);