Dynamic rule transformer in progress

integraal/integraal-explanation/src/main/java/fr/boreal/explanation/kb_gri/explainers/AbstractDynamicGRIBasedExplainer_KBGRI.java

+package fr.boreal.explanation.kb_gri.explainers;
+
+import fr.boreal.explanation.api.explainers.AtomicQueryExplainer;
+import fr.boreal.explanation.api.processors.ExplanationProcessor_GRI;
+import fr.boreal.explanation.api.solver.Solver;
+import fr.boreal.explanation.configuration.DefaultChaseForExplanations;
+import fr.boreal.explanation.kb_gri.rule_transformation.dynamic_gri.DynamicGRIRuleTransformer;
+import fr.boreal.explanation.kb_gri.rule_transformation.static_gri.StaticGRIRuleTransformer;
+import fr.boreal.explanation.solving_enumerating.marco.MARCOGMUSSolver;
+import fr.boreal.forward_chaining.chase.Chase;
+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 java.util.Set;
+
+public abstract class AbstractDynamicGRIBasedExplainer_KBGRI<ExplanationType> implements AtomicQueryExplainer<ExplanationType> {
+
+
+    /*
+     * The rulebase used to build the GRI
+     */
+    private final RuleBase transformedRB;
+
+    /*
+     * A KB whose factbase will contain the GRI and whose rulebase is the transformedRB
+     */
+    protected KnowledgeBase downwardClosure;
+
+    /**
+     * The chase object used to compute the GRI, so that it can be reused for tracing.
+     */
+    protected Chase griKBChase;
+
+    /**
+     * Sets the initial KB and compute the GRI
+     *
+     * @param kb the current kb
+     */
+    public AbstractDynamicGRIBasedExplainer_KBGRI(KnowledgeBase kb, Atom query) {
+        DefaultChaseForExplanations.chase(kb);
+        DynamicGRIRuleTransformer ruleTransformer = new DynamicGRIRuleTransformer(query);
+        this.transformedRB = ruleTransformer.createTransformedRB(kb);
+
+        this.downwardClosure = new KnowledgeBaseImpl(kb.getFactBase(), transformedRB);
+    }
+
+    /**
+     * Saturates the GRI with Tracing rules to compute relevant atoms and triggers for the query.
+     * Then calls the solver.
+     *
+     * @param query
+     * @return
+     */
+    public Set<ExplanationType> getAllExplanations(Atom query) {
+        Atom queryWithFuncId = StaticGRIRuleTransformer.instance().createAtomWithStoredFnTermIdentifier(query);
+
+        if (!downwardClosure.getFactBase().contains(queryWithFuncId)) {
+            return Set.of();
+        }
+
+        // add seed atom to the factbase
+        Atom RELquery = new AtomImpl(StaticGRIRuleTransformer.REL, StaticGRIRuleTransformer.createFnTermIdentifier(query));
+        downwardClosure.getFactBase().add(RELquery);
+
+        // chase only with the tracing rules
+        griKBChase = DefaultChaseForExplanations.chase(downwardClosure.getFactBase(),this.transformedRB);
+        griKBChase.execute();
+
+        return getGMUSProcessor(new MARCOGMUSSolver()).computeAllExplanations(downwardClosure, query, null);
+    }
+
+    abstract ExplanationProcessor_GRI getGMUSProcessor(Solver solver);
+    // abstract RuleTransformer getRuleTransformer();
+}

integraal/integraal-explanation/src/main/java/fr/boreal/explanation/kb_gri/explainers/AbstractStaticGRIBasedExplainer_KBGRI.java

@@ -19,7 +19,6 @@ import java.util.Set;
 
 public abstract class AbstractStaticGRIBasedExplainer_KBGRI<ExplanationType> implements AtomicQueryExplainer<ExplanationType> {
 
-    private final RuleBase originalRB;
 
     /*
      * The rulebase used to build the GRI
@@ -47,7 +46,6 @@ public abstract class AbstractStaticGRIBasedExplainer_KBGRI<ExplanationType> imp
      * @param kb the current kb
      */
     public AbstractStaticGRIBasedExplainer_KBGRI(KnowledgeBase kb) {
-        this.originalRB = kb.getRuleBase();
         this.transformedRB = ruleTransformer.createTransformedRB(kb);
         this.griKB = new KnowledgeBaseImpl(kb.getFactBase(), transformedRB.getStaticRuleBase());
         this.griKBChase = DefaultChaseForExplanations.chase(griKB);

integraal/integraal-explanation/src/main/java/fr/boreal/explanation/kb_gri/rule_transformation/dynamic_gri/DynamicGRIRuleTransformer.java

@@ -68,12 +68,15 @@ public class DynamicGRIRuleTransformer {
 
         transformedRuleBase.add(createQuerySeedRule(queryAtom));
 
+
+
         for (Iterator<Predicate> it = kb.getFactBase().getPredicates(); it.hasNext(); ) {
             Predicate p = it.next();
             transformedRuleBase.add(createGRINodeBuildingRule(p));
         }
 
         for (FORule r : kb.getRuleBase().getRules()) {
+            transformedRuleBase.add(createGRIDownwardClosureRule(r));
         }
 
         return transformedRuleBase;
@@ -146,8 +149,8 @@ public class DynamicGRIRuleTransformer {
             listOfVariableIdentifiersForBodyAtoms.add(bodyAtomWithVariableIdentifier.getTerm(bodyAtomWithVariableIdentifier.getPredicate().arity() - 1));
         }
 
-        Predicate edgePredicate = getOrGenerateEdgePredicateFromRule(r);
-        Atom edgeAtom = new AtomImpl(edgePredicate, listOfVariableIdentifiersForBodyAtoms);
+        Predicate relEdgePredicate = getOrGenerateRelEdgePredicateFromRule(r);
+        Atom edgeAtom = new AtomImpl(relEdgePredicate, listOfVariableIdentifiersForBodyAtoms);
 
         newHeadAtoms.add(edgeAtom);