diff --git a/src/main/java/models/formulas/DependencyFormula.java b/src/main/java/models/formulas/DependencyFormula.java index ce737d9..2d0d5b6 100644 --- a/src/main/java/models/formulas/DependencyFormula.java +++ b/src/main/java/models/formulas/DependencyFormula.java @@ -1,6 +1,7 @@ package models.formulas; -import java.util.List; +import java.util.Set; +import java.util.TreeSet; import lombok.Getter; import models.terms.Dependency; @@ -16,8 +17,8 @@ this.dependency = dependency; } - public DependencyFormula(RDLTerm dependingTerm, List dependedResources) { - this.dependency = new Dependency(dependingTerm, dependedResources); + public DependencyFormula(RDLTerm dependingTerm, Set dependedResources) { + this.dependency = new Dependency(dependingTerm, new TreeSet<>(dependedResources)); } diff --git a/src/main/java/models/terms/meta/MetaRDLTerm.java b/src/main/java/models/terms/meta/MetaRDLTerm.java index 2072bd5..1d11c02 100644 --- a/src/main/java/models/terms/meta/MetaRDLTerm.java +++ b/src/main/java/models/terms/meta/MetaRDLTerm.java @@ -53,17 +53,6 @@ this.termType = TermType.META_DEPENDENCY; } - //list type dependency or set term - public MetaRDLTerm(MetaRDLTerm term) { - super(new Symbol(":", 1), term.getOrder() - 1, term.getSize()); - if (term.isDependency()) { - this.termType = TermType.META_DEPENDENCY_LIST; - } else if (term.isEvaluatableTerm()) { - this.termType = TermType.META_EVALUATABLE_TERM_SET; - } - addChild(term); - } - //dependency term public MetaRDLTerm(MetaRDLTerm dependingTerm, MetaResource dependedVariable, MetaRDLTerm argumentTerm) { super(new Symbol(":", 3), -1, dependingTerm.getSize() + dependedVariable.getSize() + argumentTerm.getSize()); diff --git a/src/test/java/terms/meta/DependencyTermTest.java b/src/test/java/terms/meta/DependencyTermTest.java index b4f3ee7..993f94b 100644 --- a/src/test/java/terms/meta/DependencyTermTest.java +++ b/src/test/java/terms/meta/DependencyTermTest.java @@ -34,8 +34,8 @@ assertEquals(t5, t6); assertFalse(t5.equals(t7)); - DependencyTerm t8 = new DependencyTerm(t1, d, e); - DependencyTerm t9 = new DependencyTerm(t1, d, e); + DependencyTerm t8 = new DependencyTerm(t1, t5, t6); + DependencyTerm t9 = new DependencyTerm(t1, t6, t5); assertEquals(t8, t9); }