From 4028b56a14888c2e9ee284fce825c3954342c6f3 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Tue, 17 Aug 2021 13:02:55 +0200 Subject: renamed TupleRelationView -> KeyOnlyView --- .../solver/data/query/view/KeyOnlyRelationView.java | 16 ++++++++++++++++ .../viatra/solver/data/query/view/TupleRelationView.java | 16 ---------------- .../eclipse/viatra/solver/data/query/test/QueryTest.java | 6 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java delete mode 100644 model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/TupleRelationView.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 new file mode 100644 index 00000000..bb1ddaa8 --- /dev/null +++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java @@ -0,0 +1,16 @@ +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{ + + public TupleRelationView(Relation representation) { + super(representation, (k,v)->true); + } + @Override + protected boolean filter(Tuple key, Boolean value) { + return true; + } + +} diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/TupleRelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/TupleRelationView.java deleted file mode 100644 index bb1ddaa8..00000000 --- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/TupleRelationView.java +++ /dev/null @@ -1,16 +0,0 @@ -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{ - - public TupleRelationView(Relation representation) { - super(representation, (k,v)->true); - } - @Override - protected boolean filter(Tuple key, Boolean value) { - return true; - } - -} 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 7fa0708f..5555dac8 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 @@ -23,7 +23,7 @@ import org.eclipse.viatra.solver.data.query.RelationalScope; 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; -import org.eclipse.viatra.solver.data.query.view.TupleRelationView; +import org.eclipse.viatra.solver.data.query.view.KeyOnlyRelationView; import org.junit.jupiter.api.Test; class QueryTest { @@ -31,7 +31,7 @@ class QueryTest { void minimalTest() { Relation person = new Relation<>("Person", 1, false); - RelationView persionView = new TupleRelationView(person); + RelationView persionView = new KeyOnlyRelationView(person); GenericQuerySpecification personQuery = (new RelationalQuery("PersonQuery")) .addParameter("p", persionView).addConstraint(persionView, "p").build(); @@ -69,7 +69,7 @@ class QueryTest { assertTrue(model.get(person, Tuple.of(1))); assertFalse(model.get(person, Tuple.of(2))); - RelationView persionView = new TupleRelationView(person); + RelationView persionView = new KeyOnlyRelationView(person); RelationView ageView = new FunctionalRelationView<>(age); RelationView friendMustView = new FilteredRelationView(friend, (k, v) -> v.must()); RelationView friendMayView = new FilteredRelationView(friend, (k, v) -> v.may()); -- cgit v1.2.3-54-g00ecf