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

modified tests according to #102 changes

Browse source
This commit is contained in:
oblonski 2014-06-02 12:30:27 +02:00
parent fa2c5eb00f
commit 6ce0ff7ac1
2 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,7 +108,7 @@ public class BuildCVRPAlgoFromScratch_IT {
vra.addInitialSolution(iniSolution); vra.addInitialSolution(iniSolution);
vra.setNuOfIterations(1000); vra.setNuOfIterations(2000);
} }

39
jsprit-core/src/test/java/jsprit/core/problem/VehicleRoutingProblemTest.java
View file

@ -38,11 +38,11 @@ import jsprit.core.problem.job.Service;
import jsprit.core.problem.job.Shipment; import jsprit.core.problem.job.Shipment;
import jsprit.core.problem.solution.route.VehicleRoute; import jsprit.core.problem.solution.route.VehicleRoute;
import jsprit.core.problem.solution.route.activity.TourActivity; import jsprit.core.problem.solution.route.activity.TourActivity;
import jsprit.core.problem.vehicle.PenaltyVehicleType;
import jsprit.core.problem.vehicle.Vehicle; import jsprit.core.problem.vehicle.Vehicle;
import jsprit.core.problem.vehicle.VehicleImpl; import jsprit.core.problem.vehicle.VehicleImpl;
import jsprit.core.problem.vehicle.VehicleType; import jsprit.core.problem.vehicle.VehicleType;
import jsprit.core.problem.vehicle.VehicleTypeImpl; import jsprit.core.problem.vehicle.VehicleTypeImpl;
import jsprit.core.problem.vehicle.VehicleTypeKey;
import jsprit.core.util.Coordinate; import jsprit.core.util.Coordinate;
import org.junit.Test; import org.junit.Test;
@ -344,7 +344,7 @@ public class VehicleRoutingProblemTest {
boolean penaltyVehicleInCollection = false; boolean penaltyVehicleInCollection = false;
for(Vehicle v : vrp.getVehicles()){ for(Vehicle v : vrp.getVehicles()){
if(v.getId().equals(getPenaltyVehicleId(v))) penaltyVehicleInCollection = true; if(v.getType() instanceof PenaltyVehicleType) penaltyVehicleInCollection = true;
} }
assertTrue(penaltyVehicleInCollection); assertTrue(penaltyVehicleInCollection);
@ -365,16 +365,13 @@ public class VehicleRoutingProblemTest {
boolean penaltyVehicleInCollection = false; boolean penaltyVehicleInCollection = false;
for(Vehicle v : vrp.getVehicles()){ for(Vehicle v : vrp.getVehicles()){
if(v.getId().equals(getPenaltyVehicleId(v))) penaltyVehicleInCollection = true; if(v.getType() instanceof PenaltyVehicleType) penaltyVehicleInCollection = true;
} }
assertFalse(penaltyVehicleInCollection); assertFalse(penaltyVehicleInCollection);
} }
private String getPenaltyVehicleId(Vehicle v) {
return "penaltyVehicle_" + new VehicleTypeKey(v.getType().getTypeId(), v.getStartLocationId(), v.getEndLocationId(),
v.getEarliestDeparture(), v.getLatestArrival()).toString();
}
@Test @Test
public void whenSettingAddPenaltyVehicleOptionsAndTwoVehiclesWithSameLocationAndType_onlyOnePenaltyVehicleIsAdded(){ public void whenSettingAddPenaltyVehicleOptionsAndTwoVehiclesWithSameLocationAndType_onlyOnePenaltyVehicleIsAdded(){
@ -394,7 +391,7 @@ public class VehicleRoutingProblemTest {
boolean penaltyVehicleInCollection = false; boolean penaltyVehicleInCollection = false;
for(Vehicle v : vrp.getVehicles()){ for(Vehicle v : vrp.getVehicles()){
if(v.getId().equals(getPenaltyVehicleId(v))) penaltyVehicleInCollection = true; if(v.getType() instanceof PenaltyVehicleType) penaltyVehicleInCollection = true;
} }
assertTrue(penaltyVehicleInCollection); assertTrue(penaltyVehicleInCollection);
@ -418,7 +415,7 @@ public class VehicleRoutingProblemTest {
double fix = 0.0; double fix = 0.0;
for(Vehicle v : vrp.getVehicles()){ for(Vehicle v : vrp.getVehicles()){
if(v.getId().equals(getPenaltyVehicleId(v))) { if(v.getType() instanceof PenaltyVehicleType) {
fix = v.getType().getVehicleCostParams().fix; fix = v.getType().getVehicleCostParams().fix;
} }
} }
@ -442,14 +439,14 @@ public class VehicleRoutingProblemTest {
assertEquals(4,vrp.getVehicles().size()); assertEquals(4,vrp.getVehicles().size());
boolean penaltyVehicleInCollection = false; int countPenaltyVehicles = 0;
boolean anotherPenVehInCollection = false;
for(Vehicle v : vrp.getVehicles()){ for(Vehicle v : vrp.getVehicles()){
if(v.getId().equals(getPenaltyVehicleId(vehicle))) penaltyVehicleInCollection = true; if(v.getType() instanceof PenaltyVehicleType) {
if(v.getId().equals(getPenaltyVehicleId(vehicle2))) anotherPenVehInCollection = true; countPenaltyVehicles++;
}
} }
assertTrue(penaltyVehicleInCollection); assertEquals(2,countPenaltyVehicles);
assertTrue(anotherPenVehInCollection);
} }
@ -470,15 +467,13 @@ public class VehicleRoutingProblemTest {
assertEquals(4,vrp.getVehicles().size()); assertEquals(4,vrp.getVehicles().size());
boolean penaltyVehicleInCollection = false; int countPenaltyVehicles = 0;
boolean anotherPenVehInCollection = false;
for(Vehicle v : vrp.getVehicles()){ for(Vehicle v : vrp.getVehicles()){
if(v.getId().equals(getPenaltyVehicleId(vehicle))) penaltyVehicleInCollection = true; if(v.getType() instanceof PenaltyVehicleType) {
if(v.getId().equals(getPenaltyVehicleId(vehicle2))) anotherPenVehInCollection = true; countPenaltyVehicles++;
}
} }
assertTrue(penaltyVehicleInCollection); assertEquals(2,countPenaltyVehicles);
assertTrue(anotherPenVehInCollection);
} }
@Test @Test