From 01bf0d55afa97b5d91f532ead82f69acc5c114cc Mon Sep 17 00:00:00 2001 From: oblonski Date: Thu, 17 Sep 2015 08:38:52 +0200 Subject: [PATCH] reformat according to .editorconfig --- .../jsprit/core/problem/constraint/TimeWindowConstraint.java | 2 +- .../constraint/VehicleDependentTimeWindowConstraints.java | 2 +- .../src/main/java/jsprit/core/problem/job/Service.java | 2 +- ...eCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java | 2 +- ...rThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java | 2 +- .../test/java/jsprit/core/algorithm/RefuseCollection_IT.java | 2 +- .../recreate/TestLocalActivityInsertionCostsCalculator.java | 2 +- .../TestMixedServiceAndShipmentsProblemOnRouteLevel.java | 2 +- .../examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java | 2 +- .../src/main/java/jsprit/examples/CostMatrixExample.java | 2 +- ...kupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java | 2 +- .../src/main/java/jsprit/examples/MultipleDepotExample.java | 2 +- .../src/main/java/jsprit/examples/MultipleDepotExample2.java | 2 +- .../examples/MultipleDepotWithInitialRoutesExample.java | 2 +- .../main/java/jsprit/examples/PickupAndDeliveryExample.java | 2 +- .../main/java/jsprit/examples/PickupAndDeliveryExample2.java | 2 +- .../java/jsprit/examples/PickupAndDeliveryOpenExample.java | 2 +- .../main/java/jsprit/examples/RefuseCollectionExample.java | 2 +- .../examples/RefuseCollectionWithFastMatrixExample.java | 2 +- .../examples/ServicePickupsWithMultipleDepotsExample.java | 2 +- .../examples/SimpleDepotBoundedPickupAndDeliveryExample.java | 5 +++-- .../examples/SimpleEnRoutePickupAndDeliveryExample.java | 2 +- .../SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java | 2 +- ...tePickupAndDeliveryWithDepotBoundedDeliveriesExample.java | 2 +- .../src/main/java/jsprit/examples/SimpleExample.java | 2 +- .../main/java/jsprit/examples/SimpleExampleOpenRoutes.java | 2 +- .../main/java/jsprit/examples/SimpleExampleWithSkills.java | 2 +- .../java/jsprit/examples/SimpleVRPWithBackhaulsExample.java | 2 +- .../src/main/java/jsprit/examples/SolomonExample.java | 2 +- .../SolomonExampleWithSpecifiedVehicleEndLocations.java | 2 +- ...monExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java | 2 +- .../src/main/java/jsprit/examples/SolomonOpenExample.java | 2 +- .../src/main/java/jsprit/examples/SolomonR101Example.java | 2 +- .../jsprit/examples/SolomonWithRegretInsertionExample.java | 2 +- .../main/java/jsprit/examples/TransportOfDisabledPeople.java | 2 +- .../main/java/jsprit/examples/VRPWithBackhaulsExample.java | 2 +- .../main/java/jsprit/examples/VRPWithBackhaulsExample2.java | 2 +- 37 files changed, 39 insertions(+), 38 deletions(-) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/TimeWindowConstraint.java b/jsprit-core/src/main/java/jsprit/core/problem/constraint/TimeWindowConstraint.java index cde9ba77..b708dcf5 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/TimeWindowConstraint.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/constraint/TimeWindowConstraint.java @@ -106,7 +106,7 @@ class TimeWindowConstraint implements HardActivityConstraint { double latestArrTimeAtNewAct = Math.min(newAct.getTheoreticalLatestOperationStartTime(), latestArrTimeAtNextAct - routingCosts.getBackwardTransportTime(nextActLocation, newAct.getLocation(), latestArrTimeAtNextAct, iFacts.getNewDriver(), iFacts.getNewVehicle()) - newAct.getOperationTime()); - /* + /* * |--- prevAct ---| * |--- vehicle's arrival @newAct * latest arrival of vehicle @newAct ---| diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java b/jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java index 6276266f..168288cf 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java @@ -135,7 +135,7 @@ public class VehicleDependentTimeWindowConstraints implements HardActivityConstr double arrTimeAtNextAct = endTimeAtNewAct + routingCosts.getTransportTime(newAct.getLocation(), nextActLocation, endTimeAtNewAct, iFacts.getNewDriver(), iFacts.getNewVehicle()); /* - * |--- newAct ---| + * |--- newAct ---| * |--- vehicle's arrival @nextAct * latest arrival of vehicle @nextAct ---| */ diff --git a/jsprit-core/src/main/java/jsprit/core/problem/job/Service.java b/jsprit-core/src/main/java/jsprit/core/problem/job/Service.java index c8721eb1..c7971e6e 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/job/Service.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/job/Service.java @@ -41,7 +41,7 @@ public class Service extends AbstractJob { * * @author schroeder */ - public static class Builder { + public static class Builder { /** diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java b/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java index 25e66d6c..f275e5c5 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java +++ b/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java @@ -163,7 +163,7 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT { continue; } String[] lineTokens = line.split(","); - /* + /* * build service */ Service service = Service.Builder.newInstance(lineTokens[0]).addSizeDimension(0, Integer.parseInt(lineTokens[1])) diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java b/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java index 1cb6e3c0..2da06504 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java +++ b/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java @@ -163,7 +163,7 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndD continue; } String[] lineTokens = line.split(","); - /* + /* * build service */ Service service = Service.Builder.newInstance(lineTokens[0]).addSizeDimension(0, Integer.parseInt(lineTokens[1])) diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollection_IT.java b/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollection_IT.java index b03222b5..348aadd2 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollection_IT.java +++ b/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollection_IT.java @@ -104,7 +104,7 @@ public class RefuseCollection_IT { VehicleImpl bigVehicle = vehicleBuilder.build(); /* - * start building the problem + * start building the problem */ VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); vrpBuilder.setFleetSize(FleetSize.INFINITE); diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java index d152dba6..2ce126d9 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java +++ b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java @@ -371,7 +371,7 @@ public class TestLocalActivityInsertionCostsCalculator { //ref: 10 + 50 + 20 = 80 //new: 80 - 10 - 30 - 20 = 20 /* - w(new) + w(next) - w_old(next) - min{start_delay(next),future_waiting} + w(new) + w(next) - w_old(next) - min{start_delay(next),future_waiting} */ } diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestMixedServiceAndShipmentsProblemOnRouteLevel.java b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestMixedServiceAndShipmentsProblemOnRouteLevel.java index aac5e2d0..f8be1d75 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestMixedServiceAndShipmentsProblemOnRouteLevel.java +++ b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestMixedServiceAndShipmentsProblemOnRouteLevel.java @@ -104,7 +104,7 @@ public class TestMixedServiceAndShipmentsProblemOnRouteLevel { @Test public void whenHavingOnlyServicesInOneProblem_andInsertionShouldBeMadeOnRouteLevel_itShouldAssertTrue() { /* get a vehicle type-builder and build a type with the typeId "vehicleType" and a capacity of 2 - */ + */ VehicleTypeImpl.Builder vehicleTypeBuilder = VehicleTypeImpl.Builder.newInstance("vehicleType").addCapacityDimension(0, 2); VehicleType vehicleType = vehicleTypeBuilder.build(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java b/jsprit-examples/src/main/java/jsprit/examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java index e79a6ab7..4b53bbff 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java +++ b/jsprit-examples/src/main/java/jsprit/examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java @@ -82,7 +82,7 @@ public class ConfigureAlgorithmInCodeInsteadOfPerXml { VehicleRoutingAlgorithm algorithm = VehicleRoutingAlgorithms.createAlgorithm(problem, algorithmConfig); /* - * and search a solution + * and search a solution */ Collection solutions = algorithm.searchSolutions(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/CostMatrixExample.java b/jsprit-examples/src/main/java/jsprit/examples/CostMatrixExample.java index 7157037c..4f9d06ab 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/CostMatrixExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/CostMatrixExample.java @@ -59,7 +59,7 @@ public class CostMatrixExample { /* - * Assume the following symmetric distance-matrix + * Assume the following symmetric distance-matrix * from,to,distance * 0,1,10.0 * 0,2,20.0 diff --git a/jsprit-examples/src/main/java/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java b/jsprit-examples/src/main/java/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java index 8231a520..8df37967 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java @@ -125,7 +125,7 @@ public class EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample { */ VehicleRoutingAlgorithm algorithm = VehicleRoutingAlgorithms.readAndCreateAlgorithm(problem, "input/algorithmConfig.xml"); // algorithm.setMaxIterations(30000); - /* + /* * and search a solution */ Collection solutions = algorithm.searchSolutions(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample.java b/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample.java index 496e4956..689a8241 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample.java @@ -86,7 +86,7 @@ public class MultipleDepotExample { vrpBuilder.setFleetSize(FleetSize.FINITE); /* - * build the problem + * build the problem */ VehicleRoutingProblem vrp = vrpBuilder.build(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample2.java b/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample2.java index f187aacc..34110427 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample2.java +++ b/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample2.java @@ -92,7 +92,7 @@ public class MultipleDepotExample2 { vrpBuilder.setFleetSize(FleetSize.FINITE); /* - * build the problem + * build the problem */ VehicleRoutingProblem vrp = vrpBuilder.build(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotWithInitialRoutesExample.java b/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotWithInitialRoutesExample.java index fa4515d4..3c98c7c3 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotWithInitialRoutesExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotWithInitialRoutesExample.java @@ -61,7 +61,7 @@ public class MultipleDepotWithInitialRoutesExample { * build the problem */ VehicleRoutingProblem vrp = vrpBuilder.build(); - /* + /* * since job (service) 26 and 44 are already planned in initial route and thus static AND sequence is fixed they * should not be in jobMap anymore (only variable jobs are in jobMap) */ diff --git a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample.java b/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample.java index 5fcc8b12..21cb5d4c 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample.java @@ -71,7 +71,7 @@ public class PickupAndDeliveryExample { // VehicleRoutingAlgorithm vra = new SchrimpfFactory().createAlgorithm(vrp); VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "input/algorithmConfig_solomon.xml"); vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png")); - /* + /* * Solve the problem. * * diff --git a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample2.java b/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample2.java index ea28e1c6..149bef37 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample2.java +++ b/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample2.java @@ -71,7 +71,7 @@ public class PickupAndDeliveryExample2 { VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "input/algorithmConfig_solomon.xml"); vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png")); /* - * Solve the problem. + * Solve the problem. * * */ diff --git a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryOpenExample.java b/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryOpenExample.java index ad38d845..402e01fd 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryOpenExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryOpenExample.java @@ -68,7 +68,7 @@ public class PickupAndDeliveryOpenExample { // VehicleRoutingAlgorithm vra = new SchrimpfFactory().createAlgorithm(vrp); VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "input/algorithmConfig_open.xml"); vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png")); - /* + /* * Solve the problem. * * diff --git a/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionExample.java b/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionExample.java index e9e285b7..5a0f09db 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionExample.java @@ -109,7 +109,7 @@ public class RefuseCollectionExample { continue; } String[] lineTokens = line.split(","); - /* + /* * build service */ Service service = Service.Builder.newInstance(lineTokens[0]).addSizeDimension(0, Integer.parseInt(lineTokens[1])).setLocation(Location.newInstance(lineTokens[0])).build(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionWithFastMatrixExample.java b/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionWithFastMatrixExample.java index 9d0fd406..7790f7e0 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionWithFastMatrixExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionWithFastMatrixExample.java @@ -108,7 +108,7 @@ public class RefuseCollectionWithFastMatrixExample { continue; } String[] lineTokens = line.split(","); - /* + /* * build service */ Service service = Service.Builder.newInstance(lineTokens[0]) diff --git a/jsprit-examples/src/main/java/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java b/jsprit-examples/src/main/java/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java index 7948e284..152af745 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java @@ -104,7 +104,7 @@ public class ServicePickupsWithMultipleDepotsExample { algorithm.setMaxIterations(10); /* - * and search a solution + * and search a solution */ Collection solutions = algorithm.searchSolutions(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleDepotBoundedPickupAndDeliveryExample.java b/jsprit-examples/src/main/java/jsprit/examples/SimpleDepotBoundedPickupAndDeliveryExample.java index cdd33c51..48088b25 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleDepotBoundedPickupAndDeliveryExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SimpleDepotBoundedPickupAndDeliveryExample.java @@ -62,11 +62,12 @@ public class SimpleDepotBoundedPickupAndDeliveryExample { /* * build pickups and deliveries at the required locations, each with a capacity-demand of 1. */ + Pickup pickup1 = Pickup.Builder.newInstance("1").addSizeDimension(0, 1).setLocation(Location.newInstance(5, 7)).build(); Delivery delivery1 = Delivery.Builder.newInstance("2").addSizeDimension(0, 1).setLocation(Location.newInstance(5, 13)).build(); Pickup pickup2 = Pickup.Builder.newInstance("3").addSizeDimension(0, 1).setLocation(Location.newInstance(15, 7)).build(); - Delivery delivery2 = Delivery.Builder.newInstance("4").addSizeDimension(0, 1).setLocation(Location.newInstance(15, 13)).build(); + Delivery delivery2 = Delivery.Builder.newInstance("4").addSizeDimension(0, 1).setLocation(Location.newInstance(15, 13)).build(); VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); @@ -82,7 +83,7 @@ public class SimpleDepotBoundedPickupAndDeliveryExample { VehicleRoutingAlgorithm algorithm = new SchrimpfFactory().createAlgorithm(problem); /* - * and search a solution + * and search a solution */ Collection solutions = algorithm.searchSolutions(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryExample.java b/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryExample.java index 776d0b82..42ac6980 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryExample.java @@ -88,7 +88,7 @@ public class SimpleEnRoutePickupAndDeliveryExample { VehicleRoutingAlgorithm algorithm = new SchrimpfFactory().createAlgorithm(problem); /* - * and search a solution + * and search a solution */ Collection solutions = algorithm.searchSolutions(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java b/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java index f0fa5023..0c36ea70 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java @@ -88,7 +88,7 @@ public class SimpleEnRoutePickupAndDeliveryOpenRoutesExample { VehicleRoutingAlgorithm algorithm = new SchrimpfFactory().createAlgorithm(problem); /* - * and search a solution + * and search a solution */ Collection solutions = algorithm.searchSolutions(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample.java b/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample.java index f8b8ca5e..5b3245b7 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample.java @@ -78,7 +78,7 @@ public class SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample { Shipment shipment4 = Shipment.Builder.newInstance("4").addSizeDimension(0, 1).setPickupLocation(loc(Coordinate.newInstance(15, 13))).setDeliveryLocation(loc(Coordinate.newInstance(14, 11))).build(); // /* - * build deliveries, (implicitly picked up in the depot) + * build deliveries, (implicitly picked up in the depot) * 1: (4,8) * 2: (4,12) * 3: (16,8) diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleExample.java b/jsprit-examples/src/main/java/jsprit/examples/SimpleExample.java index 0a9e23aa..754f32b4 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SimpleExample.java @@ -88,7 +88,7 @@ public class SimpleExample { VehicleRoutingAlgorithm algorithm = new SchrimpfFactory().createAlgorithm(problem); /* - * and search a solution + * and search a solution */ Collection solutions = algorithm.searchSolutions(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleOpenRoutes.java b/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleOpenRoutes.java index 598f8a53..f1e5bdb0 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleOpenRoutes.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleOpenRoutes.java @@ -82,7 +82,7 @@ public class SimpleExampleOpenRoutes { VehicleRoutingAlgorithm algorithm = VehicleRoutingAlgorithms.readAndCreateAlgorithm(problem, "input/algorithmConfig_fix.xml"); /* - * and search a solution + * and search a solution */ Collection solutions = algorithm.searchSolutions(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleWithSkills.java b/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleWithSkills.java index a78843c7..860c7206 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleWithSkills.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleWithSkills.java @@ -110,7 +110,7 @@ public class SimpleExampleWithSkills { VehicleRoutingAlgorithm algorithm = vraBuilder.build(); /* - * and search a solution + * and search a solution */ Collection solutions = algorithm.searchSolutions(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleVRPWithBackhaulsExample.java b/jsprit-examples/src/main/java/jsprit/examples/SimpleVRPWithBackhaulsExample.java index d8f1cdd4..48677180 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleVRPWithBackhaulsExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SimpleVRPWithBackhaulsExample.java @@ -94,7 +94,7 @@ public class SimpleVRPWithBackhaulsExample { Collection solutions = algorithm.searchSolutions(); /* - * get the best + * get the best */ VehicleRoutingProblemSolution bestSolution = Solutions.bestOf(solutions); diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonExample.java b/jsprit-examples/src/main/java/jsprit/examples/SolomonExample.java index 96c26072..5c996c42 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SolomonExample.java @@ -67,7 +67,7 @@ public class SolomonExample { VehicleRoutingAlgorithm vra = new SchrimpfFactory().createAlgorithm(vrp); /* - * Solve the problem. + * Solve the problem. * * */ diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocations.java b/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocations.java index 074a6e15..d71b2c5a 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocations.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocations.java @@ -76,7 +76,7 @@ public class SolomonExampleWithSpecifiedVehicleEndLocations { vra.setMaxIterations(20000); // vra.setPrematureBreak(100); vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png")); - /* + /* * Solve the problem. * * diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java b/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java index 81e6689d..423dcbe3 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java @@ -76,7 +76,7 @@ public class SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs { vra.setMaxIterations(20000); // vra.setPrematureBreak(100); // vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png")); - /* + /* * Solve the problem. * * diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonOpenExample.java b/jsprit-examples/src/main/java/jsprit/examples/SolomonOpenExample.java index 9922b12d..dcb2579d 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonOpenExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SolomonOpenExample.java @@ -68,7 +68,7 @@ public class SolomonOpenExample { VehicleRoutingAlgorithm vra = Jsprit.createAlgorithm(vrp); // vra.setPrematureBreak(100); // vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png")); - /* + /* * Solve the problem. * * diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonR101Example.java b/jsprit-examples/src/main/java/jsprit/examples/SolomonR101Example.java index 46d4812e..da14cc52 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonR101Example.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SolomonR101Example.java @@ -59,7 +59,7 @@ public class SolomonR101Example { // new Plotter(vrp).plot("output/solomon_R101.png", "R101"); /* - * Define the required vehicle-routing algorithms to solve the above problem. + * Define the required vehicle-routing algorithms to solve the above problem. * * The algorithm can be defined and configured in an xml-file. */ diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonWithRegretInsertionExample.java b/jsprit-examples/src/main/java/jsprit/examples/SolomonWithRegretInsertionExample.java index 0f327f55..e938130f 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonWithRegretInsertionExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/SolomonWithRegretInsertionExample.java @@ -74,7 +74,7 @@ public class SolomonWithRegretInsertionExample { vra.addListener(eventsRecorder); /* - * Solve the problem. + * Solve the problem. * * */ diff --git a/jsprit-examples/src/main/java/jsprit/examples/TransportOfDisabledPeople.java b/jsprit-examples/src/main/java/jsprit/examples/TransportOfDisabledPeople.java index c6243830..70d563af 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/TransportOfDisabledPeople.java +++ b/jsprit-examples/src/main/java/jsprit/examples/TransportOfDisabledPeople.java @@ -169,7 +169,7 @@ public class TransportOfDisabledPeople { constraintManager.addConstraint(wheelchair_bus_passenger_pickup_constraint); /* - * get a sample algorithm. + * get a sample algorithm. * * Note that you need to make sure to prohibit vehicle-switching by adding the insertion-tag false. * This way you make sure that no vehicle can take over a route that is employed by another. Allowing this might make sense when dealing with diff --git a/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample.java b/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample.java index 787b5cf7..762b101b 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample.java @@ -76,7 +76,7 @@ public class VRPWithBackhaulsExample { vraBuilder.setStateAndConstraintManager(stateManager, constraintManager); VehicleRoutingAlgorithm vra = vraBuilder.build(); vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png")); - /* + /* * Solve the problem. * * diff --git a/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java b/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java index d28ce727..d7df50a5 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java +++ b/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java @@ -98,7 +98,7 @@ public class VRPWithBackhaulsExample2 { /* - * Solve the problem. + * Solve the problem. * * */