diff --git a/src/main/java/inference/rewrite/ResourceTree.java b/src/main/java/inference/rewrite/ResourceTree.java index 7b2429d..69a7db5 100644 --- a/src/main/java/inference/rewrite/ResourceTree.java +++ b/src/main/java/inference/rewrite/ResourceTree.java @@ -11,7 +11,6 @@ import models.Position; import models.terms.DependencyTerm; import models.terms.EvaluatableTerm; -import models.terms.PrimedTerm; import models.terms.Resource; public class ResourceTree { @@ -80,37 +79,6 @@ } } return resultPositions; - } else if (term instanceof PrimedTerm pt) { - if (pt.isResource()) { - resourceMap.put(top, pt); - if (! tree.containsKey(top)) { - tree.put(top, new ArrayList<>()); - } - return List.of(top); - } else { - DependencyTerm depTerm = (DependencyTerm) (pt.getPrimedTerm()); - EvaluatableTerm dependingTerm = depTerm.getDependingTerm(); - List dependedResources = depTerm.getDependedTerms(); - List argumentTerms = depTerm.getArgumentTerms(); - List dependingTermPositions = constructResourceTree(dependingTerm, top); - List resultPositions = new ArrayList<>(); - for (Position pos: dependingTermPositions) { - tree.put(pos, new ArrayList<>()); - } - for (int i = 0; i < dependedResources.size(); i++) { - for (Position pos : dependingTermPositions) { - Position nextPos = pos.addPath(i); - tree.get(pos).add(nextPos); - Position dependedResourcePosition= constructResourceTree(dependedResources.get(i), nextPos).get(0); - tree.put(dependedResourcePosition, new ArrayList<>()); - Position argumentTermPosition = dependedResourcePosition.addPath(0); - tree.get(dependedResourcePosition).add(argumentTermPosition); - tree.put(argumentTermPosition, new ArrayList<>()); - resultPositions.addAll(constructResourceTree(argumentTerms.get(i), argumentTermPosition)); - } - } - return resultPositions; - } } else { return null; } diff --git a/src/main/java/inference/rewrite/RewriteInferenceSystem.java b/src/main/java/inference/rewrite/RewriteInferenceSystem.java index 01adcbb..dea1f97 100644 --- a/src/main/java/inference/rewrite/RewriteInferenceSystem.java +++ b/src/main/java/inference/rewrite/RewriteInferenceSystem.java @@ -15,7 +15,6 @@ import models.formulas.Then; import models.terms.DependencyTerm; import models.terms.EvaluatableTerm; -import models.terms.PrimedTerm; import models.terms.Resource; public class RewriteInferenceSystem { @@ -549,43 +548,22 @@ } private boolean singleTermCheck(EvaluatableTerm term) { - if (term instanceof PrimedTerm primedTerm) { - return singleTermCheck(primedTerm.getPrimedTerm()); - } if (term instanceof Resource) { return true; } DependencyTerm depTerm = (DependencyTerm) term; if (!(depTerm.getDependingTerm() instanceof Resource)) { - if (depTerm.getDependingTerm() instanceof PrimedTerm primedTerm) { - if (! (primedTerm.getPrimedTerm() instanceof Resource)) { - return false; - } - } else { - return false; - } + return false; } for (EvaluatableTerm te : depTerm.getDependedTerms()) { if (!(te instanceof Resource)) { - if (te instanceof PrimedTerm primedTerm) { - if (! (primedTerm.getPrimedTerm() instanceof Resource)) { - return false; - } - } else { - return false; - } + return false; } } for (EvaluatableTerm te : depTerm.getArgumentTerms()) { if (!(te instanceof Resource)) { - if (te instanceof PrimedTerm primedTerm) { - if (! (primedTerm.getPrimedTerm() instanceof Resource)) { - return false; - } - } else { - return false; - } + return false; } } return true; @@ -609,14 +587,6 @@ if (! (formula instanceof EquationFormula equation)) { return false; } - EvaluatableTerm leftSideHand = equation.getLeftSideHand(); - EvaluatableTerm rightSideHand = equation.getRightSideHand(); - - if (leftSideHand instanceof PrimedTerm) { - return ((PrimedTerm) leftSideHand).getPrimedTerm().equals(rightSideHand); - } else if (rightSideHand instanceof PrimedTerm) { - return ((PrimedTerm) rightSideHand).getPrimedTerm().equals(leftSideHand); - } return false; } diff --git a/src/main/java/models/terms/meta/MetaRDLTerm.java b/src/main/java/models/terms/meta/MetaRDLTerm.java index d3e32d1..f9d20dc 100644 --- a/src/main/java/models/terms/meta/MetaRDLTerm.java +++ b/src/main/java/models/terms/meta/MetaRDLTerm.java @@ -130,6 +130,11 @@ return true; } + @Override + public Dependency getDependency() { + return null; + } + @Override public int getMaxIndex() {