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

move core.problem.misc.JobInsertionContext.ActivityContext to new type

Browse source
This commit is contained in:
oblonski 2014-09-04 19:19:49 +02:00
parent b4e5ce888c
commit dd2c7625b4
4 changed files with 98 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

3
jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java
View file

@ -23,6 +23,7 @@ import jsprit.core.problem.cost.VehicleRoutingTransportCosts;
import jsprit.core.problem.driver.Driver;
import jsprit.core.problem.job.Job;
import jsprit.core.problem.job.Shipment;
import jsprit.core.problem.misc.ActivityContext;
import jsprit.core.problem.misc.JobInsertionContext;
import jsprit.core.problem.solution.route.VehicleRoute;
import jsprit.core.problem.solution.route.activity.End;
@ -115,7 +116,7 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
End end = End.newInstance(newVehicle.getEndLocationId(), 0.0, newVehicle.getLatestArrival());
JobInsertionContext.ActivityContext pickupContext = new JobInsertionContext.ActivityContext();
ActivityContext pickupContext = new ActivityContext();
TourActivity prevAct = start;
double prevActEndTime = newVehicleDepartureTime;

94
jsprit-core/src/main/java/jsprit/core/problem/misc/ActivityContext.java Normal file
View file

@ -0,0 +1,94 @@
/*******************************************************************************
* Copyright (C) 2014 Stefan Schroeder
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
package jsprit.core.problem.misc;
/**
* Provides insertion context information about a particular activity.
*/
public class ActivityContext {
private double arrivalTime;
private double endTime;
private int insertionIndex;
/**
* Returns arrival time at associated activity.
*
* @return arrival time
*/
public double getArrivalTime() {
return arrivalTime;
}
/**
* Returns end time of associated activity.
*
* @return end time
*/
public double getEndTime() {
return endTime;
}
/**
* Returns the insertion index of the associated vehicle.
*
* <p>The associated activity is not inserted yet. The actual insertion position is still to be evaluated.
* Thus this insertion index is related to the potential insertion index which is the position before
* the activity at this index in the existing route.
*
* if insertionIndex == 0, the associated activity will be inserted between start of vehicle and the first
* activity in activity sequence.
*
* if insertionIndex == relatedRoute.getActivities().size(), the associated activity will be inserted between
* the last activity in the activity sequence and the end of vehicle.
*
* @return insertion index
*/
public int getInsertionIndex() {
return insertionIndex;
}
/**
* Sets arrivalTime of associated vehicle at activity.
*
* @param arrivalTime arrival time of associated vehicle at activity
*/
public void setArrivalTime(double arrivalTime) {
this.arrivalTime = arrivalTime;
}
/**
* Sets end time of associated activity.
*
* @param endTime end time
*/
public void setEndTime(double endTime) {
this.endTime = endTime;
}
/**
* Sets insertion index of associated activity.
*
* @param insertionIndex insertion index of associated activity
*/
public void setInsertionIndex(int insertionIndex) {
this.insertionIndex = insertionIndex;
}
}

76
jsprit-core/src/main/java/jsprit/core/problem/misc/JobInsertionContext.java
View file

@ -31,82 +31,6 @@ import java.util.List;
*/
public class JobInsertionContext {
/**
* Provides insertion context information about a particular activity.
*/
public static class ActivityContext {
private double arrivalTime;
private double endTime;
private int insertionIndex;
/**
* Returns arrival time at associated activity.
*
* @return arrival time
*/
public double getArrivalTime() {
return arrivalTime;
}
/**
* Returns end time of associated activity.
*
* @return end time
*/
public double getEndTime() {
return endTime;
}
/**
* Returns the insertion index of the associated vehicle.
*
* <p>The associated activity is not inserted yet. The actual insertion position is still to be evaluated.
* Thus this insertion index is related to the potential insertion index which is the position before
* the activity at this index in the existing route.
*
* if insertionIndex == 0, the associated activity will be inserted between start of vehicle and the first
* activity in activity sequence.
*
* if insertionIndex == relatedRoute.getActivities().size(), the associated activity will be inserted between
* the last activity in the activity sequence and the end of vehicle.
*
* @return insertion index
*/
public int getInsertionIndex() {
return insertionIndex;
}
/**
* Sets arrivalTime of associated vehicle at activity.
*
* @param arrivalTime arrival time of associated vehicle at activity
*/
public void setArrivalTime(double arrivalTime) {
this.arrivalTime = arrivalTime;
}
/**
* Sets end time of associated activity.
*
* @param endTime end time
*/
public void setEndTime(double endTime) {
this.endTime = endTime;
}
/**
* Sets insertion index of associated activity.
*
* @param insertionIndex insertion index of associated activity
*/
public void setInsertionIndex(int insertionIndex) {
this.insertionIndex = insertionIndex;
}
}
private VehicleRoute route;
private Job job;

2
jsprit-core/src/test/java/jsprit/core/problem/misc/JobInsertionContextTest.java
View file

@ -88,7 +88,7 @@ public class JobInsertionContextTest {
@Test
public void relatedActivityContextShouldBeAssigned(){
context.setRelatedActivityContext(mock(JobInsertionContext.ActivityContext.class));
context.setRelatedActivityContext(mock(ActivityContext.class));
assertNotNull(context.getRelatedActivityContext());
}