Merge pull request #39 from kris7t/partial-interpretation

Implement partial interpretation based model generation

1 files changed, 46 insertions, 5 deletions

diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredType.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredType.java
index fd05158b..9a0c2b0f 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredType.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredType.java
@@ -8,21 +8,26 @@ package tools.refinery.store.reasoning.translator.typehierarchy;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
-record InferredType(Set<PartialRelation> mustTypes, Set<PartialRelation> mayConcreteTypes,
-                                        PartialRelation currentType) {
+public final class InferredType {
         public static final InferredType UNTYPED = new InferredType(Set.of(), Set.of(), null);
+        private final Set<PartialRelation> mustTypes;
+        private final Set<PartialRelation> mayConcreteTypes;
+        private final PartialRelation candidateType;
+        private final int hashCode;
 
         public InferredType(Set<PartialRelation> mustTypes, Set<PartialRelation> mayConcreteTypes,
-                                                PartialRelation currentType) {
+                                                PartialRelation candidateType) {
                 this.mustTypes = Collections.unmodifiableSet(mustTypes);
                 this.mayConcreteTypes = Collections.unmodifiableSet(mayConcreteTypes);
-                this.currentType = currentType;
+                this.candidateType = candidateType;
+                hashCode = Objects.hash(mustTypes, mayConcreteTypes, candidateType);
         }
 
         public boolean isConsistent() {
-                return currentType != null || mustTypes.isEmpty();
+                return candidateType != null || mustTypes.isEmpty();
         }
 
         public boolean isMust(PartialRelation partialRelation) {
@@ -32,4 +37,40 @@ record InferredType(Set<PartialRelation> mustTypes, Set<PartialRelation> mayConc
         public boolean isMayConcrete(PartialRelation partialRelation) {
                 return mayConcreteTypes.contains(partialRelation);
         }
+
+
+        public Set<PartialRelation> mustTypes() {
+                return mustTypes;
+        }
+
+        public Set<PartialRelation> mayConcreteTypes() {
+                return mayConcreteTypes;
+        }
+
+        public PartialRelation candidateType() {
+                return candidateType;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+                if (this == o) return true;
+                if (o == null || getClass() != o.getClass()) return false;
+                InferredType that = (InferredType) o;
+                return Objects.equals(mustTypes, that.mustTypes) &&
+                                Objects.equals(mayConcreteTypes, that.mayConcreteTypes) &&
+                                Objects.equals(candidateType, that.candidateType);
+        }
+
+        @Override
+        public int hashCode() {
+                return hashCode;
+        }
+
+        @Override
+        public String toString() {
+                return "InferredType[" +
+                                "mustTypes=" + mustTypes + ", " +
+                                "mayConcreteTypes=" + mayConcreteTypes + ", " +
+                                "candidateType=" + candidateType + ']';
+        }
 }