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

Merge branch 'master' into experimentWithInsertion

Browse source 
Conflicts:
	jsprit-core/src/main/java/algorithms/CalculatesServiceInsertion.java
	jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionOnRouteLevel.java
This commit is contained in:
Stefan Schroeder 2013-08-22 12:08:53 +02:00
commit c60ab8afd0
22 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,7 @@ public class GendreauPostOptTest {
Service job3;
private StatesContainerImpl states;
private StateManagerImpl states;
private List<Vehicle> vehicles;
@ -147,7 +147,7 @@ public class GendreauPostOptTest {
// Collection<Vehicle> vehicles = Arrays.asList(lightVehicle1,lightVehicle2, heavyVehicle);
fleetManager = new VehicleFleetManagerImpl(vehicles);
states = new StatesContainerImpl();
states = new StateManagerImpl();
activityCosts = new ExampleActivityCostFunction();

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

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

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

@ -65,7 +65,7 @@ public class TestCalculatesServiceInsertionOnRouteLevel {
private Service third;
private StatesContainerImpl states;
private StateManagerImpl states;
private NoDriver driver;
@ -143,7 +143,7 @@ public class TestCalculatesServiceInsertionOnRouteLevel {
jobs.add(second);
jobs.add(third);
states = new StatesContainerImpl();
states = new StateManagerImpl();
ExampleActivityCostFunction activityCosts = new ExampleActivityCostFunction();
serviceInsertion = new CalculatesServiceInsertionOnRouteLevel(costs,activityCosts);

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

@ -129,7 +129,7 @@ public class TestIterateRouteForwardInTime {
@Test
public void whenIteratingWithLoadUpdateAtActLocations_itShouldUpdateLoad() {
IterateRouteForwardInTime forwardInTime = new IterateRouteForwardInTime(cost);
StatesContainerImpl states = new StatesContainerImpl();
StateManagerImpl states = new StateManagerImpl();
forwardInTime.addListener(new UpdateLoadAtAllLevels(states));
forwardInTime.iterate(vehicleRoute);
@ -153,7 +153,7 @@ public class TestIterateRouteForwardInTime {
@Test
public void testStatesOfAct1(){
IterateRouteForwardInTime forwardInTime = new IterateRouteForwardInTime(cost);
StatesContainerImpl states = new StatesContainerImpl();
StateManagerImpl states = new StateManagerImpl();
forwardInTime.addListener(new UpdateLoadAtAllLevels(states));
forwardInTime.addListener(new UpdateEarliestStartTimeWindowAtActLocations(states));
forwardInTime.addListener(new UpdateCostsAtAllLevels(new DefaultVehicleRoutingActivityCosts(), cost, states));
@ -168,7 +168,7 @@ public class TestIterateRouteForwardInTime {
@Test
public void testStatesOfAct2(){
IterateRouteForwardInTime forwardInTime = new IterateRouteForwardInTime(cost);
StatesContainerImpl states = new StatesContainerImpl();
StateManagerImpl states = new StateManagerImpl();
forwardInTime.addListener(new UpdateLoadAtAllLevels(states));
forwardInTime.addListener(new UpdateEarliestStartTimeWindowAtActLocations(states));
forwardInTime.addListener(new UpdateCostsAtAllLevels(new DefaultVehicleRoutingActivityCosts(), cost, states));
@ -183,7 +183,7 @@ public class TestIterateRouteForwardInTime {
@Test
public void testStatesOfAct3(){
IterateRouteForwardInTime forwardInTime = new IterateRouteForwardInTime(cost);
StatesContainerImpl states = new StatesContainerImpl();
StateManagerImpl states = new StateManagerImpl();
forwardInTime.addListener(new UpdateActivityTimes());
forwardInTime.addListener(new UpdateCostsAtAllLevels(new DefaultVehicleRoutingActivityCosts(), cost, states));
forwardInTime.iterate(vehicleRoute);

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

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