From 357f7d82b32be8ffcf784c19cca120c2b1d5eccc Mon Sep 17 00:00:00 2001 From: oblonski <4sschroeder@gmail.com> Date: Wed, 17 Jul 2013 10:56:11 +0200 Subject: [PATCH] add pickup and delivery --- jsprit-core/src/main/java/basics/Delivery.java | 7 +++++++ jsprit-core/src/main/java/basics/Pickup.java | 15 +++++++++++++++ jsprit-core/src/main/java/basics/Service.java | 4 +--- .../src/main/java/examples/SolomonExample.java | 3 --- 4 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 jsprit-core/src/main/java/basics/Delivery.java create mode 100644 jsprit-core/src/main/java/basics/Pickup.java diff --git a/jsprit-core/src/main/java/basics/Delivery.java b/jsprit-core/src/main/java/basics/Delivery.java new file mode 100644 index 00000000..626966c6 --- /dev/null +++ b/jsprit-core/src/main/java/basics/Delivery.java @@ -0,0 +1,7 @@ +package basics; + +public class Delivery { + + + +} diff --git a/jsprit-core/src/main/java/basics/Pickup.java b/jsprit-core/src/main/java/basics/Pickup.java new file mode 100644 index 00000000..8b591dc8 --- /dev/null +++ b/jsprit-core/src/main/java/basics/Pickup.java @@ -0,0 +1,15 @@ +package basics; + +public class Pickup extends Service { + + + + Pickup(Builder builder) { + super(builder); + // TODO Auto-generated constructor stub + } + + + + +} diff --git a/jsprit-core/src/main/java/basics/Service.java b/jsprit-core/src/main/java/basics/Service.java index 43ea2d4c..07730b9e 100644 --- a/jsprit-core/src/main/java/basics/Service.java +++ b/jsprit-core/src/main/java/basics/Service.java @@ -26,8 +26,6 @@ import util.Coordinate; public class Service implements Job { - - public static class Builder { public static Builder newInstance(String id, int size){ @@ -99,7 +97,7 @@ public class Service implements Job { private final int demand; - private Service(Builder builder){ + Service(Builder builder){ id = builder.id; locationId = builder.locationId; coord = builder.coord; diff --git a/jsprit-examples/src/main/java/examples/SolomonExample.java b/jsprit-examples/src/main/java/examples/SolomonExample.java index 62c3897f..6ba7099b 100644 --- a/jsprit-examples/src/main/java/examples/SolomonExample.java +++ b/jsprit-examples/src/main/java/examples/SolomonExample.java @@ -23,18 +23,15 @@ package examples; import java.util.Collection; import readers.SolomonReader; -import algorithms.GreedySchrimpfFactory; import algorithms.SchrimpfFactory; import algorithms.selectors.SelectBest; import analysis.AlgorithmSearchProgressChartListener; import analysis.SolutionPlotter; import analysis.SolutionPrinter; import analysis.SolutionPrinter.Print; -import analysis.StopWatch; import basics.VehicleRoutingAlgorithm; import basics.VehicleRoutingProblem; import basics.VehicleRoutingProblemSolution; -import basics.algo.VehicleRoutingAlgorithmListeners.Priority; public class SolomonExample {