Mentions légales du service

Skip to content
Snippets Groups Projects
Commit e8261d16 authored by Federico Ulliana's avatar Federico Ulliana
Browse files

fixed imports and errors due to method renaming

parent a9206c69
No related branches found
No related tags found
1 merge request!68Resolve "add explanation module"
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 34 deletions
integraal/integraal-explanation/src/main/java/fr/boreal/explanation/GRI/staticProcessing/GRIBuilder.java
+ 1
− 1
View file @ e8261d16
......@@ -15,7 +15,7 @@ public class GRIBuilder {
// transform the ruleset to be able to build the GRI
var transformedRB = staticRuleTransformerFactory.createTransformedRB(kb);
KnowledgeBase gri = new KnowledgeBaseImpl(kb.getFactBase(), transformedRB);
KnowledgeBase gri = new KnowledgeBaseImpl(kb.getFactBase(), transformedRB.getAllRules());
DefaultChaseForExplanations.chase(gri);
......
integraal/integraal-explanation/src/main/java/fr/boreal/explanation/explainers/AbstractStaticGRIBasedExplainer.java
+ 0
− 6
View file @ e8261d16
package fr.boreal.explanation.explainers;
import fr.boreal.explanation.GRI.dynamicProcessing.RELTracer;
import fr.boreal.explanation.GRI.staticProcessing.GRIBuilder;
import fr.boreal.explanation.api.explainers.AtomicQueryExplainer;
import fr.boreal.explanation.api.processors.ExplanationProcessor_GRI;
import fr.boreal.explanation.configuration.DefaultChaseForExplanations;
import fr.boreal.explanation.ruleFactories.RuleTransformationRecord;
import fr.boreal.explanation.ruleFactories.StaticGRIRuleTransformer;
import fr.boreal.forward_chaining.chase.Chase;
import fr.boreal.model.kb.api.FactBase;
import fr.boreal.model.kb.api.KnowledgeBase;
import fr.boreal.model.kb.api.RuleBase;
import fr.boreal.model.kb.impl.KnowledgeBaseImpl;
import fr.boreal.model.logicalElements.api.Atom;
import fr.boreal.model.logicalElements.impl.AtomImpl;
import fr.boreal.storage.natives.SimpleInMemoryGraphStore;
import org.apache.commons.lang3.tuple.Pair;
import java.util.Set;
......
integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/chasingAndTracing/ChaseStaticGRIRuleTransformerTest.java
+ 3
− 3
View file @ e8261d16
......@@ -47,7 +47,7 @@ public class ChaseStaticGRIRuleTransformerTest {
RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r3));
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, factory.createTransformedRB(kb));
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, factory.createTransformedRB(kb).getAllRules());
TestData.chase(transformedKB);
Predicate edge_r3 = factory.getOrGenerateEdgePredicateFromRule(TestData.r3);
......@@ -78,7 +78,7 @@ public class ChaseStaticGRIRuleTransformerTest {
RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r3, TestData.r4));
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, factory.createTransformedRB(kb));
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, factory.createTransformedRB(kb).getAllRules());
TestData.chase(transformedKB);
Predicate edge_r3 = factory.getOrGenerateEdgePredicateFromRule(TestData.r3);
......@@ -107,7 +107,7 @@ public class ChaseStaticGRIRuleTransformerTest {
RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r2));
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, factory.createTransformedRB(kb));
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, factory.createTransformedRB(kb).getAllRules());
TestData.chase(transformedKB);
Predicate edge_r2 = factory.getOrGenerateEdgePredicateFromRule(TestData.r2);
......
integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/chasingAndTracing/RELTracerTest.java
+ 5
− 5
View file @ e8261d16
......@@ -55,11 +55,11 @@ public class RELTracerTest {
RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r3));
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, ruleTransformerFactory.createTransformedRB(kb));
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, ruleTransformerFactory.createTransformedRB(kb).getAllRules());
chase(transformedKB);
RELTracer tracer = new RELTracer();
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, ruleTransformerFactory, TestData.qa);
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, TestData.qa);
StoredFunctionalTerm fpa = ruleTransformerFactory.createFnTermIdentifier(TestData.pa);
StoredFunctionalTerm fqa = ruleTransformerFactory.createFnTermIdentifier(TestData.qa);
......@@ -97,11 +97,11 @@ public class RELTracerTest {
RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r5));
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, ruleTransformerFactory.createTransformedRB(kb));
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, ruleTransformerFactory.createTransformedRB(kb).getAllRules());
chase(transformedKB);
RELTracer tracer = new RELTracer();
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, ruleTransformerFactory, TestData.pa);
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, TestData.pa);
StoredFunctionalTerm fpa = ruleTransformerFactory.createFnTermIdentifier(TestData.pa);
StoredFunctionalTerm fqa = ruleTransformerFactory.createFnTermIdentifier(TestData.qa);
......@@ -145,7 +145,7 @@ public class RELTracerTest {
StaticGRIRuleTransformer ruleTransformerFactory = pair.getRight();
RELTracer tracer = new RELTracer();
FactBase relAtoms = tracer.computeQueryRelevant(gri, ruleTransformerFactory, query);
FactBase relAtoms = tracer.computeQueryRelevant(gri, query);
StoredFunctionalTerm fpb = ruleTransformerFactory.createFnTermIdentifier(TestData.pb);
Atom RELpb = new AtomImpl(ruleTransformerFactory.REL, fpb);
......
integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/explainer/FactSupportExplainerTest.java
+ 5
− 4
View file @ e8261d16
package fr.boreal.test.explanation.explainer;
import fr.boreal.explanation.explainers.FactSupportExplainer;
import fr.boreal.explanation.ruleFactories.StaticGRIRuleTransformer;
import fr.boreal.model.kb.api.FactBase;
import fr.boreal.model.kb.api.KnowledgeBase;
......@@ -36,7 +37,7 @@ public class FactSupportExplainerTest {
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
explainer = new FactSupportExplainer(kb);
Set<KnowledgeBase> explanations = explainer.getAllExplanations(query);
Set<FactBase> explanations = explainer.getAllExplanations(query);
FactBase expectedFactBase1 = new SimpleInMemoryGraphStore(Set.of(TestData.saa));
RuleBase expectedRuleBase1 = new RuleBaseImpl();
......@@ -60,7 +61,7 @@ public class FactSupportExplainerTest {
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
explainer = new FactSupportExplainer(kb);
Set<KnowledgeBase> explanations = explainer.getAllExplanations(query);
Set<FactBase> explanations = explainer.getAllExplanations(query);
FactBase expectedFactBase = new SimpleInMemoryGraphStore(Set.of(TestData.saa, TestData.sbc, TestData.tab));
RuleBase expectedRuleBase = new RuleBaseImpl();
......@@ -80,7 +81,7 @@ public class FactSupportExplainerTest {
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
explainer = new FactSupportExplainer(kb);
Set<KnowledgeBase> explanations = explainer.getAllExplanations(query);
Set<FactBase> explanations = explainer.getAllExplanations(query);
FactBase expectedFactBase = new SimpleInMemoryGraphStore(Set.of(TestData.saa, TestData.sbc, TestData.tab));
RuleBase expectedRuleBase = new RuleBaseImpl();
......@@ -101,7 +102,7 @@ public class FactSupportExplainerTest {
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
explainer = new FactSupportExplainer(kb);
Set<KnowledgeBase> explanations = explainer.getAllExplanations(query);
Set<FactBase> explanations = explainer.getAllExplanations(query);
FactBase expectedFactBase = new SimpleInMemoryGraphStore(Set.of(TestData.pa));
RuleBase expectedRuleBase = new RuleBaseImpl();
......
integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/explainer/KBSupportExplainerTest.java
+ 1
− 0
View file @ e8261d16
package fr.boreal.test.explanation.explainer;
import fr.boreal.explanation.explainers.KBSupportExplainer;
import fr.boreal.explanation.ruleFactories.StaticGRIRuleTransformer;
import fr.boreal.model.kb.api.FactBase;
import fr.boreal.model.kb.api.KnowledgeBase;
......
integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/explainer/RuleSupportExplainerTest.java
+ 5
− 4
View file @ e8261d16
package fr.boreal.test.explanation.explainer;
import fr.boreal.explanation.explainers.RuleSupportExplainer;
import fr.boreal.explanation.ruleFactories.StaticGRIRuleTransformer;
import fr.boreal.model.kb.api.FactBase;
import fr.boreal.model.kb.api.KnowledgeBase;
......@@ -36,7 +37,7 @@ public class RuleSupportExplainerTest {
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
explainer = new RuleSupportExplainer(kb);
Set<KnowledgeBase> explanations = explainer.getAllExplanations(query);
Set<RuleBase> explanations = explainer.getAllExplanations(query);
FactBase expectedFactBase2 = new SimpleInMemoryGraphStore();
RuleBase expectedRuleBase2 = new RuleBaseImpl(Set.of(TestData.r6));
......@@ -60,7 +61,7 @@ public class RuleSupportExplainerTest {
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
explainer = new RuleSupportExplainer(kb);
Set<KnowledgeBase> explanations = explainer.getAllExplanations(query);
Set<RuleBase> explanations = explainer.getAllExplanations(query);
FactBase expectedFactBase = new SimpleInMemoryGraphStore();
RuleBase expectedRuleBase = new RuleBaseImpl(Set.of(TestData.r6,TestData.r8));
......@@ -80,7 +81,7 @@ public class RuleSupportExplainerTest {
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
explainer = new RuleSupportExplainer(kb);
Set<KnowledgeBase> explanations = explainer.getAllExplanations(query);
Set<RuleBase> explanations = explainer.getAllExplanations(query);
FactBase expectedFactBase = new SimpleInMemoryGraphStore();
RuleBase expectedRuleBase = new RuleBaseImpl(Set.of(TestData.r6,TestData.r8));
......@@ -101,7 +102,7 @@ public class RuleSupportExplainerTest {
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
explainer = new RuleSupportExplainer(kb);
Set<KnowledgeBase> explanations = explainer.getAllExplanations(query);
Set<RuleBase> explanations = explainer.getAllExplanations(query);
FactBase expectedFactBase = new SimpleInMemoryGraphStore();
RuleBase expectedRuleBase = new RuleBaseImpl(Set.of(TestData.r1));
......
integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/solvingViaGMUS/FactSupportKBGSATEncoderTest.java
+ 2
− 2
View file @ e8261d16
......@@ -51,11 +51,11 @@ public class FactSupportKBGSATEncoderTest {
RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r1));
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, staticGRIRuleTransformer.createTransformedRB(kb));
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, staticGRIRuleTransformer.createTransformedRB(kb).getAllRules());
TestData.chase(transformedKB);
RELTracer tracer = new RELTracer();
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, staticGRIRuleTransformer, TestData.qa);
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, TestData.qa);
encoder.assignDefaultGroupNumberAndCreateClauseForStartQuery(query);
// GMUSProcessor.assignGroupNumbersAndCreateClauseForEachSupRelAtom(relAtoms, query);
......
integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/solvingViaGMUS/GMUSTranslatorTest.java
+ 3
− 3
View file @ e8261d16
......@@ -43,14 +43,14 @@ public class GMUSTranslatorTest {
RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r1, TestData.r4));
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, staticGRIRuleTransformer.createTransformedRB(kb));
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, staticGRIRuleTransformer.createTransformedRB(kb).getAllRules());
TestData.chase(transformedKB);
RELTracer tracer = new RELTracer();
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, staticGRIRuleTransformer, TestData.qa);
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, TestData.qa);
gmusProcessor.assignDefaultGroupNumberAndCreateClauseForStartQuery(query);
gmusProcessor.assignGroupNumbersAndComputeClausesForRELEdges(relAtoms,query);
gmusProcessor.assignGroupNumbersAndComputeClausesForRELEdges(relAtoms, query);
Term queryFnTermIdentifier = staticGRIRuleTransformer.createFnTermIdentifier(query);
......
integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/solvingViaGMUS/KBSupportKBGSATEncoderTest.java
+ 2
− 2
View file @ e8261d16
......@@ -51,11 +51,11 @@ public class KBSupportKBGSATEncoderTest {
RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r1));
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, staticGRIRuleTransformer.createTransformedRB(kb));
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, staticGRIRuleTransformer.createTransformedRB(kb).getAllRules());
TestData.chase(transformedKB);
RELTracer tracer = new RELTracer();
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, staticGRIRuleTransformer, TestData.qa);
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, TestData.qa);
kBtoGSATEncoder.assignDefaultGroupNumberAndCreateClauseForStartQuery(query);
// GMUSProcessor.assignGroupNumbersAndCreateClauseForEachSupRelAtom(relAtoms, query);
......
integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/solvingViaGMUS/sat4j/MUSSat4JSolverTest.java
+ 4
− 4
View file @ e8261d16
......@@ -80,11 +80,11 @@ public class MUSSat4JSolverTest {
RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r1, TestData.r4));
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, staticGRIRuleTransformer.createTransformedRB(kb));
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, staticGRIRuleTransformer.createTransformedRB(kb).getAllRules());
TestData.chase(transformedKB);
RELTracer tracer = new RELTracer();
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, staticGRIRuleTransformer, TestData.qa);
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, TestData.qa);
gmusProcessor.assignDefaultGroupNumberAndCreateClauseForStartQuery(query);
gmusProcessor.assignGroupNumbersAndComputeClausesForRELEdges(relAtoms, query);
......@@ -103,11 +103,11 @@ public class MUSSat4JSolverTest {
RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r1, TestData.r4));
KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, staticGRIRuleTransformer.createTransformedRB(kb));
KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, staticGRIRuleTransformer.createTransformedRB(kb).getAllRules());
TestData.chase(transformedKB);
RELTracer tracer = new RELTracer();
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, staticGRIRuleTransformer, TestData.qa);
FactBase relAtoms = tracer.computeQueryRelevant(transformedKB, TestData.qa);
encoder.assignDefaultGroupNumberAndCreateClauseForStartQuery(query);
encoder.assignGroupNumbersAndComputeClausesForRELEdges(relAtoms, query);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment