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

Add additional cost to insertion cost (#65)

Browse source 
* add_additional_cost_to_insertion_cost

* fix

* test fix

* remove set additional cost
This commit is contained in:
kandelirina 2018-09-03 10:35:27 +03:00 • committed by GitHub
parent 34cc4ef3bb
commit dfd84ee5db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java
View file

@ -113,6 +113,7 @@ final class VehicleTypeDependentJobInsertionCalculator implements JobInsertionCo
}
for (Vehicle v : relevantVehicles) {
double depTime;
if (v == selectedVehicle) depTime = currentRoute.getDepartureTime();
else depTime = v.getEarliestDeparture();
InsertionData iData = insertionCalculator.getInsertionData(currentRoute, jobToInsert, v, depTime, selectedDriver, bestKnownCost_);
@ -124,9 +125,10 @@ final class VehicleTypeDependentJobInsertionCalculator implements JobInsertionCo
double additionalFixedCost = v.getType().getVehicleCostParams().fix - currentVehicleFixedCost;
if (iData.getInsertionCost() + additionalFixedCost < bestKnownCost_) {
bestIData = iData;
bestKnownCost_ = iData.getInsertionCost();
bestKnownCost_ = iData.getInsertionCost() + additionalFixedCost;
}
}
return bestIData;
}

12
jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/CalcVehicleTypeDependentServiceInsertionTest.java
View file

@ -104,18 +104,16 @@ public class CalcVehicleTypeDependentServiceInsertionTest {
@Test
public void whenHaving2VehicleCalcInsertionOfCheapestByFixedCost2() {
double insertionCost2 = RANDOM.nextInt(100);
double insertionCost1 = insertionCost2 + RANDOM.nextInt(100);
double fixed1 = RANDOM.nextDouble() + 1;
double fixed2 = RANDOM.nextDouble() + fixed1 + insertionCost2;
double insertionCost1 = RANDOM.nextInt(100);
double insertionCost2 = insertionCost1 + RANDOM.nextInt(100);
double fixed1 = Math.abs(RANDOM.nextInt(100) + 1);
double fixed2 = Math.abs(RANDOM.nextInt(100) + fixed1 + insertionCost2);
initVehicles(fixed1, fixed2);
JobInsertionCostsCalculator calc = mock(JobInsertionCostsCalculator.class);
InsertionData iDataVeh1 = new InsertionData(insertionCost1, InsertionData.NO_INDEX, 1, veh1, null);
InsertionData iDataVeh2 = new InsertionData(insertionCost2, InsertionData.NO_INDEX, 1, veh2, null);
InsertionData iDataVeh1WithoutFixed = new InsertionData(insertionCost1, InsertionData.NO_INDEX, 1, veh1, null);
when(calc.getInsertionData(vehicleRoute, service, veh1, veh1.getEarliestDeparture(), null, Double.MAX_VALUE)).thenReturn(iDataVeh1);
when(calc.getInsertionData(vehicleRoute, service, veh2, veh2.getEarliestDeparture(), null, Double.MAX_VALUE)).thenReturn(iDataVeh2);
when(calc.getInsertionData(vehicleRoute, service, veh2, veh2.getEarliestDeparture(), null, iDataVeh1WithoutFixed.getInsertionCost())).thenReturn(iDataVeh1WithoutFixed);
when(calc.getInsertionData(vehicleRoute, service, veh2, veh2.getEarliestDeparture(), null, insertionCost1 + fixed1)).thenReturn(iDataVeh2);
VehicleRoutingProblem vrp = mock(VehicleRoutingProblem.class);
when(vrp.getInitialVehicleRoutes()).thenReturn(Collections.<VehicleRoute>emptyList());
VehicleTypeDependentJobInsertionCalculator insertion = new VehicleTypeDependentJobInsertionCalculator(vrp, fleetManager, calc);