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

rename core.problem.JobActivityFactory.createActivity to .createActivities

Browse source
This commit is contained in:
oblonski 2014-07-23 23:12:13 +02:00
parent 3f9e217e6c
commit 8e3977e78f
15 changed files with 237 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
jsprit-core/src/main/java/jsprit/core/problem/JobActivityFactory.java
View file

@ -5,10 +5,10 @@ import jsprit.core.problem.job.Job;
import java.util.List;
/**
* Created by schroeder on 14.07.14.
* JobActivityFactory that creates the activities to the specified job.
*/
public interface JobActivityFactory {
public List<AbstractActivity> createActivity(Job job);
public List<AbstractActivity> createActivities(Job job);
}

6
jsprit-core/src/main/java/jsprit/core/problem/solution/route/VehicleRoute.java
View file

@ -128,7 +128,7 @@ public class VehicleRoute {
private JobActivityFactory jobActivityFactory = new JobActivityFactory() {
@Override
public List<AbstractActivity> createActivity(Job job) {
public List<AbstractActivity> createActivities(Job job) {
List<AbstractActivity> acts = new ArrayList<AbstractActivity>();
if(job instanceof Service){
acts.add(serviceActivityFactory.createActivity((Service) job));
@ -241,7 +241,7 @@ public class VehicleRoute {
*/
@Deprecated
public Builder addService(Service service, double arrTime, double endTime){
List<AbstractActivity> acts = jobActivityFactory.createActivity(service);
List<AbstractActivity> acts = jobActivityFactory.createActivities(service);
TourActivity act = acts.get(0);
act.setArrTime(arrTime);
act.setEndTime(endTime);
@ -272,7 +272,7 @@ public class VehicleRoute {
@Deprecated
public Builder addPickup(Shipment shipment, double arrTime, double endTime){
if(openShipments.contains(shipment)) throw new IllegalStateException("shipment has already been added. cannot add it twice.");
List<AbstractActivity> acts = jobActivityFactory.createActivity(shipment);
List<AbstractActivity> acts = jobActivityFactory.createActivities(shipment);
TourActivity act = acts.get(0);
act.setArrTime(arrTime);
act.setEndTime(endTime);