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

relax api

Browse source
This commit is contained in:
Stefan Schroeder 2013-10-21 18:34:00 +02:00
parent 202c22ecd2
commit 06ab1c3247
42 changed files with 454 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsprit-core/src/test/java/algorithms/BuildCVRPAlgoFromScratchTest.java
View file

@ -49,7 +49,7 @@ public class BuildCVRPAlgoFromScratchTest {
new VrpXMLReader(builder).read("src/test/resources/vrpnc1-jsprit.xml");
vrp = builder.build();
final StateManagerImpl stateManager = new StateManagerImpl();
final StateManager stateManager = new StateManager();
HardActivityLevelConstraint hardActLevelConstraint = new HardActivityLevelConstraint() {
@Override

6
jsprit-core/src/test/java/algorithms/BuildPDVRPAlgoFromScratchTest.java
View file

@ -22,7 +22,7 @@ import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
import algorithms.StateManagerImpl.StateImpl;
import algorithms.StateManager.StateImpl;
import algorithms.acceptors.AcceptNewIfBetterThanWorst;
import algorithms.selectors.SelectBest;
import basics.Delivery;
@ -54,7 +54,7 @@ public class BuildPDVRPAlgoFromScratchTest {
new VrpXMLReader(builder).read("src/test/resources/pd_solomon_r101.xml");
vrp = builder.build();
final StateManagerImpl stateManager = new StateManagerImpl();
final StateManager stateManager = new StateManager();
ConstraintManager actLevelConstraintAccumulator = new ConstraintManager();
actLevelConstraintAccumulator.addConstraint(new HardPickupAndDeliveryActivityLevelConstraint(stateManager));
@ -63,7 +63,7 @@ public class BuildPDVRPAlgoFromScratchTest {
ActivityInsertionCostsCalculator marginalCalculus = new LocalActivityInsertionCostsCalculator(vrp.getTransportCosts(), vrp.getActivityCosts());
ServiceInsertionCalculator serviceInsertion = new ServiceInsertionCalculator(vrp.getTransportCosts(), marginalCalculus, new HardPickupAndDeliveryLoadConstraint(stateManager), actLevelConstraintAccumulator);
ServiceInsertionCalculator serviceInsertion = new ServiceInsertionCalculator(vrp.getTransportCosts(), marginalCalculus, new HardPickupAndDeliveryLoadRouteLevelConstraint(stateManager), actLevelConstraintAccumulator);
// CalculatesServiceInsertion serviceInsertion = new CalculatesServiceInsertion(vrp.getTransportCosts(), marginalCalculus, new HardConstraints.HardLoadConstraint(stateManager));
VehicleFleetManager fleetManager = new InfiniteVehicles(vrp.getVehicles());

6
jsprit-core/src/test/java/algorithms/GendreauPostOptTest.java
View file

@ -68,7 +68,7 @@ public class GendreauPostOptTest {
Service job3;
private StateManagerImpl states;
private StateManager states;
private List<Vehicle> vehicles;
@ -144,7 +144,7 @@ public class GendreauPostOptTest {
// Collection<Vehicle> vehicles = Arrays.asList(lightVehicle1,lightVehicle2, heavyVehicle);
fleetManager = new VehicleFleetManagerImpl(vehicles);
states = new StateManagerImpl();
states = new StateManager();
activityCosts = new ExampleActivityCostFunction();
@ -214,7 +214,7 @@ public class GendreauPostOptTest {
return c;
}
private double getCosts(VehicleRoutingProblemSolution newSolution, StateManagerImpl states) {
private double getCosts(VehicleRoutingProblemSolution newSolution, StateManager states) {
double c = 0.0;
for(VehicleRoute r : newSolution.getRoutes()){

4
jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertion.java
View file

@ -59,7 +59,7 @@ public class TestCalculatesServiceInsertion {
private Service third;
private StateManagerImpl states;
private StateManager states;
private NoDriver driver;
@ -149,7 +149,7 @@ public class TestCalculatesServiceInsertion {
jobs.add(second);
jobs.add(third);
states = new StateManagerImpl();
states = new StateManager();
ExampleActivityCostFunction activityCosts = new ExampleActivityCostFunction();

4
jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertionOnRouteLevel.java
View file

@ -62,7 +62,7 @@ public class TestCalculatesServiceInsertionOnRouteLevel {
private Service third;
private StateManagerImpl states;
private StateManager states;
private NoDriver driver;
@ -140,7 +140,7 @@ public class TestCalculatesServiceInsertionOnRouteLevel {
jobs.add(second);
jobs.add(third);
states = new StateManagerImpl();
states = new StateManager();
ExampleActivityCostFunction activityCosts = new ExampleActivityCostFunction();
ActivityInsertionCostsCalculator actInsertionCostCalculator = new RouteLevelActivityInsertionCostsEstimator(costs, activityCosts, states);

4
jsprit-core/src/test/java/algorithms/TestIterateRouteForwardInTime.java
View file

@ -58,7 +58,7 @@ public class TestIterateRouteForwardInTime {
ServiceActivity secondAct;
StateManagerImpl stateManager;
StateManager stateManager;
@Before
public void setUp(){
@ -114,7 +114,7 @@ public class TestIterateRouteForwardInTime {
vehicleRoute = VehicleRoute.newInstance(tour,DriverImpl.noDriver(),vehicle);
stateManager = new StateManagerImpl();
stateManager = new StateManager();
}
@Test

4
jsprit-core/src/test/java/algorithms/TestTourStateUpdaterWithService.java
View file

@ -53,7 +53,7 @@ public class TestTourStateUpdaterWithService {
UpdateStates updateStates;
StateManagerImpl states;
StateManager states;
private VehicleRoute vehicleRoute;
@ -100,7 +100,7 @@ public class TestTourStateUpdaterWithService {
services.add(firstService);
services.add(secondService);
states = new StateManagerImpl();
states = new StateManager();
VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("test", 0).build();
vehicle = VehicleImpl.Builder.newInstance("testvehicle").setType(type).setLocationId("0,0")