From 9008bb620b5066ab3042433cdd5ba68e04f7d736 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Thu, 15 Apr 2021 02:29:51 +0200
Subject: [PATCH] Clean java routing sample

---
 ortools/constraint_solver/samples/VrpBreaks.java   | 14 ++++++++------
 ortools/constraint_solver/samples/VrpCapacity.java |  2 ++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ortools/constraint_solver/samples/VrpBreaks.java b/ortools/constraint_solver/samples/VrpBreaks.java
index 9a9e154839..f32275a1f1 100644
--- a/ortools/constraint_solver/samples/VrpBreaks.java
+++ b/ortools/constraint_solver/samples/VrpBreaks.java
@@ -30,8 +30,8 @@ import com.google.ortools.constraintsolver.main;
 import java.util.logging.Logger;
 // [END import]
 
-/// Minimal VRP with breaks.
-public class VrpBreaks {
+/** Minimal VRP with breaks. */
+public final class VrpBreaks {
   private static final Logger logger = Logger.getLogger(VrpBreaks.class.getName());
 
   // [START data_model]
@@ -90,7 +90,7 @@ public class VrpBreaks {
     for (int i = 0; i < intervals.size(); ++i) {
       IntervalVarElement breakInterval = intervals.element(i);
       if (breakInterval.performedValue() == 1) {
-        logger.info(breakInterval.var().name() + " " + breakInterval.toString());
+        logger.info(breakInterval.var().name() + " " + breakInterval);
       } else {
         logger.info(breakInterval.var().name() + ": Unperformed");
       }
@@ -117,7 +117,7 @@ public class VrpBreaks {
   }
   // [END solution_printer]
 
-  public static void main(String[] args) throws Exception {
+  public static void main(String[] args) {
     Loader.loadNativeLibraries();
     // Instantiate the data problem.
     // [START data]
@@ -170,12 +170,12 @@ public class VrpBreaks {
     Solver solver = routing.solver();
     for (int vehicle = 0; vehicle < manager.getNumberOfVehicles(); ++vehicle) {
       IntervalVar[] breakIntervals = new IntervalVar[1];
-      IntervalVar break_interval = solver.makeFixedDurationIntervalVar(50, // start min
+      IntervalVar breakInterval = solver.makeFixedDurationIntervalVar(50, // start min
           60, // start max
           10, // duration: 10min
           false, // optional: no
           "Break for vehicle " + vehicle);
-      breakIntervals[0] = break_interval;
+      breakIntervals[0] = breakInterval;
 
       timeDimension.setBreakIntervalsOfVehicle(breakIntervals, vehicle, serviceTimes);
     }
@@ -203,5 +203,7 @@ public class VrpBreaks {
     }
     // [END print_solution]
   }
+
+  private VrpBreaks() {}
 }
 // [END program]
diff --git a/ortools/constraint_solver/samples/VrpCapacity.java b/ortools/constraint_solver/samples/VrpCapacity.java
index 08a58d5441..afe4e48ba8 100644
--- a/ortools/constraint_solver/samples/VrpCapacity.java
+++ b/ortools/constraint_solver/samples/VrpCapacity.java
@@ -64,6 +64,8 @@ public final class VrpCapacity {
   /// @brief Print the solution.
   static void printSolution(
       DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) {
+    logger.info("Objective: " + solution.objectiveValue());
+
     // Inspect solution.
     long totalDistance = 0;
     long totalLoad = 0;