diff --git a/src/main/java/models/terms/Dependency.java b/src/main/java/models/terms/Dependency.java index 21307bc..d454a08 100644 --- a/src/main/java/models/terms/Dependency.java +++ b/src/main/java/models/terms/Dependency.java @@ -18,7 +18,7 @@ private TreeMultiset dependedTerms; public Dependency(RDLTerm dependingTerm, List dependedTerms) { - super(new Symbol(":", dependedTerms.size() + 1), dependedTerms.iterator().next().getOrder(), dependingTerm.getSize() + dependedTerms.stream().mapToInt(v -> v.size).sum()); + super(dependedTerms.iterator().next().getOrder(), dependingTerm.getSize() + dependedTerms.stream().mapToInt(v -> v.size).sum()); this.dependingTerm = dependingTerm; this.dependedTerms = TreeMultiset.create(dependedTerms); this.addChild(dependingTerm); diff --git a/src/main/java/models/terms/DependencyTerm.java b/src/main/java/models/terms/DependencyTerm.java index 5a66e06..b9413b3 100644 --- a/src/main/java/models/terms/DependencyTerm.java +++ b/src/main/java/models/terms/DependencyTerm.java @@ -19,11 +19,7 @@ public DependencyTerm(EvaluatableTerm dependingTerm, List terms) { - super( - new Symbol(":", 1 + terms.size()), - -1, - -1 - ); + super(-1, -1); if (terms.size() % 2 != 0) { throw new SyntaxException("Args size must be odd."); } diff --git a/src/main/java/models/terms/EvaluatableTerm.java b/src/main/java/models/terms/EvaluatableTerm.java index 84169f6..08c4178 100644 --- a/src/main/java/models/terms/EvaluatableTerm.java +++ b/src/main/java/models/terms/EvaluatableTerm.java @@ -4,8 +4,8 @@ public abstract class EvaluatableTerm extends RDLTerm{ - protected EvaluatableTerm(Symbol symbol, int order, int size) { - super(symbol, order, size); + protected EvaluatableTerm(int order, int size) { + super(order, size); } public abstract boolean isLinearRightNormalized(); diff --git a/src/main/java/models/terms/PrimedTerm.java b/src/main/java/models/terms/PrimedTerm.java index 2afd229..40ebd68 100644 --- a/src/main/java/models/terms/PrimedTerm.java +++ b/src/main/java/models/terms/PrimedTerm.java @@ -9,7 +9,7 @@ private boolean isResource; public PrimedTerm(EvaluatableTerm term) { - super(term.getSymbol(), term.getOrder(), term.getSize()); + super(term.getOrder(), term.getSize()); this.primedTerm = term; this.isResource = term instanceof Resource; } diff --git a/src/main/java/models/terms/RDLTerm.java b/src/main/java/models/terms/RDLTerm.java index 629839c..536230d 100644 --- a/src/main/java/models/terms/RDLTerm.java +++ b/src/main/java/models/terms/RDLTerm.java @@ -10,8 +10,8 @@ protected int order; protected int size; - protected RDLTerm(Symbol symbol, int order, int size) { - super(symbol); + protected RDLTerm(int order, int size) { + super(new Symbol("")); this.order = order; this.size = size; } diff --git a/src/main/java/models/terms/Resource.java b/src/main/java/models/terms/Resource.java index e5274fb..40851ff 100644 --- a/src/main/java/models/terms/Resource.java +++ b/src/main/java/models/terms/Resource.java @@ -8,12 +8,10 @@ public class Resource extends EvaluatableTerm { private String name; - private Type type; - - public Resource(String name, Type type, int order) { - super(new Symbol("", 0), order, 1); + + public Resource(String name, int order) { + super(order, 1); this.name = name; - this.type = type; } @Override @@ -57,7 +55,7 @@ @Override public Object clone() { - return new Resource(name, type, order); + return new Resource(name, order); } } diff --git a/src/main/java/models/terms/ResourceConstant.java b/src/main/java/models/terms/ResourceConstant.java index 1158b84..bf1567c 100644 --- a/src/main/java/models/terms/ResourceConstant.java +++ b/src/main/java/models/terms/ResourceConstant.java @@ -11,13 +11,13 @@ private Type type; public ResourceConstant(String name) { - super(new Symbol("", 0), 0, 1); + super(0, 1); this.name = name; this.type = null; } public ResourceConstant(String name, Type type) { - super(new Symbol("", 0), 0, 1); + super(0, 1); this.name = name; this.type = type; } diff --git a/src/main/java/models/terms/meta/MetaDependency.java b/src/main/java/models/terms/meta/MetaDependency.java index 7053d66..031bf73 100644 --- a/src/main/java/models/terms/meta/MetaDependency.java +++ b/src/main/java/models/terms/meta/MetaDependency.java @@ -22,11 +22,11 @@ protected List dependedTerms; protected MetaDependency() { - super(new Symbol(":", -1), TermType.META_DEPENDENCY, -1); + super(TermType.META_DEPENDENCY, -1); } public MetaDependency(RDLTerm dependingTerm, List dependedTerms) { - super(new Symbol(":", -1), TermType.META_DEPENDENCY, -1); + super(TermType.META_DEPENDENCY, -1); int size = dependingTerm.getSize(); addChild(dependingTerm); for(RDLTerm term : dependedTerms.stream().sorted().toList()) { diff --git a/src/main/java/models/terms/meta/MetaDependencyTerm.java b/src/main/java/models/terms/meta/MetaDependencyTerm.java index 7b3f30e..8825dc8 100644 --- a/src/main/java/models/terms/meta/MetaDependencyTerm.java +++ b/src/main/java/models/terms/meta/MetaDependencyTerm.java @@ -22,7 +22,7 @@ public class MetaDependencyTerm extends MetaRDLTerm{ public MetaDependencyTerm(RDLTerm dependingTerm, List terms) { - super(new Symbol(":", -1), TermType.META_DEPENDENCY_TERM, -1); + super(TermType.META_DEPENDENCY_TERM, -1); TreeMap> sortedMap = new TreeMap<>(); addChild(dependingTerm); int size = dependingTerm.getSize(); diff --git a/src/main/java/models/terms/meta/MetaDependencyTermVariable.java b/src/main/java/models/terms/meta/MetaDependencyTermVariable.java index fc23e3a..ab5291b 100644 --- a/src/main/java/models/terms/meta/MetaDependencyTermVariable.java +++ b/src/main/java/models/terms/meta/MetaDependencyTermVariable.java @@ -10,15 +10,15 @@ public class MetaDependencyTermVariable extends MetaVariable { public MetaDependencyTermVariable(Variable variableName, OrderConstraint constraint, Expression order) { - super(new Symbol(":", 3), MetaRDLTerm.TermType.META_DEPENDENCY_TERM_VARIABLE, variableName, constraint, order); + super(MetaRDLTerm.TermType.META_DEPENDENCY_TERM_VARIABLE, variableName, constraint, order); } public MetaDependencyTermVariable(Variable variableName) { - super(new Symbol(":", 3), MetaRDLTerm.TermType.META_DEPENDENCY_TERM_VARIABLE, variableName, OrderConstraint.ANY, new Constant("0")); + super(MetaRDLTerm.TermType.META_DEPENDENCY_TERM_VARIABLE, variableName, OrderConstraint.ANY, new Constant("0")); } public MetaDependencyTermVariable(Variable variableName, Expression order) { - super(new Symbol(":", 3), MetaRDLTerm.TermType.META_DEPENDENCY_TERM_VARIABLE, variableName, OrderConstraint.EQ, order); + super(MetaRDLTerm.TermType.META_DEPENDENCY_TERM_VARIABLE, variableName, OrderConstraint.EQ, order); } } diff --git a/src/main/java/models/terms/meta/MetaDependencyVariable.java b/src/main/java/models/terms/meta/MetaDependencyVariable.java index 477e338..b59886a 100644 --- a/src/main/java/models/terms/meta/MetaDependencyVariable.java +++ b/src/main/java/models/terms/meta/MetaDependencyVariable.java @@ -10,15 +10,15 @@ public class MetaDependencyVariable extends MetaVariable { public MetaDependencyVariable(Variable variableName, OrderConstraint constraint, Expression order) { - super(new Symbol(":", 2), MetaRDLTerm.TermType.META_DEPENDENCY_VARIABLE, variableName, constraint, order); + super(MetaRDLTerm.TermType.META_DEPENDENCY_VARIABLE, variableName, constraint, order); } public MetaDependencyVariable(Variable variableName) { - super(new Symbol(":", 2), MetaRDLTerm.TermType.META_DEPENDENCY_VARIABLE, variableName, OrderConstraint.ANY, new Constant("0")); + super(MetaRDLTerm.TermType.META_DEPENDENCY_VARIABLE, variableName, OrderConstraint.ANY, new Constant("0")); } public MetaDependencyVariable(Variable variableName, Expression order) { - super(new Symbol(":", 2), MetaRDLTerm.TermType.META_DEPENDENCY_VARIABLE, variableName, OrderConstraint.EQ, order); + super(MetaRDLTerm.TermType.META_DEPENDENCY_VARIABLE, variableName, OrderConstraint.EQ, order); } } diff --git a/src/main/java/models/terms/meta/MetaEvaluatableTermVariable.java b/src/main/java/models/terms/meta/MetaEvaluatableTermVariable.java index dd049b4..8c19328 100644 --- a/src/main/java/models/terms/meta/MetaEvaluatableTermVariable.java +++ b/src/main/java/models/terms/meta/MetaEvaluatableTermVariable.java @@ -9,27 +9,27 @@ public class MetaEvaluatableTermVariable extends MetaVariable { public MetaEvaluatableTermVariable(Variable variableName, OrderConstraint constraint, Expression order) { - super(new Symbol(":", 2), MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, constraint, order); + super(MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, constraint, order); } public MetaEvaluatableTermVariable(Variable variableName) { - super(new Symbol(":", 2), MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, OrderConstraint.ANY, new Constant("0")); + super(MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, OrderConstraint.ANY, new Constant("0")); } public MetaEvaluatableTermVariable(Variable variableName, Expression order) { - super(new Symbol(":", 2), MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, OrderConstraint.EQ, order); + super(MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, OrderConstraint.EQ, order); } public MetaEvaluatableTermVariable(Variable variableName, OrderConstraint constraint, Expression order, LinearRightNormalizedType linearRIghtNormalizedType) { - super(new Symbol(":", 2), MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, constraint, order, linearRIghtNormalizedType); + super(MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, constraint, order, linearRIghtNormalizedType); } public MetaEvaluatableTermVariable(Variable variableName, LinearRightNormalizedType linearRIghtNormalizedType) { - super(new Symbol(":", 2), MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, OrderConstraint.ANY, new Constant("0"), linearRIghtNormalizedType); + super(MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, OrderConstraint.ANY, new Constant("0"), linearRIghtNormalizedType); } public MetaEvaluatableTermVariable(Variable variableName, Expression order, LinearRightNormalizedType linearRIghtNormalizedType) { - super(new Symbol(":", 2), MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, OrderConstraint.EQ, order, linearRIghtNormalizedType); + super(MetaRDLTerm.TermType.META_EVALUATABLE_TERM_VARIABLE, variableName, OrderConstraint.EQ, order, linearRIghtNormalizedType); } } diff --git a/src/main/java/models/terms/meta/MetaRDLTerm.java b/src/main/java/models/terms/meta/MetaRDLTerm.java index 9ceb9f4..c1e6b35 100644 --- a/src/main/java/models/terms/meta/MetaRDLTerm.java +++ b/src/main/java/models/terms/meta/MetaRDLTerm.java @@ -23,8 +23,8 @@ protected TermType termType; protected LinearRightNormalizedType linearRightNormalizedType = LinearRightNormalizedType.UNDEFINED; - protected MetaRDLTerm(Symbol symbol, TermType termType, int size) { - super(symbol, -1, size); + protected MetaRDLTerm(TermType termType, int size) { + super(-1, size); this.termType = termType; if (isResource()) { linearRightNormalizedType = LinearRightNormalizedType.LINEAR_RIGHT_NORMALIZED; diff --git a/src/main/java/models/terms/meta/MetaRDLTermVariable.java b/src/main/java/models/terms/meta/MetaRDLTermVariable.java index 1205c21..75bdeea 100644 --- a/src/main/java/models/terms/meta/MetaRDLTermVariable.java +++ b/src/main/java/models/terms/meta/MetaRDLTermVariable.java @@ -8,15 +8,15 @@ public class MetaRDLTermVariable extends MetaVariable { public MetaRDLTermVariable(Variable variableName, OrderConstraint constraint, Expression order) { - super(new Symbol("", -1), MetaRDLTerm.TermType.META_RDL_TERM, variableName, constraint, order); + super(MetaRDLTerm.TermType.META_RDL_TERM, variableName, constraint, order); } public MetaRDLTermVariable(Variable variableName) { - super(new Symbol("", -1), MetaRDLTerm.TermType.META_RDL_TERM, variableName, OrderConstraint.ANY, new Constant("0")); + super(MetaRDLTerm.TermType.META_RDL_TERM, variableName, OrderConstraint.ANY, new Constant("0")); } public MetaRDLTermVariable(Variable variableName, Expression order) { - super(new Symbol("", -1), MetaRDLTerm.TermType.META_RDL_TERM, variableName, OrderConstraint.EQ, order); + super(MetaRDLTerm.TermType.META_RDL_TERM, variableName, OrderConstraint.EQ, order); } } diff --git a/src/main/java/models/terms/meta/MetaResource.java b/src/main/java/models/terms/meta/MetaResource.java index 6c58980..fbdc3c3 100644 --- a/src/main/java/models/terms/meta/MetaResource.java +++ b/src/main/java/models/terms/meta/MetaResource.java @@ -17,15 +17,15 @@ public class MetaResource extends MetaVariable { public MetaResource(Variable variableName, OrderConstraint constraint, Expression order) { - super(new Symbol("", 0), MetaRDLTerm.TermType.META_RESOURCE_VARIABLE, variableName, constraint, order); + super(MetaRDLTerm.TermType.META_RESOURCE_VARIABLE, variableName, constraint, order); } public MetaResource(Variable variableName) { - super(new Symbol("", 0), MetaRDLTerm.TermType.META_RESOURCE_VARIABLE, variableName, OrderConstraint.ANY, new Constant("0")); + super(MetaRDLTerm.TermType.META_RESOURCE_VARIABLE, variableName, OrderConstraint.ANY, new Constant("0")); } public MetaResource(Variable variableName, Expression order) { - super(new Symbol("", 0), MetaRDLTerm.TermType.META_RESOURCE_VARIABLE, variableName, OrderConstraint.EQ, order); + super(MetaRDLTerm.TermType.META_RESOURCE_VARIABLE, variableName, OrderConstraint.EQ, order); } @Override diff --git a/src/main/java/models/terms/meta/MetaVariable.java b/src/main/java/models/terms/meta/MetaVariable.java index 4c3479c..89a4bbe 100644 --- a/src/main/java/models/terms/meta/MetaVariable.java +++ b/src/main/java/models/terms/meta/MetaVariable.java @@ -25,8 +25,8 @@ protected int orderConstant; protected Expression orderExpression; - protected MetaVariable(Symbol symbol, TermType termType, Variable name, OrderConstraint constraint, Expression order) { - super(symbol, termType, 1); + protected MetaVariable(TermType termType, Variable name, OrderConstraint constraint, Expression order) { + super(termType, 1); this.variableName = name; this.constraint = constraint; this.orderExpression = order; @@ -47,8 +47,8 @@ orderConstant = constant; } - protected MetaVariable(Symbol symbol, TermType termType, Variable name, OrderConstraint constraint, Expression order, LinearRightNormalizedType linearRIghtNormalizedType) { - super(symbol, termType, 1); + protected MetaVariable(TermType termType, Variable name, OrderConstraint constraint, Expression order, LinearRightNormalizedType linearRIghtNormalizedType) { + super(termType, 1); this.variableName = name; this.constraint = constraint; this.orderExpression = order; diff --git a/src/test/java/equivalence/SubstituteTest.java b/src/test/java/equivalence/SubstituteTest.java index c3df575..3352e3f 100644 --- a/src/test/java/equivalence/SubstituteTest.java +++ b/src/test/java/equivalence/SubstituteTest.java @@ -5,16 +5,16 @@ public class SubstituteTest { - Resource A = new Resource("A", Utils.INT, 2); - Resource Ap = new Resource("A'", Utils.INT, 2); - Resource B = new Resource("B", Utils.INT, 2); - Resource Bp = new Resource("B'", Utils.INT, 2); - Resource C = new Resource("C", Utils.INT, 2); - Resource Cp = new Resource("C'", Utils.INT, 2); - Resource D = new Resource("D", Utils.INT, 2); - Resource E = new Resource("E", Utils.INT, 1); - Resource F = new Resource("F", Utils.INT, 1); - Resource G = new Resource("G", Utils.INT, 0); + Resource A = new Resource("A", 2); + Resource Ap = new Resource("A'", 2); + Resource B = new Resource("B", 2); + Resource Bp = new Resource("B'", 2); + Resource C = new Resource("C", 2); + Resource Cp = new Resource("C'", 2); + Resource D = new Resource("D", 2); + Resource E = new Resource("E", 1); + Resource F = new Resource("F", 1); + Resource G = new Resource("G", 0); // @Test // void SubstituteTest1() { diff --git a/src/test/java/formulas/meta/MetaEquationFormulaTest.java b/src/test/java/formulas/meta/MetaEquationFormulaTest.java index 8dc1890..942e206 100644 --- a/src/test/java/formulas/meta/MetaEquationFormulaTest.java +++ b/src/test/java/formulas/meta/MetaEquationFormulaTest.java @@ -25,10 +25,10 @@ @Test void MetaEquationFormulaMatchingTest() { - Resource a = new Resource("a", INT, 0); - Resource b = new Resource("b", INT, 0); - Resource c = new Resource("c", INT, 0); - Resource d = new Resource("d", INT, 0); + Resource a = new Resource("a", 0); + Resource b = new Resource("b", 0); + Resource c = new Resource("c", 0); + Resource d = new Resource("d", 0); EvaluatableTerm te1 = new DependencyTerm(a, b, c); EvaluatableTerm te2 = new DependencyTerm(a, b, d); EquationFormula formula = new EquationFormula(te1, te2); @@ -49,11 +49,11 @@ @Test void MetaDependencyFormulaMatchingTest() { - Resource a = new Resource("a", INT, 0); - Resource b = new Resource("b", INT, 0); - Resource c = new Resource("c", INT, 0); + Resource a = new Resource("a", 0); + Resource b = new Resource("b", 0); + Resource c = new Resource("c", 0); EvaluatableTerm te1 = new DependencyTerm(a, b, c); - Resource d = new Resource("d", INT, 0); + Resource d = new Resource("d", 0); Dependency d1 = new Dependency(te1, d); DependencyFormula depF = new DependencyFormula(d1); diff --git a/src/test/java/inferencerule/DependencyAxiomTest.java b/src/test/java/inferencerule/DependencyAxiomTest.java index 49890af..9b62347 100644 --- a/src/test/java/inferencerule/DependencyAxiomTest.java +++ b/src/test/java/inferencerule/DependencyAxiomTest.java @@ -4,13 +4,13 @@ public class DependencyAxiomTest { - Resource a = new Resource("a", Utils.INT, 1); - Resource b = new Resource("b", Utils.INT, 1); - Resource c = new Resource("c", Utils.INT, 1); - Resource d = new Resource("d", Utils.INT, 1); - Resource e = new Resource("e", Utils.INT, 1); - Resource f = new Resource("f", Utils.INT, 2); - Resource g = new Resource("g", Utils.INT, 2); - Resource h = new Resource("h", Utils.INT, 2); + Resource a = new Resource("a", 1); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 1); + Resource d = new Resource("d", 1); + Resource e = new Resource("e", 1); + Resource f = new Resource("f", 2); + Resource g = new Resource("g", 2); + Resource h = new Resource("h", 2); } diff --git a/src/test/java/inferencerule/EqualityAxiomTest.java b/src/test/java/inferencerule/EqualityAxiomTest.java index fe75f26..a3e0efa 100644 --- a/src/test/java/inferencerule/EqualityAxiomTest.java +++ b/src/test/java/inferencerule/EqualityAxiomTest.java @@ -4,17 +4,17 @@ public class EqualityAxiomTest { - Resource a = new Resource("a", Utils.INT, 1); - Resource b = new Resource("b", Utils.INT, 1); - Resource c = new Resource("c", Utils.INT, 1); - Resource d = new Resource("d", Utils.INT, 1); - Resource e = new Resource("e", Utils.INT, 1); - Resource f = new Resource("f", Utils.INT, 1); - Resource g = new Resource("g", Utils.INT, 1); - Resource h = new Resource("h", Utils.INT, 2); - Resource i = new Resource("i", Utils.INT, 2); - Resource j = new Resource("j", Utils.INT, 2); - Resource k = new Resource("k", Utils.INT, 2); - Resource l = new Resource("l", Utils.INT, 1); + Resource a = new Resource("a", 1); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 1); + Resource d = new Resource("d", 1); + Resource e = new Resource("e", 1); + Resource f = new Resource("f", 1); + Resource g = new Resource("g", 1); + Resource h = new Resource("h", 2); + Resource i = new Resource("i", 2); + Resource j = new Resource("j", 2); + Resource k = new Resource("k", 2); + Resource l = new Resource("l", 1); } diff --git a/src/test/java/rewrite/RewriteInferenceTest.java b/src/test/java/rewrite/RewriteInferenceTest.java index d9d445b..d0d9adb 100644 --- a/src/test/java/rewrite/RewriteInferenceTest.java +++ b/src/test/java/rewrite/RewriteInferenceTest.java @@ -17,28 +17,28 @@ @Test void RewriteInferenceTest1() { - Resource totalAmount = new Resource("totalAmount", Utils.INT, 1); - Resource quantity = new Resource("quantity", Utils.INT, 1); - Resource unitPrice = new Resource("unitPrice", Utils.INT, 1); - Resource productId = new Resource("productID", Utils.INT, 1); - Resource productName = new Resource("productName", Utils.INT, 1); - Resource soledProductId = new Resource("soledProductId", Utils.INT, 1); + Resource totalAmount = new Resource("totalAmount", 1); + Resource quantity = new Resource("quantity", 1); + Resource unitPrice = new Resource("unitPrice", 1); + Resource productId = new Resource("productID", 1); + Resource productName = new Resource("productName", 1); + Resource soledProductId = new Resource("soledProductId", 1); PrimedTerm totalAmountP = new PrimedTerm(totalAmount); PrimedTerm quantityP = new PrimedTerm(quantity); PrimedTerm unitPriceP = new PrimedTerm(unitPrice); PrimedTerm productIdP = new PrimedTerm(productId); PrimedTerm productNameP = new PrimedTerm(productName); PrimedTerm soledProductIdP = new PrimedTerm(soledProductId); - Resource a = new Resource("a", Utils.INT, 0); - Resource b = new Resource("b", Utils.INT, 0); - Resource c = new Resource("c", Utils.INT, 0); - Resource d = new Resource("d", Utils.INT, 0); - Resource e = new Resource("e", Utils.INT, 0); - Resource salesId = new Resource("salesId", Utils.INT, 1); + Resource a = new Resource("a", 0); + Resource b = new Resource("b", 0); + Resource c = new Resource("c", 0); + Resource d = new Resource("d", 0); + Resource e = new Resource("e", 0); + Resource salesId = new Resource("salesId", 1); PrimedTerm salesIdP = new PrimedTerm(salesId); - Resource mul = new Resource("mul", Utils.INT, 1); - Resource mul1= new Resource("mul1", Utils.INT, 1); - Resource mul2 = new Resource("mul2", Utils.INT, 1); + Resource mul = new Resource("mul", 1); + Resource mul1= new Resource("mul1", 1); + Resource mul2 = new Resource("mul2", 1); // reference1 DependencyTerm te1 = new DependencyTerm(unitPrice, productId, soledProductId); diff --git a/src/test/java/terms/DependencyTermTest.java b/src/test/java/terms/DependencyTermTest.java index 7786338..13a9fb4 100644 --- a/src/test/java/terms/DependencyTermTest.java +++ b/src/test/java/terms/DependencyTermTest.java @@ -11,17 +11,17 @@ public class DependencyTermTest { - Resource a = new Resource("a", Utils.INT, 1); - Resource b = new Resource("b", Utils.INT, 1); - Resource c = new Resource("c", Utils.INT, 1); - Resource d = new Resource("d", Utils.INT, 1); - Resource e = new Resource("e", Utils.INT, 1); - Resource f = new Resource("f", Utils.INT, 1); - Resource g = new Resource("g", Utils.INT, 1); - Resource h = new Resource("h", Utils.INT, 2); - Resource i = new Resource("i", Utils.INT, 2); - Resource j = new Resource("j", Utils.INT, 2); - Resource k = new Resource("k", Utils.INT, 2); + Resource a = new Resource("a", 1); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 1); + Resource d = new Resource("d", 1); + Resource e = new Resource("e", 1); + Resource f = new Resource("f", 1); + Resource g = new Resource("g", 1); + Resource h = new Resource("h", 2); + Resource i = new Resource("i", 2); + Resource j = new Resource("j", 2); + Resource k = new Resource("k", 2); @Test void EqualsTest() { diff --git a/src/test/java/terms/DependencyTest.java b/src/test/java/terms/DependencyTest.java index ba660ef..c146330 100644 --- a/src/test/java/terms/DependencyTest.java +++ b/src/test/java/terms/DependencyTest.java @@ -10,12 +10,12 @@ public class DependencyTest { - Resource a = new Resource("a", Utils.INT, 1); - Resource b = new Resource("b", Utils.INT, 1); - Resource c = new Resource("c", Utils.INT, 1); - Resource d = new Resource("d", Utils.INT, 2); - Resource e = new Resource("e", Utils.INT, 1); - Resource f = new Resource("f", Utils.INT, 1); + Resource a = new Resource("a", 1); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 1); + Resource d = new Resource("d", 2); + Resource e = new Resource("e", 1); + Resource f = new Resource("f", 1); @Test void EqualsTest() { diff --git a/src/test/java/terms/EqualsTest.java b/src/test/java/terms/EqualsTest.java index f58b834..ff7c699 100644 --- a/src/test/java/terms/EqualsTest.java +++ b/src/test/java/terms/EqualsTest.java @@ -11,11 +11,11 @@ @Test void DependencyTermEqualsTest() { - Resource A = new Resource("A", Utils.INT, 1); - Resource B = new Resource("B", Utils.INT, 1); - Resource C = new Resource("C", Utils.INT, 1); - Resource D = new Resource("D", Utils.INT, 1); - Resource E = new Resource("E", Utils.INT, 1); + Resource A = new Resource("A", 1); + Resource B = new Resource("B", 1); + Resource C = new Resource("C", 1); + Resource D = new Resource("D", 1); + Resource E = new Resource("E", 1); DependencyTerm t1 = new DependencyTerm(A, B, C, D, E); DependencyTerm t2 = new DependencyTerm(A, D, E, B, C); diff --git a/src/test/java/terms/OrderTest.java b/src/test/java/terms/OrderTest.java index a812e50..79a12e6 100644 --- a/src/test/java/terms/OrderTest.java +++ b/src/test/java/terms/OrderTest.java @@ -12,11 +12,11 @@ @Test void singleDependencyTermOrderTest() { - Resource A = new Resource("A", Utils.INT, 1); - Resource B = new Resource("B", Utils.INT, 1); - Resource C = new Resource("C", Utils.INT, 1); - Resource D = new Resource("D", Utils.INT, 2); - Resource E = new Resource("E", Utils.INT, 0); + Resource A = new Resource("A", 1); + Resource B = new Resource("B", 1); + Resource C = new Resource("C", 1); + Resource D = new Resource("D", 2); + Resource E = new Resource("E", 0); DependencyTerm t1 = new DependencyTerm(A, B, C); assertEquals(t1.getOrder(), 1); @@ -29,13 +29,13 @@ @Test void multiDependencyTermOrderTest() { - Resource A = new Resource("A", Utils.INT, 1); - Resource B = new Resource("B", Utils.INT, 1); - Resource C = new Resource("C", Utils.INT, 1); - Resource D = new Resource("D", Utils.INT, 1); - Resource E = new Resource("E", Utils.INT, 1); - Resource F = new Resource("F", Utils.INT, 2); - Resource G = new Resource("G", Utils.INT, 0); + Resource A = new Resource("A", 1); + Resource B = new Resource("B", 1); + Resource C = new Resource("C", 1); + Resource D = new Resource("D", 1); + Resource E = new Resource("E", 1); + Resource F = new Resource("F", 2); + Resource G = new Resource("G", 0); DependencyTerm t1 = new DependencyTerm(A, B, C, D, E); assertEquals(t1.getOrder(), 1); diff --git a/src/test/java/terms/meta/MetaDependencyTermTest.java b/src/test/java/terms/meta/MetaDependencyTermTest.java index e75916b..46fc0d8 100644 --- a/src/test/java/terms/meta/MetaDependencyTermTest.java +++ b/src/test/java/terms/meta/MetaDependencyTermTest.java @@ -23,13 +23,13 @@ public class MetaDependencyTermTest { - Resource a = new Resource("a", Utils.INT, 1); - Resource b = new Resource("b", Utils.INT, 1); - Resource c = new Resource("c", Utils.INT, 1); - Resource d = new Resource("d", Utils.INT, 1); - Resource e = new Resource("e", Utils.INT, 1); - Resource f = new Resource("f", Utils.INT, 1); - Resource g = new Resource("g", Utils.INT, 1); + Resource a = new Resource("a", 1); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 1); + Resource d = new Resource("d", 1); + Resource e = new Resource("e", 1); + Resource f = new Resource("f", 1); + Resource g = new Resource("g", 1); @Test void MatchTest() { diff --git a/src/test/java/terms/meta/MetaDependencyTest.java b/src/test/java/terms/meta/MetaDependencyTest.java index 912c5fe..236202c 100644 --- a/src/test/java/terms/meta/MetaDependencyTest.java +++ b/src/test/java/terms/meta/MetaDependencyTest.java @@ -29,13 +29,13 @@ public class MetaDependencyTest { - Resource a = new Resource("a", Utils.INT, 1); - Resource b = new Resource("b", Utils.INT, 1); - Resource c = new Resource("c", Utils.INT, 1); - Resource d = new Resource("d", Utils.INT, 1); - Resource e = new Resource("e", Utils.INT, 1); - Resource f = new Resource("f", Utils.INT, 1); - Resource g = new Resource("g", Utils.INT, 1); + Resource a = new Resource("a", 1); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 1); + Resource d = new Resource("d", 1); + Resource e = new Resource("e", 1); + Resource f = new Resource("f", 1); + Resource g = new Resource("g", 1); @Test void MatchTest() { @@ -76,9 +76,9 @@ @Test void MetaDependencyMatchingWithoutOrderTest() { - Resource a = new Resource("a", INT, 1); - Resource b = new Resource("b", INT, 1); - Resource c = new Resource("c", INT, 1); + Resource a = new Resource("a", 1); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 1); Dependency dep1 = new Dependency(a, b); DependencyTerm te1 = new DependencyTerm(a, b, c); Dependency dep2 = new Dependency(te1, b); @@ -111,13 +111,13 @@ MetaResource v2 = new MetaResource(new Variable("v2"), new Constant("2")); MetaRDLTerm vd1 = new MetaDependency(v1, v2); - Resource a1 = new Resource("a1", INT, 1); - Resource a2 = new Resource("a2", INT, 2); + Resource a1 = new Resource("a1", 1); + Resource a2 = new Resource("a2", 2); Dependency d1 = new Dependency(a1, a2); //[1 : 2] matches [1 : 2] assertTrue(! vd1.isMatchedBy(d1).isEmpty()); - Resource b1 = new Resource("b1", INT, 1); + Resource b1 = new Resource("b1", 1); Dependency d2 = new Dependency(a1, b1); //[1 : 1] does not match [1 : 2] assertFalse(! vd1.isMatchedBy(d2).isEmpty()); @@ -132,10 +132,10 @@ MetaRDLTerm vd2 = new MetaDependency(v1, v3); MetaRDLTerm vd3 = new MetaDependency(new MetaDependency(v3, v1), v2); - Resource a1 = new Resource("a1", INT, 1); - Resource a2 = new Resource("a2", INT, 2); - Resource b1 = new Resource("b1", INT, 1); - Resource b2 = new Resource("b2", INT, 2); + Resource a1 = new Resource("a1", 1); + Resource a2 = new Resource("a2", 2); + Resource b1 = new Resource("b1", 1); + Resource b2 = new Resource("b2", 2); Dependency d1 = new Dependency(a1, a2); Dependency d2 = new Dependency(a1, b1); Dependency d3 = new Dependency(new Dependency(a1, b1), a2); diff --git a/src/test/java/terms/meta/MetaDependencyVariableTest.java b/src/test/java/terms/meta/MetaDependencyVariableTest.java index 1d47997..d02f737 100644 --- a/src/test/java/terms/meta/MetaDependencyVariableTest.java +++ b/src/test/java/terms/meta/MetaDependencyVariableTest.java @@ -17,9 +17,9 @@ @Test void MetaDependencyVariableMatchingWithoutOrderTest() { - Resource a = new Resource("a", INT, 1); - Resource b = new Resource("b", INT, 1); - Resource c = new Resource("c", INT, 1); + Resource a = new Resource("a", 1); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 1); Dependency dep1 = new Dependency(a, b); DependencyTerm te1 = new DependencyTerm(a, b, c); @@ -34,9 +34,9 @@ @Test void MetaDependencyVariableMatchingWithConstantOrderEQTest() { - Resource a = new Resource("a", INT, 1); - Resource b = new Resource("b", INT, 1); - Resource c = new Resource("c", INT, 2); + Resource a = new Resource("a", 1); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 2); Dependency dep1 = new Dependency(a, b); Dependency dep2 = new Dependency(a, c); @@ -49,10 +49,10 @@ @Test void MetaDependencyVariableMatchingWithConstantOrderLTTest() { - Resource a = new Resource("a", INT, 0); - Resource b = new Resource("b", INT, 1); - Resource c = new Resource("c", INT, 2); - Resource e = new Resource("e", INT, 0); + Resource a = new Resource("a", 0); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 2); + Resource e = new Resource("e", 0); Dependency dep1 = new Dependency(a, b); Dependency dep2 = new Dependency(a, c); Dependency dep3 = new Dependency(a, e); @@ -68,10 +68,10 @@ @Test void MetaDependencyVariableMatchingWithConstantOrderLETest() { - Resource a = new Resource("a", INT, 0); - Resource b = new Resource("b", INT, 1); - Resource c = new Resource("c", INT, 2); - Resource e = new Resource("e", INT, 0); + Resource a = new Resource("a", 0); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 2); + Resource e = new Resource("e", 0); Dependency dep1 = new Dependency(a, b); Dependency dep2 = new Dependency(a, c); Dependency dep3 = new Dependency(a, e); @@ -87,10 +87,10 @@ @Test void MetaDependencyVariableMatchingWithConstantOrderGTTest() { - Resource a = new Resource("a", INT, 0); - Resource b = new Resource("b", INT, 1); - Resource c = new Resource("c", INT, 2); - Resource e = new Resource("e", INT, 0); + Resource a = new Resource("a", 0); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 2); + Resource e = new Resource("e", 0); Dependency dep1 = new Dependency(a, b); Dependency dep2 = new Dependency(a, c); Dependency dep3 = new Dependency(a, e); @@ -106,10 +106,10 @@ @Test void MetaDependencyVariableMatchingWithConstantOrderGETest() { - Resource a = new Resource("a", INT, 0); - Resource b = new Resource("b", INT, 1); - Resource c = new Resource("c", INT, 2); - Resource e = new Resource("e", INT, 0); + Resource a = new Resource("a", 0); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 2); + Resource e = new Resource("e", 0); Dependency dep1 = new Dependency(a, b); Dependency dep2 = new Dependency(a, c); Dependency dep3 = new Dependency(a, e); diff --git a/src/test/java/terms/meta/MetaDynamicTermTest.java b/src/test/java/terms/meta/MetaDynamicTermTest.java index ff9ef31..33be890 100644 --- a/src/test/java/terms/meta/MetaDynamicTermTest.java +++ b/src/test/java/terms/meta/MetaDynamicTermTest.java @@ -17,21 +17,21 @@ public class MetaDynamicTermTest { - Resource a = new Resource("a", Utils.INT, 1); - Resource b = new Resource("b", Utils.INT, 1); - Resource c = new Resource("c", Utils.INT, 1); - Resource d = new Resource("d", Utils.INT, 1); - Resource e = new Resource("e", Utils.INT, 1); - Resource f = new Resource("f", Utils.INT, 1); - Resource g = new Resource("g", Utils.INT, 1); - Resource h = new Resource("h", Utils.INT, 1); - Resource i = new Resource("i", Utils.INT, 3); - Resource j = new Resource("j", Utils.INT, 2); - Resource k = new Resource("k", Utils.INT, 2); - Resource l = new Resource("l", Utils.INT, 1); - Resource m = new Resource("m", Utils.INT, 1); - Resource n = new Resource("n", Utils.INT, 0); - Resource o = new Resource("o", Utils.INT, 0); + Resource a = new Resource("a", 1); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 1); + Resource d = new Resource("d", 1); + Resource e = new Resource("e", 1); + Resource f = new Resource("f", 1); + Resource g = new Resource("g", 1); + Resource h = new Resource("h", 1); + Resource i = new Resource("i", 3); + Resource j = new Resource("j", 2); + Resource k = new Resource("k", 2); + Resource l = new Resource("l", 1); + Resource m = new Resource("m", 1); + Resource n = new Resource("n", 0); + Resource o = new Resource("o", 0); @Test void GenerateTest1() { diff --git a/src/test/java/terms/meta/MetaEvaluatableTermVariableTest.java b/src/test/java/terms/meta/MetaEvaluatableTermVariableTest.java index 9c2e9c5..da519af 100644 --- a/src/test/java/terms/meta/MetaEvaluatableTermVariableTest.java +++ b/src/test/java/terms/meta/MetaEvaluatableTermVariableTest.java @@ -18,9 +18,9 @@ void isMatchedByTest() { MetaEvaluatableTermVariable se = new MetaEvaluatableTermVariable(new Variable("se")); - Resource a = new Resource("a", Utils.INT, 1); - Resource b = new Resource("b", Utils.INT, 1); - Resource c = new Resource("c", Utils.INT, 1); + Resource a = new Resource("a", 1); + Resource b = new Resource("b", 1); + Resource c = new Resource("c", 1); ResourceConstant one = new ResourceConstant("1"); DependencyTerm t1 = new DependencyTerm(a, b, c); diff --git a/src/test/java/terms/meta/MetaResourceVariableTest.java b/src/test/java/terms/meta/MetaResourceVariableTest.java index 5dd30dc..eed180b 100644 --- a/src/test/java/terms/meta/MetaResourceVariableTest.java +++ b/src/test/java/terms/meta/MetaResourceVariableTest.java @@ -19,9 +19,9 @@ @Test void MetaResourceVariableMathcingWithoutOrder() { - Resource a = new Resource("a", INT, 0); - Resource b = new Resource("b", INT, 0); - Resource c = new Resource("c", INT, 0); + Resource a = new Resource("a", 0); + Resource b = new Resource("b", 0); + Resource c = new Resource("c", 0); Dependency dep = new Dependency(a, b); DependencyTerm depTerm = new DependencyTerm(a, b, c); @@ -49,7 +49,7 @@ @Test void MetaResourceVariableMathcingWithConstantOrderEQ() { - Resource a = new Resource("a", INT, 1); + Resource a = new Resource("a", 1); MetaResource x = new MetaResource(new Variable("x"), parse("0")); MetaResource y = new MetaResource(new Variable("y"), parse("1")); //a(1) does not match x(=0) @@ -60,7 +60,7 @@ @Test void MetaResourceVariableMathcingWithConstantOrderLT() { - Resource a = new Resource("a", INT, 1); + Resource a = new Resource("a", 1); MetaResource x = new MetaResource(new Variable("x"), OrderConstraint.LT, parse("0")); MetaResource y = new MetaResource(new Variable("y"), OrderConstraint.LT, parse("1")); MetaResource z = new MetaResource(new Variable("z"), OrderConstraint.LT, parse("2")); @@ -74,7 +74,7 @@ @Test void MetaResourceVariableMathcingWithConstantOrderLE() { - Resource a = new Resource("a", INT, 1); + Resource a = new Resource("a", 1); MetaResource x = new MetaResource(new Variable("x"), OrderConstraint.LE, parse("0")); MetaResource y = new MetaResource(new Variable("y"), OrderConstraint.LE, parse("1")); MetaResource z = new MetaResource(new Variable("z"), OrderConstraint.LE, parse("2")); @@ -88,7 +88,7 @@ @Test void MetaResourceVariableMathcingWithConstantOrderGT() { - Resource a = new Resource("a", INT, 1); + Resource a = new Resource("a", 1); MetaResource x = new MetaResource(new Variable("x"), OrderConstraint.GT, parse("0")); MetaResource y = new MetaResource(new Variable("y"), OrderConstraint.GT, parse("1")); MetaResource z = new MetaResource(new Variable("z"), OrderConstraint.GT, parse("2")); @@ -102,7 +102,7 @@ @Test void MetaResourceVariableMathcingWithConstantOrderGE() { - Resource a = new Resource("a", INT, 1); + Resource a = new Resource("a", 1); MetaResource x = new MetaResource(new Variable("x"), OrderConstraint.GE, parse("0")); MetaResource y = new MetaResource(new Variable("y"), OrderConstraint.GE, parse("1")); MetaResource z = new MetaResource(new Variable("z"), OrderConstraint.GE, parse("2")); @@ -116,7 +116,7 @@ @Test void MetaResourceVariableMathcingWithVariableOrderEq() { - Resource a = new Resource("a", INT, 0); + Resource a = new Resource("a", 0); MetaResource x = new MetaResource(new Variable("x"), parse("x")); //a(0) matches x(=x) @@ -125,7 +125,7 @@ @Test void MetaResourceVariableMathcingWithVariableOrderLT() { - Resource a = new Resource("a", INT, 2); + Resource a = new Resource("a", 2); MetaResource x = new MetaResource(new Variable("x"), OrderConstraint.LT, parse("x")); //a(2) matches x(x) @@ -152,7 +152,7 @@ @Test void MetaResourceVariableMathcingWithVariableOrderGE() { - Resource a = new Resource("a", INT, 2); + Resource a = new Resource("a", 2); MetaResource x = new MetaResource(new Variable("x"), OrderConstraint.GE, parse("x")); //a(2) matches x(