From eee7be20ae8a503d5143596d0f2cccd307a559ff Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Thu, 15 Apr 2021 14:34:08 +0200 Subject: [PATCH] routing: Add objective to java sample --- ortools/constraint_solver/samples/VrpCapacity.java | 2 +- ortools/constraint_solver/samples/VrpDropNodes.java | 3 +++ ortools/constraint_solver/samples/VrpGlobalSpan.java | 2 ++ ortools/constraint_solver/samples/VrpInitialRoutes.java | 2 ++ ortools/constraint_solver/samples/VrpPickupDelivery.java | 3 +++ ortools/constraint_solver/samples/VrpPickupDeliveryFifo.java | 3 +++ ortools/constraint_solver/samples/VrpPickupDeliveryLifo.java | 3 +++ ortools/constraint_solver/samples/VrpResources.java | 3 +++ ortools/constraint_solver/samples/VrpStartsEnds.java | 2 ++ ortools/constraint_solver/samples/VrpTimeWindows.java | 3 +++ ortools/constraint_solver/samples/VrpWithTimeLimit.java | 2 ++ 11 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ortools/constraint_solver/samples/VrpCapacity.java b/ortools/constraint_solver/samples/VrpCapacity.java index afe4e48ba8..4169e14ef1 100644 --- a/ortools/constraint_solver/samples/VrpCapacity.java +++ b/ortools/constraint_solver/samples/VrpCapacity.java @@ -64,8 +64,8 @@ public final class VrpCapacity { /// @brief Print the solution. static void printSolution( DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) { + // Solution cost. logger.info("Objective: " + solution.objectiveValue()); - // Inspect solution. long totalDistance = 0; long totalLoad = 0; diff --git a/ortools/constraint_solver/samples/VrpDropNodes.java b/ortools/constraint_solver/samples/VrpDropNodes.java index 9f17a8f158..c0467d0e55 100644 --- a/ortools/constraint_solver/samples/VrpDropNodes.java +++ b/ortools/constraint_solver/samples/VrpDropNodes.java @@ -64,6 +64,9 @@ public class VrpDropNodes { /// @brief Print the solution. static void printSolution( DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) { + // Solution cost. + logger.info("Objective: " + solution.objectiveValue()); + // Inspect solution. // Display dropped nodes. String droppedNodes = "Dropped nodes:"; for (int node = 0; node < routing.size(); ++node) { diff --git a/ortools/constraint_solver/samples/VrpGlobalSpan.java b/ortools/constraint_solver/samples/VrpGlobalSpan.java index 6c3be85825..f3d5046946 100644 --- a/ortools/constraint_solver/samples/VrpGlobalSpan.java +++ b/ortools/constraint_solver/samples/VrpGlobalSpan.java @@ -59,6 +59,8 @@ public class VrpGlobalSpan { /// @brief Print the solution. static void printSolution( DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) { + // Solution cost. + logger.info("Objective : " + solution.objectiveValue()); // Inspect solution. long maxRouteDistance = 0; for (int i = 0; i < data.vehicleNumber; ++i) { diff --git a/ortools/constraint_solver/samples/VrpInitialRoutes.java b/ortools/constraint_solver/samples/VrpInitialRoutes.java index f76a156eca..d3cee481f9 100644 --- a/ortools/constraint_solver/samples/VrpInitialRoutes.java +++ b/ortools/constraint_solver/samples/VrpInitialRoutes.java @@ -66,6 +66,8 @@ public class VrpInitialRoutes { /// @brief Print the solution. static void printSolution( DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) { + // Solution cost. + logger.info("Objective : " + solution.objectiveValue()); // Inspect solution. long maxRouteDistance = 0; for (int i = 0; i < data.vehicleNumber; ++i) { diff --git a/ortools/constraint_solver/samples/VrpPickupDelivery.java b/ortools/constraint_solver/samples/VrpPickupDelivery.java index 25cb99c336..658ca9838e 100644 --- a/ortools/constraint_solver/samples/VrpPickupDelivery.java +++ b/ortools/constraint_solver/samples/VrpPickupDelivery.java @@ -72,6 +72,9 @@ public class VrpPickupDelivery { /// @brief Print the solution. static void printSolution( DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) { + // Solution cost. + logger.info("Objective : " + solution.objectiveValue()); + // Inspect solution. long totalDistance = 0; for (int i = 0; i < data.vehicleNumber; ++i) { long index = routing.start(i); diff --git a/ortools/constraint_solver/samples/VrpPickupDeliveryFifo.java b/ortools/constraint_solver/samples/VrpPickupDeliveryFifo.java index 1519dfb0fc..4ea1918d9c 100644 --- a/ortools/constraint_solver/samples/VrpPickupDeliveryFifo.java +++ b/ortools/constraint_solver/samples/VrpPickupDeliveryFifo.java @@ -72,6 +72,9 @@ public class VrpPickupDeliveryFifo { /// @brief Print the solution. static void printSolution( DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) { + // Solution cost. + logger.info("Objective : " + solution.objectiveValue()); + // Inspect solution. long totalDistance = 0; for (int i = 0; i < data.vehicleNumber; ++i) { long index = routing.start(i); diff --git a/ortools/constraint_solver/samples/VrpPickupDeliveryLifo.java b/ortools/constraint_solver/samples/VrpPickupDeliveryLifo.java index 4796db131b..24b8e41ede 100644 --- a/ortools/constraint_solver/samples/VrpPickupDeliveryLifo.java +++ b/ortools/constraint_solver/samples/VrpPickupDeliveryLifo.java @@ -72,6 +72,9 @@ public class VrpPickupDeliveryLifo { /// @brief Print the solution. static void printSolution( DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) { + // Solution cost. + logger.info("Objective : " + solution.objectiveValue()); + // Inspect solution. long totalDistance = 0; for (int i = 0; i < data.vehicleNumber; ++i) { long index = routing.start(i); diff --git a/ortools/constraint_solver/samples/VrpResources.java b/ortools/constraint_solver/samples/VrpResources.java index cd825df0da..1968c32e1d 100644 --- a/ortools/constraint_solver/samples/VrpResources.java +++ b/ortools/constraint_solver/samples/VrpResources.java @@ -87,6 +87,9 @@ public class VrpResources { /// @brief Print the solution. static void printSolution( DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) { + // Solution cost. + logger.info("Objective : " + solution.objectiveValue()); + // Inspect solution. RoutingDimension timeDimension = routing.getMutableDimension("Time"); long totalTime = 0; for (int i = 0; i < data.vehicleNumber; ++i) { diff --git a/ortools/constraint_solver/samples/VrpStartsEnds.java b/ortools/constraint_solver/samples/VrpStartsEnds.java index ad7cbf908c..b95b62edaa 100644 --- a/ortools/constraint_solver/samples/VrpStartsEnds.java +++ b/ortools/constraint_solver/samples/VrpStartsEnds.java @@ -62,6 +62,8 @@ public class VrpStartsEnds { /// @brief Print the solution. static void printSolution( DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) { + // Solution cost. + logger.info("Objective : " + solution.objectiveValue()); // Inspect solution. long maxRouteDistance = 0; for (int i = 0; i < data.vehicleNumber; ++i) { diff --git a/ortools/constraint_solver/samples/VrpTimeWindows.java b/ortools/constraint_solver/samples/VrpTimeWindows.java index f1df352eda..99ad98cd3c 100644 --- a/ortools/constraint_solver/samples/VrpTimeWindows.java +++ b/ortools/constraint_solver/samples/VrpTimeWindows.java @@ -79,6 +79,9 @@ public class VrpTimeWindows { /// @brief Print the solution. static void printSolution( DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) { + // Solution cost. + logger.info("Objective : " + solution.objectiveValue()); + // Inspect solution. RoutingDimension timeDimension = routing.getMutableDimension("Time"); long totalTime = 0; for (int i = 0; i < data.vehicleNumber; ++i) { diff --git a/ortools/constraint_solver/samples/VrpWithTimeLimit.java b/ortools/constraint_solver/samples/VrpWithTimeLimit.java index c09d0472c4..c39fa0a770 100644 --- a/ortools/constraint_solver/samples/VrpWithTimeLimit.java +++ b/ortools/constraint_solver/samples/VrpWithTimeLimit.java @@ -37,6 +37,8 @@ public final class VrpWithTimeLimit { /// @brief Print the solution. static void printSolution( RoutingIndexManager manager, RoutingModel routing, Assignment solution) { + // Solution cost. + logger.info("Objective : " + solution.objectiveValue()); // Inspect solution. long maxRouteDistance = 0; for (int i = 0; i < manager.getNumberOfVehicles(); ++i) {