decrease non-determinism*

HashSet -> LinkedHashSet
HashMap -> LinkedHashMap

Author: SE-FDr

ocl2smt/src/main/java/de/monticore/ocl2smt/gradle/OCLSemDiffTask.java

@@ -14,7 +14,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 import org.apache.commons.io.FileUtils;
 import org.gradle.api.DefaultTask;
@@ -51,7 +51,7 @@ public abstract class OCLSemDiffTask extends DefaultTask {
   public abstract RegularFileProperty getTraceOD();
 
   protected Set<ASTOCLCompilationUnit> loadOCL(File cdFile, Set<File> oclFiles) throws IOException {
-    Set<ASTOCLCompilationUnit> result = new HashSet<>();
+    Set<ASTOCLCompilationUnit> result = new LinkedHashSet<>();
     for (File f : oclFiles) {
       result.add(OCL_Loader.loadAndCheckOCL(f, cdFile));
     }
@@ -78,14 +78,14 @@ public void run() throws IOException {
     ASTODArtifact trace;
     // Compute Diff
     if (negativeOCL.isEmpty()) {
-      witnesses = new HashSet<>();
+      witnesses = new LinkedHashSet<>();
       witnesses.add(
-          OCLDiffGenerator.oclWitness(cd, positiveOCL, new HashSet<>(), new HashSet<>(), false));
+          OCLDiffGenerator.oclWitness(cd, positiveOCL, new LinkedHashSet<>(), new LinkedHashSet<>(), false));
     } else {
 
       diff =
           OCLDiffGenerator.oclDiff(
-              cd, positiveOCL, negativeOCL, new HashSet<>(), new HashSet<>(), false);
+              cd, positiveOCL, negativeOCL, new LinkedHashSet<>(), new LinkedHashSet<>(), false);
       witnesses = diff.getDiffWitness();
       if (getTraceOD().isPresent()) {
         trace = diff.getUnSatCore();

ocl2smt/src/main/java/de/monticore/ocl2smt/helpers/IOHelper.java

@@ -20,13 +20,13 @@
 import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 import org.apache.commons.io.FileUtils;
 
 public class IOHelper {
   public static Set<ASTOCLCompilationUnit> parseOCl(File cdFile, Set<File> oclFiles) {
-    Set<ASTOCLCompilationUnit> res = new HashSet<>();
+    Set<ASTOCLCompilationUnit> res = new LinkedHashSet<>();
     for (File oclFile : oclFiles) {
 
       try {

ocl2smt/src/main/java/de/monticore/ocl2smt/ocl2smt/oclExpr2smt/OCLExprConverter.java

@@ -36,7 +36,7 @@ public class OCLExprConverter<EXPR extends ExprAdapter<?>> {
   public OCLExprConverter(CDExprFactory<EXPR> eFactory, TypeFactory typeFactory) {
     this.tFactory = typeFactory;
     this.eFactory = eFactory;
-    varNames = new HashMap<>();
+    varNames = new LinkedHashMap<>();
   }
 
   public EXPR convertExpr(ASTExpression node) {
@@ -335,7 +335,7 @@ private Set<String> openSetCompScope(ASTSetComprehension node) {
       mkConst(gen.getName(), type);
     }
 
-    Set<String> setCompScopeVar = new HashSet<>(varCollector.getAllVariableNames());
+    Set<String> setCompScopeVar = new LinkedHashSet<>(varCollector.getAllVariableNames());
     setCompScopeVar.addAll(generatorCollector.getAllVariableNames());
 
     return setCompScopeVar;

ocl2smt/src/main/java/de/monticore/ocl2smt/ocldiff/OCLDiffGenerator.java

@@ -504,7 +504,7 @@ public static OCLOPDiffResult oclOPDiffV1(
 
   private static Set<IdentifiableBoolExpr> od2constraints(
       Set<ASTODArtifact> ods, ASTCDCompilationUnit cd, Context ctx) {
-    Set<IdentifiableBoolExpr> constraint = new HashSet<>();
+    Set<IdentifiableBoolExpr> constraint = new LinkedHashSet<>();
     for (ASTODArtifact od : ods) {
       OD2SMTGenerator od2SMTGenerator = new OD2SMTGenerator();
       od2SMTGenerator.od2smt(od, cd, ctx);
@@ -522,7 +522,7 @@ private static Set<IdentifiableBoolExpr> negativeOd2smt(
 
   private static Set<IdentifiableBoolExpr> negativOd2smt(
       Set<ASTODArtifact> ods, ASTCDCompilationUnit cd, Context ctx) {
-    Set<IdentifiableBoolExpr> res = new HashSet<>();
+    Set<IdentifiableBoolExpr> res = new LinkedHashSet<>();
     for (ASTODArtifact od : ods) {
       OD2SMTGenerator od2SMTGenerator = new OD2SMTGenerator();
       od2SMTGenerator.od2smt(od, cd, ctx);
@@ -558,7 +558,7 @@ private static Set<IdentifiableBoolExpr> od2Constraints(
   }
 
   private static Context buildContext() {
-    Map<String, String> cfg = new HashMap<>();
+    Map<String, String> cfg = new LinkedHashMap<>();
     cfg.put("model", "true");
     return new Context(cfg);
   }

ocl2smt/src/main/java/de/monticore/ocl2smt/ocldiff/invariantDiff/OCLInvDiffStrategy.java

@@ -75,13 +75,13 @@ default OCLInvDiffResult oclDiff(
     List<ASTOCLInvariant> invariantList = OCLHelper.collectInv(oldOcl);
 
     // compute diff witness for each invariant
-    Set<OCLInvDiffResult> diffs = new HashSet<>();
+    Set<OCLInvDiffResult> diffs = new LinkedHashSet<>();
     invariantList.forEach(
         inv -> diffs.add(oclInvDiff(cd, newOcl, inv, addConstr, ctx, timeout, partial)));
 
     // merge different diff
     List<ASTODLink> traces = new ArrayList<>();
-    Set<ASTODArtifact> witnesses = new HashSet<>();
+    Set<ASTODArtifact> witnesses = new LinkedHashSet<>();
     ASTODArtifact unSatCore = null;
 
     for (OCLInvDiffResult diff : diffs) {
@@ -155,7 +155,7 @@ default OCLInvDiffResult computeDiff(
       int timeout,
       boolean partial) {
 
-    Set<ASTODArtifact> satOdList = new HashSet<>();
+    Set<ASTODArtifact> satOdList = new LinkedHashSet<>();
     List<ASTODLink> traceUnSat = new ArrayList<>();
 
     // add one by one all Constraints to the Solver and check if it can always produce a Model
@@ -175,7 +175,7 @@ default OCLInvDiffResult computeDiff(
         assert witness.isPresent();
         satOdList.add(witness.get());
       } else if (status == Status.UNKNOWN) {
-        return new OCLInvDiffResult(null, new HashSet<>());
+        return new OCLInvDiffResult(null, new LinkedHashSet<>());
       } else {
         OD4ReportMill.init();
         Log.info("[UNSAT]The invariant is refined by the new model", this.getClass().getName());

ocl2smt/src/main/java/de/monticore/ocl2smt/ocldiff/invariantDiff/OCLInvariantDiff.java

@@ -18,7 +18,7 @@
 import de.monticore.odbasis._ast.ASTODArtifact;
 import de.se_rwth.commons.logging.Log;
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -67,7 +67,7 @@ public OCLInvDiffResult oclInvDiff(
       return computeDiff(ocl2SMTGenerator, newConstraints, negConstraints, timeout, partial);
     }
 
-    return new OCLInvDiffResult(null, new HashSet<>());
+    return new OCLInvDiffResult(null, new LinkedHashSet<>());
   }
 
   public OCLInvDiffResult CDOCLDiff(
@@ -105,7 +105,7 @@ public OCLInvDiffResult CDOCLDiff(
             1,
             CDSemantics.SIMPLE_CLOSED_WORLD);
     if (!res.isEmpty()) {
-      return new OCLInvDiffResult(null, new HashSet<>(res));
+      return new OCLInvDiffResult(null, new LinkedHashSet<>(res));
     }
 
     // build positive constraint List

ocl2smt/src/main/java/de/monticore/ocl2smt/ocldiff/operationDiff/OCLOperationDiff.java

@@ -38,7 +38,7 @@ public Set<OCLOPWitness> oclWitness(
     ctx = buildContext();
     OCLHelper.buildPreCD(ast);
     FullOCL2SMTGenerator fullOCL2SMTGenerator = new FullOCL2SMTGenerator(ast, ctx);
-    Set<OCLOPWitness> res = new HashSet<>();
+    Set<OCLOPWitness> res = new LinkedHashSet<>();
 
     for (ASTOCLMethodSignature method : getMethodList(ocl)) {
       res.addAll(oclWitnessHelper(ocl, fullOCL2SMTGenerator, method, partial));
@@ -64,7 +64,7 @@ private Set<OCLOPWitness> oclWitnessHelper(
     // add invariants
     solverConstraints.addAll(invConstraints);
 
-    Set<OCLOPWitness> res = new HashSet<>();
+    Set<OCLOPWitness> res = new LinkedHashSet<>();
     Solver solver;
 
     for (OPConstraint constraint : opConstraints) {
@@ -110,7 +110,7 @@ public OCLOPDiffResult oclDiffHelper(
 
     // setup
     ctx = buildContext();
-    Set<OCLOPWitness> opDiffWitness = new HashSet<>();
+    Set<OCLOPWitness> opDiffWitness = new LinkedHashSet<>();
     List<ASTODLink> trace = new ArrayList<>();
     OCLHelper.buildPreCD(ast);
     FullOCL2SMTGenerator fullOcl2smt = new FullOCL2SMTGenerator(ast, ctx);
@@ -186,7 +186,7 @@ private List<ASTOCLOperationConstraint> getOperationsConstraints(
   private Map<ASTOCLMethodSignature, List<ASTOCLOperationConstraint>> sortOPConstraint(
       Set<ASTOCLCompilationUnit> oclSet) {
 
-    Map<ASTOCLMethodSignature, List<ASTOCLOperationConstraint>> res = new HashMap<>();
+    Map<ASTOCLMethodSignature, List<ASTOCLOperationConstraint>> res = new LinkedHashMap<>();
     for (ASTOCLOperationConstraint opConstraint : getOperationsConstraints(oclSet)) {
 
       ASTOCLOperationSignature opSignature = opConstraint.getOCLOperationSignature();
@@ -270,7 +270,7 @@ public String buildInvName(IdentifiableBoolExpr constr) {
   }
 
   public Context buildContext() {
-    Map<String, String> cfg = new HashMap<>();
+    Map<String, String> cfg = new LinkedHashMap<>();
     cfg.put("model", "true");
     return new Context(cfg);
   }

ocl2smt/src/main/java/de/monticore/ocl2smt/visitors/SetGeneratorCollector.java

@@ -2,12 +2,12 @@
 
 import de.monticore.ocl.setexpressions._ast.ASTGeneratorDeclaration;
 import de.monticore.ocl.setexpressions._visitor.SetExpressionsVisitor2;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 public class SetGeneratorCollector implements SetExpressionsVisitor2 {
-  Set<ASTGeneratorDeclaration> variableSet = new HashSet<>();
+  Set<ASTGeneratorDeclaration> variableSet = new LinkedHashSet<>();
 
   public void visit(ASTGeneratorDeclaration node) {
     variableSet.add(node);

ocl2smt/src/main/java/de/monticore/ocl2smt/visitors/SetVariableCollector.java

@@ -2,12 +2,12 @@
 
 import de.monticore.ocl.setexpressions._ast.ASTSetVariableDeclaration;
 import de.monticore.ocl.setexpressions._visitor.SetExpressionsVisitor2;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 public class SetVariableCollector implements SetExpressionsVisitor2 {
-  Set<ASTSetVariableDeclaration> variableSet = new HashSet<>();
+  Set<ASTSetVariableDeclaration> variableSet = new LinkedHashSet<>();
 
   @Override
   public void visit(ASTSetVariableDeclaration node) {

ocl2smt/src/main/java/de/monticore/od2smt/OD2SMTGenerator.java

@@ -42,9 +42,9 @@ public class OD2SMTGenerator implements IOD2SMTGenerator {
   protected Context ctx;
   protected OCLExprConverter<Z3ExprAdapter> exprConv;
 
-  protected Map<ASTODObject, Expr<?>> objectsMap = new HashMap<>();
-  protected Map<ASTODObject, Set<IdentifiableBoolExpr>> objectConstraint = new HashMap<>();
-  protected Map<ASTODLink, IdentifiableBoolExpr> linksConstraints = new HashMap<>();
+  protected Map<ASTODObject, Expr<?>> objectsMap = new LinkedHashMap<>();
+  protected Map<ASTODObject, Set<IdentifiableBoolExpr>> objectConstraint = new LinkedHashMap<>();
+  protected Map<ASTODLink, IdentifiableBoolExpr> linksConstraints = new LinkedHashMap<>();
 
   public void od2smt(ASTODArtifact od, ASTCDCompilationUnit cd, Context ctx) {
     if (!match(od, cd)) {
@@ -103,7 +103,7 @@ public void closeCtx() {
   }
 
   private void convert(ASTODObject node) {
-    Set<IdentifiableBoolExpr> objectConstr = new HashSet<>();
+    Set<IdentifiableBoolExpr> objectConstr = new LinkedHashSet<>();
     String objectName = "object_" + count_object;
     count_object++;