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

added new method update(VehicleRoute)

Browse source
This commit is contained in:
oblonski 2014-07-01 23:07:46 +02:00
parent cea6fb2907
commit ed91301039
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
jsprit-core/src/main/java/jsprit/core/algorithm/state/StateManager.java
View file

@ -31,6 +31,7 @@ import jsprit.core.algorithm.recreate.listener.JobInsertedListener;
import jsprit.core.algorithm.ruin.listener.RuinListener; import jsprit.core.algorithm.ruin.listener.RuinListener;
import jsprit.core.algorithm.ruin.listener.RuinListeners; import jsprit.core.algorithm.ruin.listener.RuinListeners;
import jsprit.core.problem.Capacity; import jsprit.core.problem.Capacity;
import jsprit.core.problem.Skills;
import jsprit.core.problem.VehicleRoutingProblem; import jsprit.core.problem.VehicleRoutingProblem;
import jsprit.core.problem.cost.VehicleRoutingTransportCosts; import jsprit.core.problem.cost.VehicleRoutingTransportCosts;
import jsprit.core.problem.job.Job; import jsprit.core.problem.job.Job;
@ -66,10 +67,7 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
} }
public <T> T getState(StateId id, Class<T> type){ public <T> T getState(StateId id, Class<T> type){
if(states.containsKey(id)){ if(states.containsKey(id)) return type.cast(states.get(id));
T s = type.cast(states.get(id));
return s;
}
return null; return null;
} }
@ -121,7 +119,7 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
defaultActivityStates_.put(StateFactory.PAST_MAXLOAD, Capacity.Builder.newInstance().build()); defaultActivityStates_.put(StateFactory.PAST_MAXLOAD, Capacity.Builder.newInstance().build());
defaultRouteStates_.put(StateFactory.LOAD, Capacity.Builder.newInstance().build()); defaultRouteStates_.put(StateFactory.LOAD, Capacity.Builder.newInstance().build());
defaultRouteStates_.put(StateFactory.SKILLS, Skills.Builder.newInstance().build());
defaultRouteStates_.put(StateFactory.COSTS, 0.); defaultRouteStates_.put(StateFactory.COSTS, 0.);
defaultRouteStates_.put(StateFactory.DURATION, 0.); defaultRouteStates_.put(StateFactory.DURATION, 0.);
defaultRouteStates_.put(StateFactory.FUTURE_MAXLOAD, Capacity.Builder.newInstance().build()); defaultRouteStates_.put(StateFactory.FUTURE_MAXLOAD, Capacity.Builder.newInstance().build());
@ -300,7 +298,7 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
* <p>you can retrieve the duration of myRoute then by <br> * <p>you can retrieve the duration of myRoute then by <br>
* <code>double totalRouteDuration = stateManager.getRouteState(myRoute, StateFactory.createStateId("route-duration"), Double.class);</code> * <code>double totalRouteDuration = stateManager.getRouteState(myRoute, StateFactory.createStateId("route-duration"), Double.class);</code>
* *
* @param act * @param route
* @param stateId * @param stateId
* @param type * @param type
* @param state * @param state
@ -353,7 +351,7 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
* <p>This reverseVisitor visits all activities in a route subsequently (starting from the end of the route) in two cases. First, if insertionStart (after ruinStrategies have removed activities from routes) * <p>This reverseVisitor visits all activities in a route subsequently (starting from the end of the route) in two cases. First, if insertionStart (after ruinStrategies have removed activities from routes)
* and, second, if a job has been inserted and thus if a route has changed. * and, second, if a job has been inserted and thus if a route has changed.
* *
* @param reverseActivityVistor * @param activityVistor
*/ */
void addActivityVisitor(ReverseActivityVisitor activityVistor){ void addActivityVisitor(ReverseActivityVisitor activityVistor){
revRouteActivityVisitor.addActivityVisitor(activityVistor); revRouteActivityVisitor.addActivityVisitor(activityVistor);
@ -384,6 +382,10 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
public void informJobInserted(Job job2insert, VehicleRoute inRoute, double additionalCosts, double additionalTime) { public void informJobInserted(Job job2insert, VehicleRoute inRoute, double additionalCosts, double additionalTime) {
// log.debug("insert " + job2insert + " in " + inRoute); // log.debug("insert " + job2insert + " in " + inRoute);
insertionListeners.informJobInserted(job2insert, inRoute, additionalCosts, additionalTime); insertionListeners.informJobInserted(job2insert, inRoute, additionalCosts, additionalTime);
update(inRoute);
}
public void update(VehicleRoute inRoute) {
for(RouteVisitor v : routeVisitors){ v.visit(inRoute); } for(RouteVisitor v : routeVisitors){ v.visit(inRoute); }
routeActivityVisitor.visit(inRoute); routeActivityVisitor.visit(inRoute);
revRouteActivityVisitor.visit(inRoute); revRouteActivityVisitor.visit(inRoute);
@ -393,9 +395,7 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
public void informInsertionStarts(Collection<VehicleRoute> vehicleRoutes,Collection<Job> unassignedJobs) { public void informInsertionStarts(Collection<VehicleRoute> vehicleRoutes,Collection<Job> unassignedJobs) {
insertionListeners.informInsertionStarts(vehicleRoutes, unassignedJobs); insertionListeners.informInsertionStarts(vehicleRoutes, unassignedJobs);
for(VehicleRoute route : vehicleRoutes){ for(VehicleRoute route : vehicleRoutes){
for(RouteVisitor v : routeVisitors){ v.visit(route); } update(route);
routeActivityVisitor.visit(route);
revRouteActivityVisitor.visit(route);
} }
} }