From 502d529fa30cfa1e3c3ff4e53714843e1000ee8b Mon Sep 17 00:00:00 2001
From: furnon <vfurnon@google.com>
Date: Fri, 6 Jan 2017 13:26:08 +0000
Subject: [PATCH] Updating Java examples to use new routing APIs

---
 ...apacitatedVehicleRoutingProblemWithTimeWindows.java |  2 +-
 .../com/google/ortools/samples/SimpleRoutingTest.java  | 10 ++++++++--
 examples/com/google/ortools/samples/Tsp.java           |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/examples/com/google/ortools/samples/CapacitatedVehicleRoutingProblemWithTimeWindows.java b/examples/com/google/ortools/samples/CapacitatedVehicleRoutingProblemWithTimeWindows.java
index dcaee886ac..0f393dbef8 100644
--- a/examples/com/google/ortools/samples/CapacitatedVehicleRoutingProblemWithTimeWindows.java
+++ b/examples/com/google/ortools/samples/CapacitatedVehicleRoutingProblemWithTimeWindows.java
@@ -216,7 +216,7 @@ public class CapacitatedVehicleRoutingProblemWithTimeWindows {
             }
           }
         };
-      model.setVehicleCost(vehicle, manhattanCostCallback);
+      model.setArcCostEvaluatorOfVehicle(manhattanCostCallback, vehicle);
       model.cumulVar(model.end(vehicle), "time").setMax(vehicleEndTime.get(vehicle));
     }
 
diff --git a/examples/com/google/ortools/samples/SimpleRoutingTest.java b/examples/com/google/ortools/samples/SimpleRoutingTest.java
index 592825df96..c56d682029 100644
--- a/examples/com/google/ortools/samples/SimpleRoutingTest.java
+++ b/examples/com/google/ortools/samples/SimpleRoutingTest.java
@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import com.google.ortools.constraintsolver.Assignment;
 import com.google.ortools.constraintsolver.NodeEvaluator2;
 import com.google.ortools.constraintsolver.RoutingModel;
+import com.google.ortools.constraintsolver.FirstSolutionStrategy;
+import com.google.ortools.constraintsolver.RoutingSearchParameters;
 
 public class SimpleRoutingTest {
 
@@ -45,9 +47,13 @@ public class SimpleRoutingTest {
   //Solve Method
   public void solve() {
     RoutingModel routing = new RoutingModel(costMatrix.length, 1, 0);
-    routing.setFirstSolutionStrategy(RoutingModel.ROUTING_PATH_CHEAPEST_ARC);
+    RoutingSearchParameters parameters =
+        RoutingSearchParameters.newBuilder()
+            .mergeFrom(RoutingModel.defaultSearchParameters())
+            .setFirstSolutionStrategy(FirstSolutionStrategy.Value.PATH_CHEAPEST_ARC)
+            .build();
     NodeDistance distances = new NodeDistance(costMatrix);
-    routing.setCost(distances);
+    routing.setArcCostEvaluatorOfAllVehicles(distances);
 
     Assignment solution = routing.solve();
     if (solution != null) {
diff --git a/examples/com/google/ortools/samples/Tsp.java b/examples/com/google/ortools/samples/Tsp.java
index 1af02027dd..2bff603485 100644
--- a/examples/com/google/ortools/samples/Tsp.java
+++ b/examples/com/google/ortools/samples/Tsp.java
@@ -69,7 +69,7 @@ class Tsp {
     // has the following signature: ResultCallback2<int64, int64, int64>.
     // The two arguments are the from and to node inidices.
     RandomManhattan distances = new RandomManhattan(size, seed);
-    routing.setCost(distances);
+    routing.setArcCostEvaluatorOfAllVehicles(distances);
 
     // Forbid node connections (randomly).
     Random randomizer = new Random();