token + sol from one run to the other

achabrier · achabrier · commit 454d31820801 · 2020-08-26T16:37:00.000+02:00
token are taken only once per cplex
solution from one run usedin next one
diff --git a/src/MixBlend.java b/src/MixBlend.java
@@ -119,6 +119,9 @@ public static void main( String[] args ) {
             System.out.println("Elements:");
             for(int j = 0; j < _nbElements; j++)
                System.out.println("(" + j + ") " + eVals[j]);
+
+            // Solve again to check the previous solution is taken into account
+            cplex.solve();
          }
       }
       catch (IloException exc) {
diff --git a/src/Transport.java b/src/Transport.java
@@ -0,0 +1,100 @@
+/* --------------------------------------------------------------------------
+ * File: Transport.java
+ * Version 12.10.0  
+ * --------------------------------------------------------------------------
+ * Licensed Materials - Property of IBM
+ * 5725-A06 5725-A29 5724-Y48 5724-Y49 5724-Y54 5724-Y55 5655-Y21
+ * Copyright IBM Corporation 2001, 2019. All Rights Reserved.
+ *
+ * US Government Users Restricted Rights - Use, duplication or
+ * disclosure restricted by GSA ADP Schedule Contract with
+ * IBM Corp.
+ * --------------------------------------------------------------------------
+ */
+
+import com.ibm.wmlconnector.WMLConnector;
+import ilog.cplex.*;
+import ilog.concert.*;
+
+public class Transport {
+   public static void main(String[] args) {
+     if ( args.length < 1 ) {
+         System.err.println("Usage: java Transport <type>");
+         System.err.println("  type = 0 -> convex  piecewise linear model");
+         System.err.println("  type = 1 -> concave piecewise linear model");
+         //System.exit(-1);
+        args = new String[1];
+        args[0] = "0";
+
+     }
+
+     //try (IloCplex cplex = new IloCplex()) {
+      try (IloCplex cplex = new CplexWithWML(new MyProdBetaV4Credentials(), WMLConnector.ModelType.CPLEX_12_10, WMLConnector.TShirtSize.M)) {
+        final int nbDemand = 4;
+        final int nbSupply = 3;
+        double[] supply = {1000.0, 850.0, 1250.0};
+        double[] demand = {900.0, 1200.0, 600.0, 400.0};
+      
+        IloNumVar[][] x = new IloNumVar[nbSupply][];
+        IloNumVar[][] y = new IloNumVar[nbSupply][];
+      
+        for (int i = 0; i < nbSupply; i++) {
+           x[i] = cplex.numVarArray(nbDemand, 0., Double.MAX_VALUE);
+           y[i] = cplex.numVarArray(nbDemand, 0., Double.MAX_VALUE);
+        } 
+      
+        for (int i = 0; i < nbSupply; i++)       // supply must meet demand
+           cplex.addEq(cplex.sum(x[i]), supply[i]);
+      
+        for (int j = 0; j < nbDemand; j++) {     // demand must meet supply
+           IloLinearNumExpr v = cplex.linearNumExpr(); 
+           for(int i = 0; i < nbSupply; i++)
+              v.addTerm(1., x[i][j]);
+           cplex.addEq(v, demand[j]);
+        }      
+      
+        double[] points;
+        double[] slopes;
+        if ( args[0].charAt(0) == '0' ) {         // convex case
+           points = new double[] {200.0, 400.0};
+           slopes = new double[] { 30.0, 80.0, 130.0};
+        }
+        else {                                  // concave case
+           points = new double[] {200.0, 400.0};
+           slopes = new double[] {120.0, 80.0, 50.0};
+        }
+        for (int i = 0; i < nbSupply; ++i) {
+           for (int j = 0; j < nbDemand; ++j) {
+              cplex.addEq(y[i][j],
+                          cplex.piecewiseLinear(x[i][j],
+                                                points, slopes, 0.0, 0.0));
+           }
+        }
+      
+        IloLinearNumExpr expr = cplex.linearNumExpr();
+        for (int i = 0; i < nbSupply; ++i) {
+           for (int j = 0; j < nbDemand; ++j) {
+              expr.addTerm(y[i][j], 1.);   
+           }
+        }
+        
+        cplex.addMinimize(expr);
+      
+        if ( cplex.solve() ) {
+           System.out.println("Solution status: " + cplex.getStatus());
+           System.out.println(" - Solution: "); 
+           for (int i = 0; i < nbSupply; ++i) {
+              System.out.print("   " + i + ": ");
+              for (int j = 0; j < nbDemand; ++j)
+                 System.out.print("" + cplex.getValue(x[i][j]) + "\t");
+              System.out.println();
+           }
+           System.out.println("   Cost = " + cplex.getObjValue()); 
+        }
+     }
+     catch (IloException exc) {
+        System.out.println(exc);
+         System.exit(-1);
+     }
+   }
+}
diff --git a/src/com/ibm/wmlconnector/WMLConnector.java b/src/com/ibm/wmlconnector/WMLConnector.java
@@ -80,6 +80,7 @@ public String toString(){
     public String getModelHref(String modelId, boolean displayModel);
     public String deployModel(String deployName, String model_id, TShirtSize size, int nodes);
 
+    public JSONObject createDataFromString(String id, String text);
     public JSONArray createDataFromJSONPayload(String fileName);
     public JSONObject createDataFromCSV(String id, String fileName);
     public JSONObject createDataFromFile(String id, String fileName);
diff --git a/src/com/ibm/wmlconnector/impl/WMLConnectorImpl.java b/src/com/ibm/wmlconnector/impl/WMLConnectorImpl.java
@@ -308,6 +308,25 @@ public JSONObject createDataFromCSV(String id, String fileName) {
         return data;
     }
 
+    @Override
+    public JSONObject createDataFromString(String id, String text) {
+        byte[] bytes = text.getBytes();
+        byte[] encoded = Base64.getEncoder().encode(bytes);
+
+        JSONObject data = new JSONObject();
+        data.put("id", id);
+
+        JSONArray fields = new JSONArray();
+        fields.put("___TEXT___");
+        data.put("fields", fields);
+
+        JSONArray values = new JSONArray();
+        values.put(new JSONArray().put(new String(encoded)));
+        data.put("values", values);
+
+        return data;
+    }
+
     @Override
     public JSONObject createDataFromFile(String id, String fileName) {
 
diff --git a/src/ilog/cplex/CplexWithWML.java b/src/ilog/cplex/CplexWithWML.java
@@ -36,9 +36,12 @@ public class CplexWithWML extends ExternalCplex {
     private static final long serialVersionUID = 1;
 
     protected Credentials wml_credentials;
+    protected WMLConnectorImpl wml;
     protected WMLConnector.ModelType wml_type;
     protected WMLConnector.TShirtSize wml_size;
+    protected int wml_nodes = 1;
     protected String wml_name;
+    protected String deployment_id = null;
     public CplexWithWML(Credentials credentials) throws IloException {
         this(NamingStrategy.MAKE_NAMES, credentials, WMLConnector.ModelType.CPLEX_12_10, WMLConnector.TShirtSize.S, "CPLEXWithWML");
     }
@@ -51,6 +54,7 @@ public CplexWithWML(Credentials credentials, WMLConnector.ModelType type,  WMLCo
     public CplexWithWML(NamingStrategy namingStrategy, Credentials credentials, WMLConnector.ModelType type,  WMLConnector.TShirtSize size, String name) throws IloException {
         super(namingStrategy);
         wml_credentials = credentials;
+        wml = new WMLConnectorImpl(wml_credentials);
         this.wml_type = type;
         this.wml_size = size;
         wml_name = name;
@@ -69,25 +73,26 @@ protected Solution externalSolve(Set<String> knownVariables, Set<String> knownCo
             final File parameters = File.createTempFile("cpx", ".prm");
             writeParam(parameters.getAbsolutePath());
             LOGGER.fine("Exported .prm file to " + parameters.getAbsolutePath());
+            boolean hasStartSolution = false;
             try {
 
-                int nodes = 1;
-                WMLConnectorImpl wml = new WMLConnectorImpl(wml_credentials);
-
-                String deployment_id = wml.getDeploymentIdByName(wml_name);
+                if (deployment_id == null)
+                    deployment_id = wml.getDeploymentIdByName(wml_name);
                 if (deployment_id == null) {
                     LOGGER.info("Creating model and deployment");
                     LOGGER.fine("Create Empty " + wml_type + " Model");
                     String model_id = wml.createNewModel(wml_name, wml_type, null);
                     LOGGER.fine("model_id = " + model_id);
 
-                    deployment_id = wml.deployModel(wml_name, model_id, wml_size, nodes);
+                    deployment_id = wml.deployModel(wml_name, model_id, wml_size, wml_nodes);
                 }
                 LOGGER.fine("deployment_id = " + deployment_id);
 
                 JSONArray input_data = new JSONArray();
                 input_data.put(wml.createDataFromFile(wml_name+".sav.gz", model.getAbsolutePath()));
                 input_data.put(wml.createDataFromFile(wml_name+".prm", parameters.getAbsolutePath()));
+                if (isMIP() && result != null && result.hasSolution()) // TODO only for MIP ?
+                    input_data.put(wml.createDataFromString(wml_name+".sol", result.getSolution()));
                 WMLJob job = wml.createAndRunJob(deployment_id, input_data, null, null, null);
 
                 switch (job.getSolveStatus()) {
diff --git a/src/ilog/cplex/ExternalCplex.java b/src/ilog/cplex/ExternalCplex.java
@@ -13,10 +13,8 @@
 // This class is in package ilog.cplex so that we can call some undocumented functions
 package ilog.cplex;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -40,6 +38,7 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
+import sun.misc.IOUtils;
 
 /** Base class for external solves.
  * @author daniel.junglas@de.ibm.com
@@ -143,6 +142,9 @@ private void addExpr(HashMap<String,IloNumVar> name2var, HashMap<IloNumVar,Strin
    *
    */
   protected static class Solution {
+
+    private String solution = null;
+
     boolean feasible = false;
     /** Map variable names to values. */
     public HashMap<String,Double> name2val = new HashMap<String,Double>();
@@ -160,7 +162,7 @@ protected static class Solution {
     public boolean pfeas = false;
     /** Dual feasible? */
     public boolean dfeas = false;
-    
+
     public Solution() {}
     public Solution(File solutionXml, Set<String> knownVariables, Set<String> knownConstraints) throws IOException {
       this();
@@ -170,8 +172,17 @@ public Solution(InputStream solutionXml, Set<String> knownVariables, Set<String>
       this();
       parse(solutionXml, knownVariables, knownConstraints);
     }
-    
+
+    public boolean hasSolution() {
+      return solution != null;
+    }
+
+    public String getSolution() {
+      return solution;
+    }
+
     public void reset() {
+      solution = null;
       feasible = false;
       name2val = new HashMap<String, Double>();
       var2val = new HashMap<IloNumVar, Double>();
@@ -189,6 +200,16 @@ public void parse(File solutionXml, Set<String> knownVariables, Set<String> know
       try (FileInputStream fis = new FileInputStream(solutionXml)) {
         parse(fis, knownVariables, knownConstraints);
       }
+      try (FileInputStream fis = new FileInputStream(solutionXml)) {
+        ByteArrayOutputStream result = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int length;
+        while ((length = fis.read(buffer)) != -1) {
+          result.write(buffer, 0, length);
+        }
+        // StandardCharsets.UTF_8.name() > JDK 7
+        solution = result.toString("UTF-8");
+      }
     }
     
     private enum ParserState {
@@ -220,8 +241,9 @@ private static String[] getAttributes(XMLStreamReader reader, String... attrs) {
      * @param knownVariables The names of the variables for which values should be extracted from <code>solutionXml</code>.
      * @throws IOException If an input/output error occurs or mandatory solution information is missing.
      */
-    public void parse(InputStream solutionXml, Set<String> knownVariables, Set<String> knownConstraints) throws IOException {
+    private void parse(InputStream solutionXml, Set<String> knownVariables, Set<String> knownConstraints) throws IOException {
       reset();
+
       boolean ok = false;
       try {
         final String MALFORMED_XML = "Malformed XML";
@@ -438,11 +460,10 @@ public void parse2(InputStream solutionXml, Set<String> knownVariables) throws I
     }
   }
 
-  private Solution result = null;
+  protected Solution result = null;
 
   public boolean solve() throws IloException {
-    result = null;
-    
+
     HashMap<IloNumVar,String> oldVarNames = null;
     if (namingStrategy == NamingStrategy.MAKE_NAMES)
       oldVarNames = new HashMap<IloNumVar, String>();

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,9 @@ public static void main( String[] args ) {`
`119`	`119`	`System.out.println("Elements:");`
`120`	`120`	`for(int j = 0; j < _nbElements; j++)`
`121`	`121`	`System.out.println("(" + j + ") " + eVals[j]);`
	`122`	`+`
	`123`	`+ // Solve again to check the previous solution is taken into account`
	`124`	`+ cplex.solve();`
`122`	`125`	`}`
`123`	`126`	`}`
`124`	`127`	`catch (IloException exc) {`