feat(semantics): base predicate serialization

graphs4value · Aug 2, 2024 · 0fe2120 · 0fe2120
1 parent 17ab3a8
commit 0fe2120
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 4 deletions.
diff --git a/...anguage-semantics/src/main/java/tools/refinery/language/semantics/SolutionSerializer.java b/...anguage-semantics/src/main/java/tools/refinery/language/semantics/SolutionSerializer.java
@@ -24,20 +24,23 @@
 import tools.refinery.language.scoping.imports.ImportAdapterProvider;
 import tools.refinery.language.typesystem.SignatureProvider;
 import tools.refinery.language.utils.ProblemUtil;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.interpretation.PartialInterpretation;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.typehierarchy.InferredType;
 import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchyTranslator;
-import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.*;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
+import java.util.UUID;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -107,6 +110,7 @@ public Problem serializeSolution(ProblemTrace trace, Model model, URI uri) {
 		addExistsAssertions();
 		addClassAssertions();
 		addReferenceAssertions();
+		addBasePredicateAssertions();
 		if (nodeDeclaration.getNodes().isEmpty()) {
 			problem.getStatements().remove(nodeDeclaration);
 		}
@@ -249,8 +253,8 @@ private void addExistsAssertions() {
 	}
 
 	private void addClassAssertions() {
-		var types =
-				trace.getMetamodel().typeHierarchy().getPreservedTypes().keySet().stream().collect(Collectors.toMap(Function.identity(), this::findPartialRelation));
+		var types = trace.getMetamodel().typeHierarchy().getPreservedTypes().keySet().stream()
+				.collect(Collectors.toMap(Function.identity(), this::findPartialRelation));
 		var cursor = model.getInterpretation(TypeHierarchyTranslator.TYPE_SYMBOL).getAll();
 		while (cursor.move()) {
 			var key = cursor.getKey();
@@ -306,6 +310,17 @@ private void addReferenceAssertions() {
 		}
 	}
 
+	private void addBasePredicateAssertions() {
+		for (var entry : trace.getRelationTrace().entrySet()) {
+			if (entry.getKey() instanceof PredicateDefinition predicateDefinition &&
+					ProblemUtil.isBasePredicate(predicateDefinition)) {
+				var partialRelation = entry.getValue();
+				addDefaultAssertion(partialRelation);
+				addAssertions(partialRelation);
+			}
+		}
+	}
+
 	private void addAssertions(PartialRelation partialRelation) {
 		var relation = findPartialRelation(partialRelation);
 		var cursor = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, partialRelation).getAll();

diff --git a/...age-semantics/src/test/java/tools/refinery/language/semantics/SolutionSerializerTest.java b/...age-semantics/src/test/java/tools/refinery/language/semantics/SolutionSerializerTest.java
@@ -234,6 +234,65 @@ class Foo.
 				!exists(a).
 				!exists(Foo::new).
 				Foo(foo1).
+				"""), Arguments.of("""
+				class Foo {
+					partial Bar[] bar
+				}
+
+				class Bar.
+				""", """
+				bar(a, b).
+				scope Foo = 2, Bar = 2.
+				""", """
+				declare a, b, foo1, bar1.
+				!exists(Foo::new).
+				!exists(Bar::new).
+				Foo(foo1).
+				Bar(bar1).
+				Foo(a).
+				Bar(b).
+				default !bar(*, *).
+				?bar(foo1, bar1).
+				?bar(foo1, b).
+				?bar(a, bar1).
+				bar(a, b).
+				"""), Arguments.of("""
+				class Foo.
+				class Bar.
+				pred bar(Foo x, Bar y).
+				""", """
+				bar(a, b).
+				scope Foo = 2, Bar = 2.
+				""", """
+				declare a, b, foo1, bar1.
+				!exists(Foo::new).
+				!exists(Bar::new).
+				Foo(foo1).
+				Bar(bar1).
+				Foo(a).
+				Bar(b).
+				default !bar(*, *).
+				bar(a, b).
+				"""), Arguments.of("""
+				class Foo.
+				class Bar.
+				partial pred bar(Foo x, Bar y).
+				""", """
+				bar(a, b).
+				scope Foo = 2, Bar = 2.
+				""", """
+				declare a, b, foo1, bar1.
+				!exists(Foo::new).
+				!exists(Bar::new).
+				Foo(foo1).
+				Bar(bar1).
+				Foo(a).
+				Bar(b).
+				default !bar(*, *).
+				?bar(foo1, bar1).
+				?bar(foo1, b).
+				?bar(a, bar1).
+				bar(a, b).
 				"""));
 	}
 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
@@ -121,6 +121,10 @@ public static boolean isDerivedStatePredicate(PredicateDefinition predicateDefin
 	}
 
 	public static boolean isBasePredicate(PredicateDefinition predicateDefinition) {
+		if (isBuiltIn(predicateDefinition) || predicateDefinition == null) {
+			// Built-in predicates have no clauses, but are not base.
+			return false;
+		}
 		return switch (predicateDefinition.getKind()) {
 			case DEFAULT -> predicateDefinition.getBodies().isEmpty();
 			case PARTIAL -> true;