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 tests and improve insertionCalc

Browse source
This commit is contained in:
Stefan Schroeder 2013-08-21 17:24:31 +02:00
parent 099d01ddd8
commit 59319ff355
10 changed files with 341 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

7
jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionWithTriangleInequality.java
View file

@ -165,12 +165,7 @@ final class CalculatesServiceInsertionWithTriangleInequality implements JobInser
}
private int getCurrentLoad(VehicleRoute currentRoute) {
States thisRoutesStates = routeStates.getRouteStates().get(currentRoute);
if(routeStates.getRouteStates().containsKey(currentRoute)){
int load = (int) thisRoutesStates.getState(StateTypes.LOAD).toDouble();
return load;
}
else return 0;
return (int) routeStates.getRouteState(currentRoute, StateTypes.LOAD).toDouble();
}
private void initialiseStartAndEnd(final Vehicle newVehicle, double newVehicleDepartureTime) {

4
jsprit-core/src/main/java/algorithms/StatesContainer.java
View file

@ -39,11 +39,11 @@ interface StatesContainer {
Map<VehicleRoute, States> getRouteStates();
// Map<VehicleRoute, States> getRouteStates();
// void put(VehicleRoute route, States states);
Map<TourActivity, States> getActivityStates();
// Map<TourActivity, States> getActivityStates();
// void put(TourActivity act, States states);

2
jsprit-core/src/main/java/algorithms/StatesContainerImpl.java
View file

@ -28,7 +28,6 @@ class StatesContainerImpl implements StatesContainer{
private Map<TourActivity,States> activityStates = new HashMap<TourActivity, StatesContainer.States>();
@Override
public Map<VehicleRoute, States> getRouteStates() {
return Collections.unmodifiableMap(vehicleRouteStates);
}
@ -41,7 +40,6 @@ class StatesContainerImpl implements StatesContainer{
vehicleRouteStates.put(route, states);
}
@Override
public Map<TourActivity, States> getActivityStates() {
return Collections.unmodifiableMap(activityStates);
}