diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Activities.java b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Activities.java new file mode 100644 index 00000000..89c80d8c --- /dev/null +++ b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Activities.java @@ -0,0 +1,12 @@ +package jsprit.core.problem.solution.route.activity; + +class Activities { + + public static String round(double time) { + if (time == Double.MAX_VALUE) { + return "oo"; + } + return "" + Math.round(time); + } + +} diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverService.java b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverService.java index 2380ae14..95ca75a0 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverService.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverService.java @@ -90,9 +90,11 @@ public final class DeliverService implements DeliveryActivity{ return delivery; } - @Override public String toString() { - return "[act="+getName()+"][capDemand="+getCapacityDemand()+"][loc="+getLocationId()+"]"; + return "[type="+getName()+"][locationId=" + getLocationId() + + "][size=" + getSize().toString() + + "][twStart=" + Activities.round(getTheoreticalEarliestOperationStartTime()) + + "][twEnd=" + Activities.round(getTheoreticalLatestOperationStartTime()) + "]"; } @Override diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverShipment.java b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverShipment.java index 6f8ec81b..22376f41 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverShipment.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverShipment.java @@ -90,10 +90,12 @@ public final class DeliverShipment implements DeliveryActivity{ public TourActivity duplicate() { return new DeliverShipment(this); } - - @Override + public String toString() { - return "[act="+getName()+"][loc="+getLocationId()+"]"; + return "[type="+getName()+"][locationId=" + getLocationId() + + "][size=" + getSize().toString() + + "][twStart=" + Activities.round(getTheoreticalEarliestOperationStartTime()) + + "][twEnd=" + Activities.round(getTheoreticalLatestOperationStartTime()) + "]"; } @Override diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/End.java b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/End.java index daa73113..8280e00d 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/End.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/End.java @@ -113,17 +113,10 @@ public final class End implements TourActivity { @Override public String toString() { return "[type="+getName()+"][locationId=" + getLocationId() - + "][twStart=" + round(theoretical_earliestOperationStartTime) - + "][twEnd=" + round(theoretical_latestOperationStartTime) + "]"; + + "][twStart=" + Activities.round(theoretical_earliestOperationStartTime) + + "][twEnd=" + Activities.round(theoretical_latestOperationStartTime) + "]"; } - private String round(double time) { - if (time == Double.MAX_VALUE) { - return "oo"; - } - return "" + Math.round(time); - } - @Override public String getName() { return "end"; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupService.java b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupService.java index 806b2500..7ae5fbb9 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupService.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupService.java @@ -91,10 +91,12 @@ public final class PickupService implements PickupActivity{ public int getCapacityDemand() { return pickup.getCapacityDemand(); } - - @Override + public String toString() { - return "[act="+getName()+"][capDemand="+getCapacityDemand()+"][loc="+getLocationId()+"]"; + return "[type="+getName()+"][locationId=" + getLocationId() + + "][size=" + getSize().toString() + + "][twStart=" + Activities.round(getTheoreticalEarliestOperationStartTime()) + + "][twEnd=" + Activities.round(getTheoreticalLatestOperationStartTime()) + "]"; } @Override diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupShipment.java b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupShipment.java index 534ceede..277985a9 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupShipment.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupShipment.java @@ -87,9 +87,11 @@ public final class PickupShipment implements PickupActivity{ return new PickupShipment(this); } - @Override public String toString() { - return "[act="+getName()+"][loc="+getLocationId()+"]"; + return "[type="+getName()+"][locationId=" + getLocationId() + + "][size=" + getSize().toString() + + "][twStart=" + Activities.round(getTheoreticalEarliestOperationStartTime()) + + "][twEnd=" + Activities.round(getTheoreticalLatestOperationStartTime()) + "]"; } @Override diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ServiceActivity.java b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ServiceActivity.java index cf354c18..21742800 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ServiceActivity.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ServiceActivity.java @@ -144,10 +144,15 @@ public class ServiceActivity implements JobActivity{ return service; } + + @Override public String toString() { - return "[type="+getName()+"][service="+this.service+"]"; + return "[type="+getName()+"][locationId=" + getLocationId() + + "][size=" + getSize().toString() + + "][twStart=" + Activities.round(getTheoreticalEarliestOperationStartTime()) + + "][twEnd=" + Activities.round(getTheoreticalLatestOperationStartTime()) + "]"; } - + @Override public String getName() { return service.getType(); diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Start.java b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Start.java index 0b8bc885..ef8fdefa 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Start.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Start.java @@ -107,18 +107,10 @@ public final class Start implements TourActivity { @Override public String toString() { return "[type="+getName()+"][locationId=" + getLocationId() - + "][twStart=" + round(theoretical_earliestOperationStartTime) - + "][twEnd=" + round(theoretical_latestOperationStartTime) + "]"; + + "][twStart=" + Activities.round(theoretical_earliestOperationStartTime) + + "][twEnd=" + Activities.round(theoretical_latestOperationStartTime) + "]"; } - private String round(double time) { - if (time == Double.MAX_VALUE) { - return "oo"; - } - return "" + Math.round(time); - } - - @Override public String getName() { return "start";