Skip to content

Commit be3c196

Browse files
author
braktar
committed
Avoid ambiguity
1 parent a358743 commit be3c196

File tree

12 files changed

+32
-19
lines changed

12 files changed

+32
-19
lines changed

‎jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/BreakActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class BreakActivity extends AbstractActivity implements TourActivity.JobA
3838
private double duration;
3939

4040
@Override
41-
public double getSetupTime() {
41+
public double getSetupArrival() {
4242
return setupTime;
4343
}
4444

@@ -98,7 +98,7 @@ protected BreakActivity(Break aBreak) {
9898
protected BreakActivity(BreakActivity breakActivity) {
9999
counter++;
100100
this.aBreak = (Break) breakActivity.getJob();
101-
this.setupTime = breakActivity.getSetupTime();
101+
this.setupTime = breakActivity.getSetupArrival();
102102
this.arrTime = breakActivity.getArrTime();
103103
this.endTime = breakActivity.getEndTime();
104104
this.location = breakActivity.getLocation();

‎jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public DeliverService(Delivery delivery) {
4646

4747
private DeliverService(DeliverService deliveryActivity) {
4848
this.delivery = deliveryActivity.getJob();
49-
this.setupTime = deliveryActivity.getSetupTime();
49+
this.setupTime = deliveryActivity.getSetupArrival();
5050
this.arrTime = deliveryActivity.getArrTime();
5151
this.endTime = deliveryActivity.getEndTime();
5252
capacity = deliveryActivity.getSize();
@@ -92,7 +92,7 @@ public double getOperationTime() {
9292
}
9393

9494
@Override
95-
public double getSetupTime() {
95+
public double getSetupArrival() {
9696
return setupTime;
9797
}
9898

‎jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverShipment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public DeliverShipment(Shipment shipment) {
4747

4848
private DeliverShipment(DeliverShipment deliveryShipmentActivity) {
4949
this.shipment = (Shipment) deliveryShipmentActivity.getJob();
50-
this.setupTime = deliveryShipmentActivity.getSetupTime();
50+
this.setupTime = deliveryShipmentActivity.getSetupArrival();
5151
this.arrTime = deliveryShipmentActivity.getArrTime();
5252
this.endTime = deliveryShipmentActivity.getEndTime();
5353
this.capacity = deliveryShipmentActivity.getSize();
@@ -102,7 +102,7 @@ public double getOperationTime() {
102102
}
103103

104104
@Override
105-
public double getSetupTime() {
105+
public double getSetupArrival() {
106106
return setupTime;
107107
}
108108

‎jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/End.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public String getName() {
126126
}
127127

128128
@Override
129-
public double getSetupTime() {
129+
public double getSetupArrival() {
130130
return setupTime;
131131
}
132132

‎jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public PickupService(Service service) {
4848

4949
private PickupService(PickupService pickupActivity) {
5050
this.pickup = pickupActivity.getJob();
51-
this.setupTime = pickupActivity.getSetupTime();
51+
this.setupTime = pickupActivity.getSetupArrival();
5252
this.arrTime = pickupActivity.getArrTime();
5353
this.depTime = pickupActivity.getEndTime();
5454
setIndex(pickupActivity.getIndex());
@@ -92,7 +92,7 @@ public double getOperationTime() {
9292
}
9393

9494
@Override
95-
public double getSetupTime() {
95+
public double getSetupArrival() {
9696
return setupTime;
9797
}
9898

‎jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupShipment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public PickupShipment(Shipment shipment) {
4444

4545
private PickupShipment(PickupShipment pickupShipmentActivity) {
4646
this.shipment = (Shipment) pickupShipmentActivity.getJob();
47-
this.setupTime = pickupShipmentActivity.getSetupTime();
47+
this.setupTime = pickupShipmentActivity.getSetupArrival();
4848
this.arrTime = pickupShipmentActivity.getArrTime();
4949
this.endTime = pickupShipmentActivity.getEndTime();
5050
setIndex(pickupShipmentActivity.getIndex());
@@ -98,7 +98,7 @@ public double getOperationTime() {
9898
}
9999

100100
@Override
101-
public double getSetupTime() {
101+
public double getSetupArrival() {
102102
return setupTime;
103103
}
104104

‎jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ServiceActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class ServiceActivity extends AbstractActivity implements TourActivity.Jo
3535
private double theoreticalLatest;
3636

3737
@Override
38-
public double getSetupTime() {
38+
public double getSetupArrival() {
3939
return setupTime;
4040
}
4141

@@ -89,7 +89,7 @@ protected ServiceActivity(Service service) {
8989

9090
protected ServiceActivity(ServiceActivity serviceActivity) {
9191
this.service = serviceActivity.getJob();
92-
this.setupTime = serviceActivity.getSetupTime();
92+
this.setupTime = serviceActivity.getSetupArrival();
9393
this.arrTime = serviceActivity.getArrTime();
9494
this.endTime = serviceActivity.getEndTime();
9595
setIndex(serviceActivity.getIndex());

‎jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/Start.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public String getName() {
122122
}
123123

124124
@Override
125-
public double getSetupTime() {
125+
public double getSetupArrival() {
126126
return setupTime;
127127
}
128128

‎jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivity.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,14 @@ public interface JobActivity extends TourActivity {
9393
*/
9494
public abstract double getOperationTime();
9595

96-
public abstract double getSetupTime();
96+
97+
98+
/**
99+
* Returns the setup arrival time of this activity.
100+
*
101+
* @return setup arrival time
102+
*/
103+
public abstract double getSetupArrival();
97104

98105
/**
99106
* Returns the arrival-time of this activity.

‎jsprit-io/src/main/java/com/graphhopper/jsprit/io/problem/VrpXMLReader.java

+6
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,11 @@ private void readInitialRoutes(XMLConfiguration xmlConfig) {
206206
for (HierarchicalConfiguration actConfig : actConfigs) {
207207
String type = actConfig.getString("[@type]");
208208
if (type == null) throw new IllegalArgumentException("act[@type] is missing.");
209+
double setTime = 0.;
209210
double arrTime = 0.;
210211
double endTime = 0.;
212+
String setTimeS = actConfig.getString("setTime");
213+
if (setTimeS != null) setTime = Double.parseDouble(setTimeS);
211214
String arrTimeS = actConfig.getString("arrTime");
212215
if (arrTimeS != null) arrTime = Double.parseDouble(arrTimeS);
213216
String endTimeS = actConfig.getString("endTime");
@@ -277,8 +280,11 @@ private void readSolutions(XMLConfiguration vrpProblem) {
277280
for (HierarchicalConfiguration actConfig : actConfigs) {
278281
String type = actConfig.getString("[@type]");
279282
if (type == null) throw new IllegalArgumentException("act[@type] is missing.");
283+
double setTime = 0.;
280284
double arrTime = 0.;
281285
double endTime = 0.;
286+
String setTimeS = actConfig.getString("setTime");
287+
if (setTimeS != null) setTime = Double.parseDouble(setTimeS);
282288
String arrTimeS = actConfig.getString("arrTime");
283289
if (arrTimeS != null) arrTime = Double.parseDouble(arrTimeS);
284290
String endTimeS = actConfig.getString("endTime");

‎jsprit-io/src/main/java/com/graphhopper/jsprit/io/problem/VrpXMLWriter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ private void writeSolutions(XMLConf xmlConfig) {
213213
throw new IllegalStateException("cannot write solution correctly since job-type is not know. make sure you use either service or shipment, or another writer");
214214
}
215215
}
216-
xmlConfig.setProperty(solutionPath + "(" + counter + ").routes.route(" + routeCounter + ").act(" + actCounter + ").setupTime", act.getSetupTime());
216+
xmlConfig.setProperty(solutionPath + "(" + counter + ").routes.route(" + routeCounter + ").act(" + actCounter + ").setTime", act.getSetupArrival());
217217
xmlConfig.setProperty(solutionPath + "(" + counter + ").routes.route(" + routeCounter + ").act(" + actCounter + ").arrTime", act.getArrTime());
218218
xmlConfig.setProperty(solutionPath + "(" + counter + ").routes.route(" + routeCounter + ").act(" + actCounter + ").endTime", act.getEndTime());
219219
actCounter++;

‎jsprit-io/src/main/resources/vrp_xml_schema.xsd

+3-3
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
<xs:group name="serviceActGroup">
349349
<xs:sequence>
350350
<xs:element name="serviceId" type="xs:string" minOccurs="1" maxOccurs="1"/>
351-
<xs:element name="setupTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
351+
<xs:element name="setTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
352352
<xs:element name="arrTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
353353
<xs:element name="endTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
354354
</xs:sequence>
@@ -357,7 +357,7 @@
357357
<xs:group name="shipmentActGroup">
358358
<xs:sequence>
359359
<xs:element name="shipmentId" type="xs:string" minOccurs="1" maxOccurs="1"/>
360-
<xs:element name="setupTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
360+
<xs:element name="setTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
361361
<xs:element name="arrTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
362362
<xs:element name="endTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
363363
</xs:sequence>
@@ -366,7 +366,7 @@
366366
<xs:group name="breakActGroup">
367367
<xs:sequence>
368368
<xs:element name="breakId" type="xs:string" minOccurs="1" maxOccurs="1"/>
369-
<xs:element name="setupTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
369+
<xs:element name="setTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
370370
<xs:element name="arrTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
371371
<xs:element name="endTime" type="xs:double" minOccurs="0" maxOccurs="1"/>
372372
</xs:sequence>

0 commit comments

Comments
 (0)