From eedc0ac8c20710e20095e0c19269601c2719543a Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Tue, 6 Dec 2022 16:13:55 +0100 Subject: refactor(store): remove CountPolarity We will have to implement counting in DNF queries in another way. --- .../refinery/store/query/viatra/QueryTest.java | 45 +--------------------- 1 file changed, 1 insertion(+), 44 deletions(-) (limited to 'subprojects/store-query-viatra/src/test') diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java index d18187e5..e82e006c 100644 --- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java +++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java @@ -5,7 +5,6 @@ import tools.refinery.store.model.representation.Relation; import tools.refinery.store.model.representation.TruthValue; import tools.refinery.store.query.*; import tools.refinery.store.query.atom.*; -import tools.refinery.store.query.viatra.ViatraQueryableModelStore; import tools.refinery.store.query.view.FilteredRelationView; import tools.refinery.store.query.view.KeyOnlyRelationView; import tools.refinery.store.query.view.RelationView; @@ -438,7 +437,7 @@ class QueryTest { .clause( new RelationViewAtom(personView, p3), new RelationViewAtom(personView, p4), - new CallAtom<>(SimplePolarity.TRANSITIVE, friendPredicate, p3, p4) + new CallAtom<>(CallPolarity.TRANSITIVE, friendPredicate, p3, p4) ) .build(); @@ -456,48 +455,6 @@ class QueryTest { assertEquals(3, model.countResults(predicate)); } - @Test - void countMatchTest() { - Relation person = new Relation<>("Person", 1, Boolean.class, false); - Relation friend = new Relation<>("friend", 2, TruthValue.class, TruthValue.FALSE); - RelationView personView = new KeyOnlyRelationView(person); - RelationView friendMustView = new FilteredRelationView<>(friend, "must", - TruthValue::must); - - Variable p1 = new Variable("p1"); - Variable p2 = new Variable("p2"); - - DNF called = DNF.builder("Called") - .parameters(p1, p2) - .clause( - new RelationViewAtom(personView, p1), - new RelationViewAtom(personView, p2), - new RelationViewAtom(friendMustView, p1, p2) - ) - .build(); - - DNF predicate = DNF.builder("Count") - .parameters(p1) - .clause( - new RelationViewAtom(personView, p1), - new CallAtom<>(new CountingPolarity(ComparisonOperator.EQUALS, 2), called, p1, p2) - ) - .build(); - - QueryableModelStore store = new ViatraQueryableModelStore(Set.of(person, friend), - Set.of(personView, friendMustView), Set.of(called, predicate)); - QueryableModel model = store.createModel(); - - model.put(person, Tuple.of(0), true); - model.put(person, Tuple.of(1), true); - model.put(person, Tuple.of(2), true); - model.put(friend, Tuple.of(0, 1), TruthValue.TRUE); - model.put(friend, Tuple.of(0, 2), TruthValue.TRUE); - - model.flushChanges(); - assertEquals(1, model.countResults(predicate)); - } - static void compareMatchSets(Stream matchSet, Set expected) { Set translatedMatchSet = new HashSet<>(); var iterator = matchSet.iterator(); -- cgit v1.2.3-70-g09d2