trans/graphhopper-jsprit
1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
Code Issues Releases Wiki Activity

reformat according to .editorconfig

Browse source
This commit is contained in:
oblonski 2015-09-25 09:13:00 +02:00
parent 3696f361d3
commit e5bc5f87cb
41 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
jsprit-core/src/main/java/jsprit/core/algorithm/box/ConcurrentInsertionNoiseMaker.java
View file

@ -32,8 +32,8 @@ class ConcurrentInsertionNoiseMaker implements SoftActivityConstraint, Iteration
this.noiseLevel = noiseLevel;
this.noiseProbability = noiseProbability;
this.maxCosts = maxCosts;
randomArray = new Random[vrp.getNuActivities()+2];
for(int i=0;i<randomArray.length;i++){
randomArray = new Random[vrp.getNuActivities() + 2];
for (int i = 0; i < randomArray.length; i++) {
Random r = new Random();
r.setSeed(random.nextLong());
randomArray[i] = r;

2
jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImpl.java
View file

@ -86,7 +86,7 @@ class JobNeighborhoodsImpl implements JobNeighborhoods {
for (Job j : vrp.getJobs().values()) {
if (i == j) continue;
double distance = jobDistance.getDistance(i, j);
if(distance > maxDistance) maxDistance = distance;
if (distance > maxDistance) maxDistance = distance;
ReferencedJob refNode = new ReferencedJob(j, distance);
treeSet.add(refNode);
nuOfDistancesStored++;

2
jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImplWithCapRestriction.java
View file

@ -92,7 +92,7 @@ class JobNeighborhoodsImplWithCapRestriction implements JobNeighborhoods {
for (Job j : vrp.getJobs().values()) {
if (i == j) continue;
double distance = jobDistance.getDistance(i, j);
if(distance > maxDistance) maxDistance = distance;
if (distance > maxDistance) maxDistance = distance;
ReferencedJob refNode = new ReferencedJob(j, distance);
if (treeSet.size() < capacity) {
treeSet.add(refNode);

4
jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java
View file

@ -97,8 +97,8 @@ public class UpdateVehicleDependentPracticalTimeWindows implements RouteVisitor,
double potentialLatestArrivalTimeAtCurrAct = latestArrTimeAtPrevAct - transportCosts.getBackwardTransportTime(activity.getLocation(), prevLocation,
latestArrTimeAtPrevAct, route.getDriver(), vehicle) - activity.getOperationTime();
double latestArrivalTime = Math.min(activity.getTheoreticalLatestOperationStartTime(), potentialLatestArrivalTimeAtCurrAct);
if(latestArrivalTime < activity.getTheoreticalEarliestOperationStartTime()){
stateManager.putTypedInternalRouteState(route,vehicle,InternalStates.SWITCH_NOT_FEASIBLE,true);
if (latestArrivalTime < activity.getTheoreticalEarliestOperationStartTime()) {
stateManager.putTypedInternalRouteState(route, vehicle, InternalStates.SWITCH_NOT_FEASIBLE, true);
}
stateManager.putInternalTypedActivityState(activity, vehicle, InternalStates.LATEST_OPERATION_START_TIME, latestArrivalTime);
latest_arrTimes_at_prevAct[vehicle.getVehicleTypeIdentifier().getIndex()] = latestArrivalTime;

7
jsprit-core/src/main/java/jsprit/core/problem/constraint/SwitchNotFeasible.java
View file

@ -7,7 +7,7 @@ import jsprit.core.problem.misc.JobInsertionContext;
/**
* Created by schroeder on 19/09/15.
*/
public class SwitchNotFeasible implements HardRouteConstraint{
public class SwitchNotFeasible implements HardRouteConstraint {
private StateManager stateManager;
@ -17,8 +17,9 @@ public class SwitchNotFeasible implements HardRouteConstraint{
@Override
public boolean fulfilled(JobInsertionContext insertionContext) {
Boolean notFeasible = stateManager.getRouteState(insertionContext.getRoute(),insertionContext.getNewVehicle(), InternalStates.SWITCH_NOT_FEASIBLE,Boolean.class);
if(notFeasible == null || insertionContext.getRoute().getVehicle().getVehicleTypeIdentifier().equals(insertionContext.getNewVehicle().getVehicleTypeIdentifier())) return true;
Boolean notFeasible = stateManager.getRouteState(insertionContext.getRoute(), insertionContext.getNewVehicle(), InternalStates.SWITCH_NOT_FEASIBLE, Boolean.class);
if (notFeasible == null || insertionContext.getRoute().getVehicle().getVehicleTypeIdentifier().equals(insertionContext.getNewVehicle().getVehicleTypeIdentifier()))
return true;
else return !notFeasible;
}

2
jsprit-core/src/main/java/jsprit/core/problem/constraint/TimeWindowConstraint.java
View file

@ -107,7 +107,7 @@ class TimeWindowConstraint implements HardActivityConstraint {
routingCosts.getBackwardTransportTime(nextActLocation, newAct.getLocation(), latestArrTimeAtNextAct, iFacts.getNewDriver(),
iFacts.getNewVehicle()) - newAct.getOperationTime());
/*
* |--- prevAct ---|
* |--- prevAct ---|
* |--- vehicle's arrival @newAct
* latest arrival of vehicle @newAct ---|
*/

2
jsprit-core/src/main/java/jsprit/core/util/FastVehicleRoutingTransportCostsMatrix.java
View file

@ -119,7 +119,7 @@ public class FastVehicleRoutingTransportCostsMatrix extends AbstractForwardVehic
*
* @return
*/
public double[][][] getMatrix(){
public double[][][] getMatrix() {
return matrix;
}

14
jsprit-core/src/test/java/jsprit/core/algorithm/MeetTimeWindowConstraint_IT.java
View file

@ -560,7 +560,7 @@ public class MeetTimeWindowConstraint_IT {
VehicleRoutingAlgorithm algorithm = Jsprit.Builder.newInstance(vrp).buildAlgorithm();
algorithm.setMaxIterations(1000);
VehicleRoutingProblemSolution solution = Solutions.bestOf(algorithm.searchSolutions());
for(VehicleRoute r : solution.getRoutes()){
for (VehicleRoute r : solution.getRoutes()) {
assertTrue(r.getVehicle().getEarliestDeparture() <= r.getDepartureTime());
assertTrue(r.getVehicle().getLatestArrival() >= r.getEnd().getArrTime());
}
@ -576,7 +576,7 @@ public class MeetTimeWindowConstraint_IT {
VehicleRoutingAlgorithm algorithm = new SchrimpfFactory().createAlgorithm(vrp);
algorithm.setMaxIterations(1000);
VehicleRoutingProblemSolution solution = Solutions.bestOf(algorithm.searchSolutions());
for(VehicleRoute r : solution.getRoutes()){
for (VehicleRoute r : solution.getRoutes()) {
assertTrue(r.getVehicle().getEarliestDeparture() <= r.getDepartureTime());
assertTrue(r.getVehicle().getLatestArrival() >= r.getEnd().getArrTime());
}
@ -592,20 +592,20 @@ public class MeetTimeWindowConstraint_IT {
VehicleRoutingAlgorithm algorithm = new GreedySchrimpfFactory().createAlgorithm(vrp);
algorithm.setMaxIterations(1000);
VehicleRoutingProblemSolution solution = Solutions.bestOf(algorithm.searchSolutions());
for(VehicleRoute r : solution.getRoutes()){
for (VehicleRoute r : solution.getRoutes()) {
assertTrue(r.getVehicle().getEarliestDeparture() <= r.getDepartureTime());
assertTrue(r.getVehicle().getLatestArrival() >= r.getEnd().getArrTime());
}
}
private FastVehicleRoutingTransportCostsMatrix createMatrix() throws IOException {
BufferedReader reader = new BufferedReader(new FileReader(new File("src/test/resources/matrix.txt")));
String line;
FastVehicleRoutingTransportCostsMatrix.Builder builder = FastVehicleRoutingTransportCostsMatrix.Builder.newInstance(11,false);
while((line = reader.readLine()) != null){
FastVehicleRoutingTransportCostsMatrix.Builder builder = FastVehicleRoutingTransportCostsMatrix.Builder.newInstance(11, false);
while ((line = reader.readLine()) != null) {
String[] split = line.split("\t");
builder.addTransportDistance(Integer.parseInt(split[0]),Integer.parseInt(split[1]),Double.parseDouble(split[2]));
builder.addTransportDistance(Integer.parseInt(split[0]), Integer.parseInt(split[1]), Double.parseDouble(split[2]));
builder.addTransportTime(Integer.parseInt(split[0]), Integer.parseInt(split[1]), Double.parseDouble(split[3]));
}
return builder.build();

2
jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java
View file

@ -167,7 +167,7 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT {
}
String[] lineTokens = line.split(",");
/*
* build service
* build service
*/
Service service = Service.Builder.newInstance(lineTokens[0]).addSizeDimension(0, Integer.parseInt(lineTokens[1]))
.setLocation(Location.newInstance(lineTokens[0])).build();

2
jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java
View file

@ -167,7 +167,7 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndD
}
String[] lineTokens = line.split(",");
/*
* build service
* build service
*/
Service service = Service.Builder.newInstance(lineTokens[0]).addSizeDimension(0, Integer.parseInt(lineTokens[1]))
.setLocation(Location.newInstance(lineTokens[0])).build();

2
jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollection_IT.java
View file

@ -115,7 +115,7 @@ public class RefuseCollection_IT {
vrpBuilder.addVehicle(bigVehicle);
/*
* create cost-matrix
* create cost-matrix
*/
VehicleRoutingTransportCostsMatrix.Builder matrixBuilder = VehicleRoutingTransportCostsMatrix.Builder.newInstance(true);
/*

2
jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java
View file

@ -409,7 +409,7 @@ public class TestLocalActivityInsertionCostsCalculator {
//new: 50 - 50 = 0
/*
activity start time delay at next act = start-time-old - start-time-new is always bigger than subsequent waiting time savings
activity start time delay at next act = start-time-old - start-time-new is always bigger than subsequent waiting time savings
*/
/*
old = 10 + 30 + 10 = 50

2
jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestMixedServiceAndShipmentsProblemOnRouteLevel.java
View file

@ -109,7 +109,7 @@ public class TestMixedServiceAndShipmentsProblemOnRouteLevel {
VehicleType vehicleType = vehicleTypeBuilder.build();
/*
* get a vehicle-builder and build a vehicle located at (10,10) with type "vehicleType"
* get a vehicle-builder and build a vehicle located at (10,10) with type "vehicleType"
*/
Builder vehicleBuilder = VehicleImpl.Builder.newInstance("vehicle");
vehicleBuilder.setStartLocation(Location.newInstance(10, 10));

2
jsprit-examples/src/main/java/jsprit/examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java
View file

@ -87,7 +87,7 @@ public class ConfigureAlgorithmInCodeInsteadOfPerXml {
Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();
/*
* get the best
* get the best
*/
VehicleRoutingProblemSolution bestSolution = Solutions.bestOf(solutions);

2
jsprit-examples/src/main/java/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java
View file

@ -126,7 +126,7 @@ public class EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample {
VehicleRoutingAlgorithm algorithm = VehicleRoutingAlgorithms.readAndCreateAlgorithm(problem, "input/algorithmConfig.xml");
// algorithm.setMaxIterations(30000);
/*
* and search a solution
* and search a solution
*/
Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();

2
jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample.java
View file

@ -91,7 +91,7 @@ public class MultipleDepotExample {
VehicleRoutingProblem vrp = vrpBuilder.build();
/*
* plot to see how the problem looks like
* plot to see how the problem looks like
*/
// SolutionPlotter.plotVrpAsPNG(vrp, "output/problem01.png", "p01");

2
jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample2.java
View file

@ -97,7 +97,7 @@ public class MultipleDepotExample2 {
VehicleRoutingProblem vrp = vrpBuilder.build();
/*
* plot to see how the problem looks like
* plot to see how the problem looks like
*/
// SolutionPlotter.plotVrpAsPNG(vrp, "output/problem08.png", "p08");

2
jsprit-examples/src/main/java/jsprit/examples/MultipleDepotWithInitialRoutesExample.java
View file

@ -62,7 +62,7 @@ public class MultipleDepotWithInitialRoutesExample {
*/
VehicleRoutingProblem vrp = vrpBuilder.build();
/*
* since job (service) 26 and 44 are already planned in initial route and thus static AND sequence is fixed they
* 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)
*/
assert !vrp.getJobs().containsKey("26") : "strange. service 26 should not be part of the problem";

2
jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample.java
View file

@ -72,7 +72,7 @@ public class PickupAndDeliveryExample {
VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "input/algorithmConfig_solomon.xml");
vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png"));
/*
* Solve the problem.
* Solve the problem.
*
*
*/

2
jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample2.java
View file

@ -78,7 +78,7 @@ public class PickupAndDeliveryExample2 {
Collection<VehicleRoutingProblemSolution> solutions = vra.searchSolutions();
/*
* Retrieve best solution.
* Retrieve best solution.
*/
VehicleRoutingProblemSolution solution = new SelectBest().selectSolution(solutions);

2
jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryOpenExample.java
View file

@ -69,7 +69,7 @@ public class PickupAndDeliveryOpenExample {
VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "input/algorithmConfig_open.xml");
vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png"));
/*
* Solve the problem.
* Solve the problem.
*
*
*/

2
jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionExample.java
View file

@ -110,7 +110,7 @@ public class RefuseCollectionExample {
}
String[] lineTokens = line.split(",");
/*
* build service
* build service
*/
Service service = Service.Builder.newInstance(lineTokens[0]).addSizeDimension(0, Integer.parseInt(lineTokens[1])).setLocation(Location.newInstance(lineTokens[0])).build();
/*

2
jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionWithFastMatrixExample.java
View file

@ -109,7 +109,7 @@ public class RefuseCollectionWithFastMatrixExample {
}
String[] lineTokens = line.split(",");
/*
* build service
* build service
*/
Service service = Service.Builder.newInstance(lineTokens[0])
.addSizeDimension(0, Integer.parseInt(lineTokens[1]))

2
jsprit-examples/src/main/java/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java
View file

@ -109,7 +109,7 @@ public class ServicePickupsWithMultipleDepotsExample {
Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();
/*
* get the best
* get the best
*/
VehicleRoutingProblemSolution bestSolution = Solutions.bestOf(solutions);

2
jsprit-examples/src/main/java/jsprit/examples/SimpleDepotBoundedPickupAndDeliveryExample.java
View file

@ -88,7 +88,7 @@ public class SimpleDepotBoundedPickupAndDeliveryExample {
Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();
/*
* get the best
* get the best
*/
VehicleRoutingProblemSolution bestSolution = Solutions.bestOf(solutions);

2
jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryExample.java
View file

@ -93,7 +93,7 @@ public class SimpleEnRoutePickupAndDeliveryExample {
Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();
/*
* get the best
* get the best
*/
VehicleRoutingProblemSolution bestSolution = Solutions.bestOf(solutions);

2
jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java
View file

@ -93,7 +93,7 @@ public class SimpleEnRoutePickupAndDeliveryOpenRoutesExample {
Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();
/*
* get the best
* get the best
*/
VehicleRoutingProblemSolution bestSolution = Solutions.bestOf(solutions);

2
jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample.java
View file

@ -97,7 +97,7 @@ public class SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample {
VehicleRoutingProblem problem = vrpBuilder.build();
/*
* build the algorithm
* build the algorithm
*/
VehicleRoutingAlgorithmBuilder vraBuilder = new VehicleRoutingAlgorithmBuilder(problem, "input/algorithmConfig.xml");
vraBuilder.addCoreConstraints();

2
jsprit-examples/src/main/java/jsprit/examples/SimpleExample.java
View file

@ -93,7 +93,7 @@ public class SimpleExample {
Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();
/*
* get the best
* get the best
*/
VehicleRoutingProblemSolution bestSolution = Solutions.bestOf(solutions);

2
jsprit-examples/src/main/java/jsprit/examples/SimpleExampleOpenRoutes.java
View file

@ -87,7 +87,7 @@ public class SimpleExampleOpenRoutes {
Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();
/*
* get the best
* get the best
*/
VehicleRoutingProblemSolution bestSolution = Solutions.bestOf(solutions);

2
jsprit-examples/src/main/java/jsprit/examples/SimpleExampleWithSkills.java
View file

@ -115,7 +115,7 @@ public class SimpleExampleWithSkills {
Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();
/*
* get the best
* get the best
*/
VehicleRoutingProblemSolution bestSolution = Solutions.bestOf(solutions);

2
jsprit-examples/src/main/java/jsprit/examples/SimpleVRPWithBackhaulsExample.java
View file

@ -103,7 +103,7 @@ public class SimpleVRPWithBackhaulsExample {
SolutionPrinter.print(bestSolution);
/*
* plot
* plot
*/
Plotter plotter = new Plotter(problem, bestSolution);
plotter.setLabel(Label.SIZE);

2
jsprit-examples/src/main/java/jsprit/examples/SolomonExample.java
View file

@ -74,7 +74,7 @@ public class SolomonExample {
Collection<VehicleRoutingProblemSolution> solutions = vra.searchSolutions();
/*
* Retrieve best solution.
* Retrieve best solution.
*/
VehicleRoutingProblemSolution solution = new SelectBest().selectSolution(solutions);

2
jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocations.java
View file

@ -77,7 +77,7 @@ public class SolomonExampleWithSpecifiedVehicleEndLocations {
// vra.setPrematureBreak(100);
vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png"));
/*
* Solve the problem.
* Solve the problem.
*
*
*/

2
jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java
View file

@ -77,7 +77,7 @@ public class SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs {
// vra.setPrematureBreak(100);
// vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png"));
/*
* Solve the problem.
* Solve the problem.
*
*
*/

2
jsprit-examples/src/main/java/jsprit/examples/SolomonOpenExample.java
View file

@ -69,7 +69,7 @@ public class SolomonOpenExample {
// vra.setPrematureBreak(100);
// vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png"));
/*
* Solve the problem.
* Solve the problem.
*
*
*/

2
jsprit-examples/src/main/java/jsprit/examples/SolomonR101Example.java
View file

@ -68,7 +68,7 @@ public class SolomonR101Example {
vra.setMaxIterations(20000);
// vra.setPrematureBreak(100);
vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png"));
/*
/*
* Solve the problem.
*
*

2
jsprit-examples/src/main/java/jsprit/examples/SolomonWithRegretInsertionExample.java
View file

@ -81,7 +81,7 @@ public class SolomonWithRegretInsertionExample {
Collection<VehicleRoutingProblemSolution> solutions = vra.searchSolutions();
/*
* Retrieve best solution.
* Retrieve best solution.
*/
VehicleRoutingProblemSolution solution = new SelectBest().selectSolution(solutions);

2
jsprit-examples/src/main/java/jsprit/examples/TransportOfDisabledPeople.java
View file

@ -186,7 +186,7 @@ public class TransportOfDisabledPeople {
algorithm.setPrematureAlgorithmTermination(new IterationWithoutImprovementTermination(100));
/*
* and search a solution
* and search a solution
*/
Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();

2
jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample.java
View file

@ -77,7 +77,7 @@ public class VRPWithBackhaulsExample {
VehicleRoutingAlgorithm vra = vraBuilder.build();
vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/sol_progress.png"));
/*
* Solve the problem.
* Solve the problem.
*
*
*/

2
jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java
View file

@ -105,7 +105,7 @@ public class VRPWithBackhaulsExample2 {
Collection<VehicleRoutingProblemSolution> solutions = vra.searchSolutions();
/*
* Retrieve best solution.
* Retrieve best solution.
*/
VehicleRoutingProblemSolution solution = new SelectBest().selectSolution(solutions);