update java routing samples

google · Jan 29, 2025 · 578961e · 578961e
1 parent 77fd88c
commit 578961e
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 0 deletions.
diff --git a/ortools/constraint_solver/samples/Vrp.java b/ortools/constraint_solver/samples/Vrp.java
@@ -73,6 +73,9 @@ static void printSolution(
     // Inspect solution.
     long totalDistance = 0;
     for (int i = 0; i < manager.getNumberOfVehicles(); ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       logger.info("Route for Vehicle " + i + ":");
       long routeDistance = 0;
       String route = "";

diff --git a/ortools/constraint_solver/samples/VrpBreaks.java b/ortools/constraint_solver/samples/VrpBreaks.java
@@ -100,6 +100,9 @@ static void printSolution(
     long totalTime = 0;
     RoutingDimension timeDimension = routing.getMutableDimension("Time");
     for (int i = 0; i < manager.getNumberOfVehicles(); ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       logger.info("Route for Vehicle " + i + ":");
       long index = routing.start(i);
       String route = "";

diff --git a/ortools/constraint_solver/samples/VrpCapacity.java b/ortools/constraint_solver/samples/VrpCapacity.java
@@ -71,6 +71,9 @@ static void printSolution(
     long totalDistance = 0;
     long totalLoad = 0;
     for (int i = 0; i < data.vehicleNumber; ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       long index = routing.start(i);
       logger.info("Route for Vehicle " + i + ":");
       long routeDistance = 0;

diff --git a/ortools/constraint_solver/samples/VrpDropNodes.java b/ortools/constraint_solver/samples/VrpDropNodes.java
@@ -83,6 +83,9 @@ static void printSolution(
     long totalDistance = 0;
     long totalLoad = 0;
     for (int i = 0; i < data.vehicleNumber; ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       long index = routing.start(i);
       logger.info("Route for Vehicle " + i + ":");
       long routeDistance = 0;

diff --git a/ortools/constraint_solver/samples/VrpGlobalSpan.java b/ortools/constraint_solver/samples/VrpGlobalSpan.java
@@ -65,6 +65,9 @@ static void printSolution(
     // Inspect solution.
     long maxRouteDistance = 0;
     for (int i = 0; i < data.vehicleNumber; ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       long index = routing.start(i);
       logger.info("Route for Vehicle " + i + ":");
       long routeDistance = 0;

diff --git a/ortools/constraint_solver/samples/VrpInitialRoutes.java b/ortools/constraint_solver/samples/VrpInitialRoutes.java
@@ -72,6 +72,9 @@ static void printSolution(
     // Inspect solution.
     long maxRouteDistance = 0;
     for (int i = 0; i < data.vehicleNumber; ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       long index = routing.start(i);
       logger.info("Route for Vehicle " + i + ":");
       long routeDistance = 0;

diff --git a/ortools/constraint_solver/samples/VrpPickupDelivery.java b/ortools/constraint_solver/samples/VrpPickupDelivery.java
@@ -78,6 +78,9 @@ static void printSolution(
     // Inspect solution.
     long totalDistance = 0;
     for (int i = 0; i < data.vehicleNumber; ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       long index = routing.start(i);
       logger.info("Route for Vehicle " + i + ":");
       long routeDistance = 0;

diff --git a/ortools/constraint_solver/samples/VrpPickupDeliveryFifo.java b/ortools/constraint_solver/samples/VrpPickupDeliveryFifo.java
@@ -78,6 +78,9 @@ static void printSolution(
     // Inspect solution.
     long totalDistance = 0;
     for (int i = 0; i < data.vehicleNumber; ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       long index = routing.start(i);
       logger.info("Route for Vehicle " + i + ":");
       long routeDistance = 0;

diff --git a/ortools/constraint_solver/samples/VrpPickupDeliveryLifo.java b/ortools/constraint_solver/samples/VrpPickupDeliveryLifo.java
@@ -78,6 +78,9 @@ static void printSolution(
     // Inspect solution.
     long totalDistance = 0;
     for (int i = 0; i < data.vehicleNumber; ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       long index = routing.start(i);
       logger.info("Route for Vehicle " + i + ":");
       long routeDistance = 0;

diff --git a/ortools/constraint_solver/samples/VrpResources.java b/ortools/constraint_solver/samples/VrpResources.java
@@ -94,6 +94,9 @@ static void printSolution(
     RoutingDimension timeDimension = routing.getMutableDimension("Time");
     long totalTime = 0;
     for (int i = 0; i < data.vehicleNumber; ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       long index = routing.start(i);
       logger.info("Route for Vehicle " + i + ":");
       String route = "";

diff --git a/ortools/constraint_solver/samples/VrpSolutionCallback.java b/ortools/constraint_solver/samples/VrpSolutionCallback.java
@@ -67,6 +67,9 @@ static void printSolution(RoutingIndexManager routingManager, RoutingModel routi
     // Inspect solution.
     long totalDistance = 0;
     for (int i = 0; i < routingManager.getNumberOfVehicles(); ++i) {
+      if (routingModel.activeVehicleVar(i).value() == 0) {
+        continue;
+      }
       logger.info("Route for Vehicle " + i + ":");
       long routeDistance = 0;
       long index = routingModel.start(i);

diff --git a/ortools/constraint_solver/samples/VrpStartsEnds.java b/ortools/constraint_solver/samples/VrpStartsEnds.java
@@ -68,6 +68,9 @@ static void printSolution(
     // Inspect solution.
     long maxRouteDistance = 0;
     for (int i = 0; i < data.vehicleNumber; ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       long index = routing.start(i);
       logger.info("Route for Vehicle " + i + ":");
       long routeDistance = 0;

diff --git a/ortools/constraint_solver/samples/VrpTimeWindows.java b/ortools/constraint_solver/samples/VrpTimeWindows.java
@@ -86,6 +86,9 @@ static void printSolution(
     RoutingDimension timeDimension = routing.getMutableDimension("Time");
     long totalTime = 0;
     for (int i = 0; i < data.vehicleNumber; ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       long index = routing.start(i);
       logger.info("Route for Vehicle " + i + ":");
       String route = "";

diff --git a/ortools/constraint_solver/samples/VrpWithTimeLimit.java b/ortools/constraint_solver/samples/VrpWithTimeLimit.java
@@ -43,6 +43,9 @@ static void printSolution(
     // Inspect solution.
     long maxRouteDistance = 0;
     for (int i = 0; i < manager.getNumberOfVehicles(); ++i) {
+      if (!routing.isVehicleUsed(solution, i)) {
+        continue;
+      }
       long index = routing.start(i);
       logger.info("Route for Vehicle " + i + ":");
       long routeDistance = 0;