refactor: replaced MultiOr with Or, also returning the actual list instead of the copy in And and OrConstraint

Julia Pham · Julia Pham · commit c6cdc8e2c612 · 2025-12-11T15:39:18.000+01:00
diff --git a/src/main/java/de/vill/conversion/ConvertGroupCardinality.java b/src/main/java/de/vill/conversion/ConvertGroupCardinality.java
@@ -81,9 +81,9 @@ private Constraint createConjunction(Set<Feature> selectedFeatures, Set<Feature>
     }
 
     private Constraint createDisjunction(Set<Constraint> constraints) {
-        MultiOrConstraint orConstraint = new MultiOrConstraint();
+        OrConstraint orConstraint = new OrConstraint();
         for (Constraint constraint : constraints) {
-            orConstraint.add_sub_part(constraint);
+            orConstraint.addChild(constraint);
         }
         return orConstraint;
     }
diff --git a/src/main/java/de/vill/conversion/ConvertSMTLevel.java b/src/main/java/de/vill/conversion/ConvertSMTLevel.java
@@ -136,9 +136,9 @@ private Constraint createConjunction(Set<Feature> selectedFeatures, Set<Feature>
     }
 
     private Constraint createDisjunction(Set<Constraint> constraints) {
-        MultiOrConstraint orConstraint = new MultiOrConstraint();
+        OrConstraint orConstraint = new OrConstraint();
         for (Constraint constraint : constraints) {
-            orConstraint.add_sub_part(constraint);
+            orConstraint.addChild(constraint);
         }
         return orConstraint;
     }
diff --git a/src/main/java/de/vill/model/building/AutomaticBrackets.java b/src/main/java/de/vill/model/building/AutomaticBrackets.java
@@ -40,7 +40,6 @@ private AutomaticBrackets() {}
         constraintprecedenceLookup.put(EquivalenceConstraint.class, IFF_PRECEDENCE);
         constraintprecedenceLookup.put(ImplicationConstraint.class, IMPLY_PRECEDENCE);
         constraintprecedenceLookup.put(OrConstraint.class, OR_PRECEDENCE);
-        constraintprecedenceLookup.put(MultiOrConstraint.class, OR_PRECEDENCE);
         constraintprecedenceLookup.put(AndConstraint.class, AND_PRECEDENCE);
         constraintprecedenceLookup.put(GreaterEquationConstraint.class, GEQ_LEQ_PRECEDENCE);
         constraintprecedenceLookup.put(LowerEquationConstraint.class, GEQ_LEQ_PRECEDENCE);
diff --git a/src/main/java/de/vill/model/constraint/AndConstraint.java b/src/main/java/de/vill/model/constraint/AndConstraint.java
@@ -76,7 +76,7 @@ public String toString(boolean withSubmodels, String currentAlias) {
 
     @Override
     public List<Constraint> getConstraintSubParts() {
-        return new ArrayList<>(children);
+        return children;
     }
 
     @Override
diff --git a/src/main/java/de/vill/model/constraint/OrConstraint.java b/src/main/java/de/vill/model/constraint/OrConstraint.java
@@ -75,7 +75,7 @@ public String toString(boolean withSubmodels, String currentAlias) {
 
     @Override
     public List<Constraint> getConstraintSubParts() {
-        return new ArrayList<>(children);
+        return children;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,9 @@ private Constraint createConjunction(Set<Feature> selectedFeatures, Set<Feature>`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`private Constraint createDisjunction(Set<Constraint> constraints) {`
`84`		`- MultiOrConstraint orConstraint = new MultiOrConstraint();`
	`84`	`+ OrConstraint orConstraint = new OrConstraint();`
`85`	`85`	`for (Constraint constraint : constraints) {`
`86`		`- orConstraint.add_sub_part(constraint);`
	`86`	`+ orConstraint.addChild(constraint);`
`87`	`87`	`}`
`88`	`88`	`return orConstraint;`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,9 @@ private Constraint createConjunction(Set<Feature> selectedFeatures, Set<Feature>`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`private Constraint createDisjunction(Set<Constraint> constraints) {`
`139`		`- MultiOrConstraint orConstraint = new MultiOrConstraint();`
	`139`	`+ OrConstraint orConstraint = new OrConstraint();`
`140`	`140`	`for (Constraint constraint : constraints) {`
`141`		`- orConstraint.add_sub_part(constraint);`
	`141`	`+ orConstraint.addChild(constraint);`
`142`	`142`	`}`
`143`	`143`	`return orConstraint;`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public String toString(boolean withSubmodels, String currentAlias) {`
`76`	`76`
`77`	`77`	`@Override`
`78`	`78`	`public List<Constraint> getConstraintSubParts() {`
`79`		`- return new ArrayList<>(children);`
	`79`	`+ return children;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public String toString(boolean withSubmodels, String currentAlias) {`
`75`	`75`
`76`	`76`	`@Override`
`77`	`77`	`public List<Constraint> getConstraintSubParts() {`
`78`		`- return new ArrayList<>(children);`
	`78`	`+ return children;`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@Override`