fix: use minizinc instead of mzn2fzn

Author: rtaupe

com.siemens.jminizinc.core/src/main/java/at/siemens/ct/jmz/executor/PipedMiniZincExecutor.java

@@ -6,20 +6,23 @@
  */
 package at.siemens.ct.jmz.executor;
 
-import java.io.File;
-import java.io.IOException;
-
 import at.siemens.ct.jmz.files.TemporaryFiles;
 import at.siemens.ct.jmz.writer.IModelWriter;
 
+import java.io.File;
+import java.io.IOException;
+
 /**
  * Executes <i>mzn2fzn</i> and <i>fzn-gecode</i> separately. This has the advantage over {@link MiniZincExecutor} that
  * the executor has control over both processes and can kill them if it is interrupted. Because of this, this
  * implementation should be preferred over {@link MiniZincExecutor} if a clean exit behaviour in case of interrupts is
  * required.
+ *
+ * @deprecated because in the latest releases of MiniZinc IDE, mzn2fzn is not shipped as a separate executable anymore.
  * 
  * @author Copyright Siemens AG, 2016, 2019
  */
+@Deprecated
 public class PipedMiniZincExecutor extends Executor {
 
   private FlatZincSolver solver = FlatZincSolver.GECODE;

com.siemens.jminizinc.core/src/test/java/at/siemens/ct/jmz/NQueensDemo.java

@@ -6,29 +6,11 @@
  */
 package at.siemens.ct.jmz;
 
-import static at.siemens.ct.jmz.expressions.bool.RelationalOperator.NEQ;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
 import at.siemens.ct.jmz.elements.constraints.Constraint;
 import at.siemens.ct.jmz.elements.solving.SolvingStrategy;
 import at.siemens.ct.jmz.executor.Executor;
-import at.siemens.ct.jmz.executor.FlatZincSolver;
 import at.siemens.ct.jmz.executor.MiniZincExecutor;
 import at.siemens.ct.jmz.executor.MiniZincSolver;
-import at.siemens.ct.jmz.executor.PipedMiniZincExecutor;
 import at.siemens.ct.jmz.expressions.array.IntegerArray;
 import at.siemens.ct.jmz.expressions.array.IntegerArrayAccessExpression;
 import at.siemens.ct.jmz.expressions.bool.Forall;
@@ -38,6 +20,17 @@
 import at.siemens.ct.jmz.expressions.integer.ArithmeticOperation;
 import at.siemens.ct.jmz.expressions.set.RangeExpression;
 import at.siemens.ct.jmz.writer.ModelWriter;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.io.IOException;
+import java.util.*;
+
+import static at.siemens.ct.jmz.expressions.bool.RelationalOperator.NEQ;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Contains a full-blown example to solve the n-queens problem with JMiniZinc.
@@ -57,9 +50,6 @@ public static Collection<Object[]> parameters() {
     for (MiniZincSolver solver : MiniZincSolver.values()) {
       executors.add(new MiniZincExecutor(solver.name(), solver));
     }
-    for (FlatZincSolver solver : FlatZincSolver.values()) {
-      executors.add(new PipedMiniZincExecutor(solver.name(), solver));
-    }
     Collection<Integer> ns = Arrays.asList(4, 8, 10);
 
     Collection<Object[]> factories = new ArrayList<>();

com.siemens.jminizinc.core/src/test/java/at/siemens/ct/jmz/executor/TestExecutor.java

@@ -6,13 +6,6 @@
  */
 package at.siemens.ct.jmz.executor;
 
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import at.siemens.ct.jmz.IModelBuilder;
 import at.siemens.ct.jmz.ModelBuilder;
 import at.siemens.ct.jmz.elements.Set;
@@ -22,6 +15,12 @@
 import at.siemens.ct.jmz.expressions.set.RangeExpression;
 import at.siemens.ct.jmz.writer.IModelWriter;
 import at.siemens.ct.jmz.writer.ModelWriter;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Arrays;
 
 /**
  * Tests {@link Executor}
@@ -32,7 +31,7 @@ public class TestExecutor {
 
   private IModelBuilder modelBuilder = new ModelBuilder();
   private IModelWriter modelWriter = new ModelWriter(modelBuilder);
-  private IExecutor executor = new PipedMiniZincExecutor("test");
+  private IExecutor executor = new MiniZincExecutor("test");
 
   @Before
   public void setUp() {

com.siemens.jminizinc.diag/src/main/java/at/siemens/ct/jmz/diag/ConsistencyChecker.java

@@ -6,21 +6,21 @@
  */
 package at.siemens.ct.jmz.diag;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
 import at.siemens.ct.jmz.IModelBuilder;
 import at.siemens.ct.jmz.ModelBuilder;
 import at.siemens.ct.jmz.elements.Element;
 import at.siemens.ct.jmz.elements.constraints.Constraint;
 import at.siemens.ct.jmz.elements.solving.SolvingStrategy;
 import at.siemens.ct.jmz.executor.IExecutor;
-import at.siemens.ct.jmz.executor.PipedMiniZincExecutor;
+import at.siemens.ct.jmz.executor.MiniZincExecutor;
 import at.siemens.ct.jmz.writer.IModelWriter;
 import at.siemens.ct.jmz.writer.ModelWriter;
 
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
 /**
  * @author Copyright Siemens AG, 2016-2019
  */
@@ -36,7 +36,7 @@ private void initialization() {
 		modelBuilder = new ModelBuilder();
 		modelWriter = new ModelWriter(modelBuilder);
 		modelWriter.setSolvingStrategy(SolvingStrategy.SOLVE_SATISFY);
-		executor = new PipedMiniZincExecutor("consistencyChecker");
+		executor = new MiniZincExecutor("consistencyChecker");
 	}
 
   public boolean isConsistent(Collection<? extends Element> fixedElements) throws DiagnosisException {