diff --git a/src/models/formulas/DependencyFormula.java b/src/models/formulas/DependencyFormula.java index 480d17d..bc83cd7 100644 --- a/src/models/formulas/DependencyFormula.java +++ b/src/models/formulas/DependencyFormula.java @@ -2,6 +2,8 @@ import lombok.Getter; import models.terms.Dependency; +import models.terms.RDLTerm; +import models.terms.ResourceVariable; @Getter public class DependencyFormula extends Formula { @@ -11,6 +13,10 @@ public DependencyFormula(Dependency dependency) { this.dependency = dependency; } + + public DependencyFormula(RDLTerm dependingTerm, ResourceVariable dependedVariable) { + this.dependency = new Dependency(dependingTerm, dependedVariable); + } @Override diff --git a/src/models/terms/Dependency.java b/src/models/terms/Dependency.java index 5972994..64088ce 100644 --- a/src/models/terms/Dependency.java +++ b/src/models/terms/Dependency.java @@ -66,7 +66,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); if(dependency == null) { - sb.append(dependingTerm.toString()); + sb.append(dependingTerm.toTermString()); sb.append(" : "); sb.append(dependedVariable.toString()); } else { diff --git a/src/models/terms/DependencyTerm.java b/src/models/terms/DependencyTerm.java index 20b90a4..4efd394 100644 --- a/src/models/terms/DependencyTerm.java +++ b/src/models/terms/DependencyTerm.java @@ -52,7 +52,7 @@ this.dependingTerm = dependencyTerm.getDependingTerm(); this.dependedVariable = dependencyTerm.getDependedVariable(); this.argumentTerm = nextDependencyTerm; - this.setChild(3, nextDependencyTerm); + this.setChild(2, nextDependencyTerm); this.setChild(0, dependencyTerm.getDependingTerm()); this.setChild(1, dependencyTerm.getDependedVariable()); }