diff options
| author |  OszkarSemerath <semerath@mit.bme.hu> | 2021-09-19 18:02:42 +0200 |
|---|---|---|
| committer | OszkarSemerath <semerath@mit.bme.hu> | 2021-09-19 18:02:42 +0200 |
| commit | ffb4c903f350920cbba0fe5ffa059056246adc27 (patch) | |
| tree | 2488ace411537df59416d5113525b88b9c026453 | |
| parent | renamed TupleRelationView -> KeyOnlyView (diff) | |
| download | VIATRA-Generator-ffb4c903f350920cbba0fe5ffa059056246adc27.tar.gz VIATRA-Generator-ffb4c903f350920cbba0fe5ffa059056246adc27.tar.zst VIATRA-Generator-ffb4c903f350920cbba0fe5ffa059056246adc27.zip | |
Small fixes over the project
| -rw-r--r-- | language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend | 11 | ||||
| -rw-r--r-- | model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/PredicateTranslator.java (renamed from model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalQuery.java) | 0 | ||||
| -rw-r--r-- | model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java | 4 |
3 files changed, 8 insertions, 7 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 { | |||
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | % A child cannot have any dependents. | 44 | % A child cannot have any dependents. |
| 45 | error invalidTaxStatus(Person p) <=> | 45 | error invalidTaxStatus(Person p) <-> |
| 46 | taxStatus(p, child), children(p, _q). | 46 | taxStatus(p, child), children(p, _q). |
| 47 | 47 | ||
| 48 | Family('family'). | 48 | unique family. |
| 49 | members('family', anne): true. | 49 | Family(family). |
| 50 | members('family', bob). | 50 | members(family, anne): true. |
| 51 | members('family', ciri). | 51 | members(family, bob). |
| 52 | members(family, ciri). | ||
| 52 | children(anne, ciri). | 53 | children(anne, ciri). |
| 53 | ?children(bob, ciri). | 54 | ?children(bob, ciri). |
| 54 | taxStatus(anne, adult). | 55 | 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..39fc2482 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 | |||
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; | |||
| 3 | import org.eclipse.viatra.solver.data.model.Tuple; | 3 | import org.eclipse.viatra.solver.data.model.Tuple; |
| 4 | import org.eclipse.viatra.solver.data.model.representation.Relation; | 4 | import org.eclipse.viatra.solver.data.model.representation.Relation; |
| 5 | 5 | ||
| 6 | public class TupleRelationView extends FilteredRelationView<Boolean>{ | 6 | public class KeyOnlyRelationView extends FilteredRelationView<Boolean>{ |
| 7 | 7 | ||
| 8 | public TupleRelationView(Relation<Boolean> representation) { | 8 | public KeyOnlyRelationView(Relation<Boolean> representation) { |
| 9 | super(representation, (k,v)->true); | 9 | super(representation, (k,v)->true); |
| 10 | } | 10 | } |
| 11 | @Override | 11 | @Override |