diff --git a/src/Main.java b/src/Main.java index f09284e..2d14cbb 100644 --- a/src/Main.java +++ b/src/Main.java @@ -30,8 +30,7 @@ var v1 = new MetaResourceVariable(new Variable("v1"), OrderConstraint.LE, parse("x + 1")); var v2 = new MetaResourceVariable(new Variable("v1"), OrderConstraint.EQ, parse("x + 1")); var v3 = new MetaResourceVariable(new Variable("v3"), OrderConstraint.LE, parse("x")); - var dd = new MetaRDLTerm(v1, v2); - var te = new MetaRDLTerm(dd, (MetaRDLTerm) v3); + var te = new MetaRDLTerm(v1, v2, v3); System.out.println(d.toString()); System.out.println(te.toString()); diff --git a/src/models/meta/MetaRDLTerm.java b/src/models/meta/MetaRDLTerm.java index fb751fd..5647bc6 100644 --- a/src/models/meta/MetaRDLTerm.java +++ b/src/models/meta/MetaRDLTerm.java @@ -83,6 +83,7 @@ addChild(dependingTerm); addChild(dependedVariable); addChild(argumentTerm); + this.termType = TermType.META_DEPENDENCY_TERM; } public MetaRDLTerm(EvaluatableTerm dependingTerm, MetaRDLTerm dependedVariable, MetaRDLTerm argumentTerm) { @@ -93,6 +94,7 @@ addChild(dependingTerm); addChild(dependedVariable); addChild(argumentTerm); + this.termType = TermType.META_DEPENDENCY_TERM; } public MetaRDLTerm(MetaRDLTerm dependingTerm, ResourceVariable dependedVariable, MetaRDLTerm argumentTerm) { @@ -106,6 +108,7 @@ addChild(dependingTerm); addChild(dependedVariable); addChild(argumentTerm); + this.termType = TermType.META_DEPENDENCY_TERM; } public MetaRDLTerm(MetaRDLTerm dependingTerm, MetaRDLTerm dependedVariable, EvaluatableTerm argumentTerm) { @@ -116,6 +119,7 @@ addChild(dependingTerm); addChild(dependedVariable); addChild(argumentTerm); + this.termType = TermType.META_DEPENDENCY_TERM; } public MetaRDLTerm(MetaRDLTerm dependingTerm, ResourceVariable dependedVariable, EvaluatableTerm argumentTerm) { @@ -126,6 +130,7 @@ addChild(dependingTerm); addChild(dependedVariable); addChild(argumentTerm); + this.termType = TermType.META_DEPENDENCY_TERM; } public MetaRDLTerm(EvaluatableTerm dependingTerm, MetaResourceVariable dependedVariable, EvaluatableTerm argumentTerm) { @@ -133,6 +138,7 @@ addChild(dependingTerm); addChild(dependedVariable); addChild(argumentTerm); + this.termType = TermType.META_DEPENDENCY_TERM; } public MetaRDLTerm(EvaluatableTerm dependingTerm, ResourceVariable dependedVariable, MetaRDLTerm argumentTerm) { @@ -143,6 +149,7 @@ addChild(dependingTerm); addChild(dependedVariable); addChild(argumentTerm); + this.termType = TermType.META_DEPENDENCY_TERM; }