diff --git a/CHANGELOG.md b/CHANGELOG.md index 463f7ac6..fa7957f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -118,20 +118,20 @@ and considered by the meta-heuristic [#57](https://github.com/jsprit/jsprit/issu - added feature: multiple capacity dimensions ([#55](https://github.com/jsprit/jsprit/issues/55)) - added feature: different start and end locations of routes ([#74](https://github.com/jsprit/jsprit/issues/74)) - added a number of unit-tests -- reworked jsprit.core.algorithm.state.StateManager to deal with any state-object -- jsprit.core.problem.io.VrpXMLReader$ServiceBuilderFactory: Parameter 3 of 'public jsprit.core.problem.job.Service$Builder createBuilder(java.lang.String, java.lang.String, int)' has changed its type to java.lang.Integer -- jsprit.core.problem.job.Job: Method 'public jsprit.core.problem.Capacity getSize()' has been added to an interface [potential Break Change] -- jsprit.core.problem.job.Service$Builder: Removed field demand -- jsprit.core.problem.solution.route.activity.ServiceActivity: Removed field capacityDemand -- jsprit.core.problem.solution.route.activity.TourActivity: Method 'public jsprit.core.problem.Capacity getSize()' has been added to an interface [potential Break Change] -- jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter: Method 'public java.lang.Object getActivityState(jsprit.core.problem.solution.route.activity.TourActivity, jsprit.core.algorithm.state.StateFactory$StateId, java.lang.Class)' has been added to an interface [potential Break Change] -- jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter: Method 'public java.lang.Object getRouteState(jsprit.core.problem.solution.route.VehicleRoute, jsprit.core.algorithm.state.StateFactory$StateId, java.lang.Class)' has been added to an interface [potential Break Change] -- jsprit.core.problem.vehicle.Vehicle: Method 'public jsprit.core.util.Coordinate getEndLocationCoordinate()' has been added to an interface [potential Break Change] -- jsprit.core.problem.vehicle.Vehicle: Method 'public java.lang.String getEndLocationId()' has been added to an interface [potential Break Change] -- jsprit.core.problem.vehicle.Vehicle: Method 'public jsprit.core.util.Coordinate getStartLocationCoordinate()' has been added to an interface [potential Break Change] -- jsprit.core.problem.vehicle.Vehicle: Method 'public java.lang.String getStartLocationId()' has been added to an interface [potential Break Change] -- jsprit.core.problem.vehicle.VehicleFleetManager: Method 'public java.util.Collection getAvailableVehicles(jsprit.core.problem.vehicle.Vehicle)' has been added to an interface [potential Break Change] -- jsprit.core.problem.vehicle.VehicleType: Method 'public jsprit.core.problem.Capacity getCapacityDimensions()' has been added to an interface [potential Break Change] +- reworked StateManager to deal with any state-object +- VrpXMLReader$ServiceBuilderFactory: Parameter 3 of 'public Service$Builder createBuilder(java.lang.String, java.lang.String, int)' has changed its type to java.lang.Integer +- Job: Method 'public Capacity getSize()' has been added to an interface [potential Break Change] +- Service$Builder: Removed field demand +- ServiceActivity: Removed field capacityDemand +- TourActivity: Method 'public Capacity getSize()' has been added to an interface [potential Break Change] +- RouteAndActivityStateGetter: Method 'public java.lang.Object getActivityState(TourActivity, StateFactory$StateId, java.lang.Class)' has been added to an interface [potential Break Change] +- RouteAndActivityStateGetter: Method 'public java.lang.Object getRouteState(VehicleRoute, StateFactory$StateId, java.lang.Class)' has been added to an interface [potential Break Change] +- Vehicle: Method 'public Coordinate getEndLocationCoordinate()' has been added to an interface [potential Break Change] +- Vehicle: Method 'public java.lang.String getEndLocationId()' has been added to an interface [potential Break Change] +- Vehicle: Method 'public Coordinate getStartLocationCoordinate()' has been added to an interface [potential Break Change] +- Vehicle: Method 'public java.lang.String getStartLocationId()' has been added to an interface [potential Break Change] +- VehicleFleetManager: Method 'public java.util.Collection getAvailableVehicles(Vehicle)' has been added to an interface [potential Break Change] +- VehicleType: Method 'public Capacity getCapacityDimensions()' has been added to an interface [potential Break Change] - jsprit.core.util.VrpVerifier: Class jsprit.core.util.VrpVerifier removed [potential Break Change] diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/AlgorithmEventsRecorder.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmEventsRecorder.java similarity index 92% rename from jsprit-analysis/src/main/java/jsprit/analysis/toolbox/AlgorithmEventsRecorder.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmEventsRecorder.java index 6759de6a..b80cc4bf 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/AlgorithmEventsRecorder.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmEventsRecorder.java @@ -15,28 +15,28 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.analysis.toolbox; +package com.graphhopper.jsprit.analysis.toolbox; -import jsprit.core.algorithm.listener.AlgorithmEndsListener; -import jsprit.core.algorithm.listener.IterationStartsListener; -import jsprit.core.algorithm.recreate.InsertionData; -import jsprit.core.algorithm.recreate.listener.BeforeJobInsertionListener; -import jsprit.core.algorithm.recreate.listener.InsertionEndsListener; -import jsprit.core.algorithm.recreate.listener.InsertionStartsListener; -import jsprit.core.algorithm.ruin.listener.RuinListener; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmEndsListener; +import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionData; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.BeforeJobInsertionListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionEndsListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionStartsListener; +import com.graphhopper.jsprit.core.algorithm.ruin.listener.RuinListener; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; import org.graphstream.graph.Edge; import org.graphstream.graph.Graph; import org.graphstream.graph.Node; diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/AlgorithmEventsViewer.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmEventsViewer.java similarity index 99% rename from jsprit-analysis/src/main/java/jsprit/analysis/toolbox/AlgorithmEventsViewer.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmEventsViewer.java index dea49371..b84304e1 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/AlgorithmEventsViewer.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmEventsViewer.java @@ -15,7 +15,7 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.analysis.toolbox; +package com.graphhopper.jsprit.analysis.toolbox; import org.graphstream.graph.Graph; import org.graphstream.stream.Sink; diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/AlgorithmSearchProgressChartListener.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmSearchProgressChartListener.java similarity index 85% rename from jsprit-analysis/src/main/java/jsprit/analysis/toolbox/AlgorithmSearchProgressChartListener.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmSearchProgressChartListener.java index 5dcca9b3..744f0102 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/AlgorithmSearchProgressChartListener.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmSearchProgressChartListener.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.analysis.toolbox; +package com.graphhopper.jsprit.analysis.toolbox; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.listener.AlgorithmEndsListener; -import jsprit.core.algorithm.listener.AlgorithmStartsListener; -import jsprit.core.algorithm.listener.IterationEndsListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmEndsListener; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; +import com.graphhopper.jsprit.core.algorithm.listener.IterationEndsListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/ComputationalLaboratory.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ComputationalLaboratory.java similarity index 97% rename from jsprit-analysis/src/main/java/jsprit/analysis/toolbox/ComputationalLaboratory.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ComputationalLaboratory.java index 8abf7657..31359870 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/ComputationalLaboratory.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ComputationalLaboratory.java @@ -16,13 +16,13 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.analysis.toolbox; +package com.graphhopper.jsprit.analysis.toolbox; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.VehicleRoutingAlgorithmFactory; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.util.BenchmarkInstance; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithmFactory; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.util.BenchmarkInstance; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/ConcurrentBenchmarker.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ConcurrentBenchmarker.java similarity index 91% rename from jsprit-analysis/src/main/java/jsprit/analysis/toolbox/ConcurrentBenchmarker.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ConcurrentBenchmarker.java index 67586c60..e687e69d 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/ConcurrentBenchmarker.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ConcurrentBenchmarker.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.analysis.toolbox; +package com.graphhopper.jsprit.analysis.toolbox; -import jsprit.analysis.util.BenchmarkWriter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.VehicleRoutingAlgorithmFactory; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.Priority; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.util.BenchmarkInstance; -import jsprit.core.util.BenchmarkResult; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.analysis.util.BenchmarkWriter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithmFactory; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.Priority; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.util.BenchmarkInstance; +import com.graphhopper.jsprit.core.util.BenchmarkResult; +import com.graphhopper.jsprit.core.util.Solutions; import org.apache.commons.math.stat.descriptive.DescriptiveStatistics; import java.util.ArrayList; diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/GraphStreamViewer.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/GraphStreamViewer.java similarity index 96% rename from jsprit-analysis/src/main/java/jsprit/analysis/toolbox/GraphStreamViewer.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/GraphStreamViewer.java index 6e8e2a26..38a0794a 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/GraphStreamViewer.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/GraphStreamViewer.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.analysis.toolbox; +package com.graphhopper.jsprit.analysis.toolbox; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.DeliveryActivity; -import jsprit.core.problem.solution.route.activity.PickupActivity; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.Time; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.DeliveryActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.Time; import org.graphstream.graph.Edge; import org.graphstream.graph.Graph; import org.graphstream.graph.Node; diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/NoLocationFoundException.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/NoLocationFoundException.java similarity index 95% rename from jsprit-analysis/src/main/java/jsprit/analysis/toolbox/NoLocationFoundException.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/NoLocationFoundException.java index 4c0a2ecc..ad91b5e4 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/NoLocationFoundException.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/NoLocationFoundException.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.analysis.toolbox; +package com.graphhopper.jsprit.analysis.toolbox; class NoLocationFoundException extends Exception { diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/Plotter.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java similarity index 97% rename from jsprit-analysis/src/main/java/jsprit/analysis/toolbox/Plotter.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java index 7b7c7b87..c89c89f5 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/Plotter.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.analysis.toolbox; +package com.graphhopper.jsprit.analysis.toolbox; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.*; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Locations; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.*; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Locations; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jfree.chart.*; diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/StopWatch.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/StopWatch.java similarity index 83% rename from jsprit-analysis/src/main/java/jsprit/analysis/toolbox/StopWatch.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/StopWatch.java index b7f61ff7..22b96e48 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/StopWatch.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/StopWatch.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.analysis.toolbox; +package com.graphhopper.jsprit.analysis.toolbox; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.listener.AlgorithmEndsListener; -import jsprit.core.algorithm.listener.AlgorithmStartsListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmEndsListener; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/XYLineChartBuilder.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/XYLineChartBuilder.java similarity index 98% rename from jsprit-analysis/src/main/java/jsprit/analysis/toolbox/XYLineChartBuilder.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/XYLineChartBuilder.java index 923ac4ff..6a59082d 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/XYLineChartBuilder.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/XYLineChartBuilder.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.analysis.toolbox; +package com.graphhopper.jsprit.analysis.toolbox; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartUtilities; diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/util/BenchmarkWriter.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/util/BenchmarkWriter.java similarity index 90% rename from jsprit-analysis/src/main/java/jsprit/analysis/util/BenchmarkWriter.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/util/BenchmarkWriter.java index 7529fc79..7f66c4da 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/util/BenchmarkWriter.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/util/BenchmarkWriter.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.analysis.util; +package com.graphhopper.jsprit.analysis.util; -import jsprit.core.util.BenchmarkResult; +import com.graphhopper.jsprit.core.util.BenchmarkResult; import java.util.Collection; diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/util/HtmlBenchmarkTableWriter.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/util/HtmlBenchmarkTableWriter.java similarity index 99% rename from jsprit-analysis/src/main/java/jsprit/analysis/util/HtmlBenchmarkTableWriter.java rename to jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/util/HtmlBenchmarkTableWriter.java index c4159dcd..70e65b6e 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/util/HtmlBenchmarkTableWriter.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/util/HtmlBenchmarkTableWriter.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.analysis.util; +package com.graphhopper.jsprit.analysis.util; -import jsprit.core.util.BenchmarkResult; +import com.graphhopper.jsprit.core.util.BenchmarkResult; import java.io.BufferedWriter; import java.io.File; diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index f46572d1..7b538a91 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -56,31 +56,31 @@ - - maven-surefire-plugin - 2.18.1 - - jsprit.core.IntegrationTest - - - - maven-failsafe-plugin - 2.18.1 - - - **/*.java - - jsprit.core.IntegrationTest - - - - - integration-test - verify - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/InsertionInitialSolutionFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/InsertionInitialSolutionFactory.java similarity index 80% rename from jsprit-core/src/main/java/jsprit/core/algorithm/InsertionInitialSolutionFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/InsertionInitialSolutionFactory.java index 9955fcd2..959d8161 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/InsertionInitialSolutionFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/InsertionInitialSolutionFactory.java @@ -16,16 +16,16 @@ ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.recreate.InsertionStrategy; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.InitialSolutionFactory; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionStrategy; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.InitialSolutionFactory; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/PrettyAlgorithmBuilder.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/PrettyAlgorithmBuilder.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/algorithm/PrettyAlgorithmBuilder.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/PrettyAlgorithmBuilder.java index 733bb05c..0bb3ecb7 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/PrettyAlgorithmBuilder.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/PrettyAlgorithmBuilder.java @@ -15,24 +15,24 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.acceptor.SchrimpfAcceptance; -import jsprit.core.algorithm.acceptor.SolutionAcceptor; -import jsprit.core.algorithm.listener.AlgorithmStartsListener; -import jsprit.core.algorithm.recreate.InsertionStrategy; -import jsprit.core.algorithm.recreate.VehicleSwitched; -import jsprit.core.algorithm.state.*; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.SwitchNotFeasible; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleFleetManager; -import jsprit.core.problem.vehicle.VehicleTypeKey; -import jsprit.core.util.ActivityTimeTracker; +import com.graphhopper.jsprit.core.algorithm.acceptor.SchrimpfAcceptance; +import com.graphhopper.jsprit.core.algorithm.acceptor.SolutionAcceptor; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionStrategy; +import com.graphhopper.jsprit.core.algorithm.recreate.VehicleSwitched; +import com.graphhopper.jsprit.core.algorithm.state.*; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.SwitchNotFeasible; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeKey; +import com.graphhopper.jsprit.core.util.ActivityTimeTracker; import java.util.*; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/RemoveEmptyVehicles.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/RemoveEmptyVehicles.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/algorithm/RemoveEmptyVehicles.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/RemoveEmptyVehicles.java index 4f5255a4..5567abda 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/RemoveEmptyVehicles.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/RemoveEmptyVehicles.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.recreate.listener.InsertionEndsListener; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionEndsListener; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ResetAndIniFleetManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ResetAndIniFleetManager.java similarity index 83% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ResetAndIniFleetManager.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ResetAndIniFleetManager.java index 4ff712a7..04d8344f 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ResetAndIniFleetManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ResetAndIniFleetManager.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.recreate.listener.InsertionStartsListener; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionStartsListener; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/SearchStrategy.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategy.java similarity index 88% rename from jsprit-core/src/main/java/jsprit/core/algorithm/SearchStrategy.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategy.java index 5f07727f..7ad77525 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/SearchStrategy.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategy.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.acceptor.SolutionAcceptor; -import jsprit.core.algorithm.listener.SearchStrategyModuleListener; -import jsprit.core.algorithm.selector.SolutionSelector; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.acceptor.SolutionAcceptor; +import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyModuleListener; +import com.graphhopper.jsprit.core.algorithm.selector.SolutionSelector; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -127,8 +127,8 @@ public class SearchStrategy { /** * Runs the search-strategy and its according modules, and returns DiscoveredSolution. *

- *

This involves three basic steps: 1) Selecting a solution from solutions (input parameter) according to {@link jsprit.core.algorithm.selector.SolutionSelector}, 2) running the modules - * ({@link jsprit.core.algorithm.SearchStrategyModule}) on the selectedSolution and 3) accepting the new solution according to {@link jsprit.core.algorithm.acceptor.SolutionAcceptor}. + *

This involves three basic steps: 1) Selecting a solution from solutions (input parameter) according to {@link com.graphhopper.jsprit.core.algorithm.selector.SolutionSelector}, 2) running the modules + * ({@link SearchStrategyModule}) on the selectedSolution and 3) accepting the new solution according to {@link com.graphhopper.jsprit.core.algorithm.acceptor.SolutionAcceptor}. *

Note that after 1) the selected solution is copied, thus the original solution is not modified. *

Note also that 3) modifies the input parameter solutions by adding, removing, replacing the existing solutions or whatever is defined in the solutionAcceptor. * diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/SearchStrategyManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyManager.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/algorithm/SearchStrategyManager.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyManager.java index 3feaa696..7f3dc85d 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/SearchStrategyManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyManager.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.listener.SearchStrategyListener; -import jsprit.core.algorithm.listener.SearchStrategyModuleListener; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyListener; +import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyModuleListener; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/SearchStrategyModule.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyModule.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/algorithm/SearchStrategyModule.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyModule.java index c847a31d..6f601bef 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/SearchStrategyModule.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyModule.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.listener.SearchStrategyModuleListener; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyModuleListener; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; public interface SearchStrategyModule { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/VariablePlusFixedSolutionCostCalculatorFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VariablePlusFixedSolutionCostCalculatorFactory.java similarity index 82% rename from jsprit-core/src/main/java/jsprit/core/algorithm/VariablePlusFixedSolutionCostCalculatorFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VariablePlusFixedSolutionCostCalculatorFactory.java index d4b6d979..271a89e5 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/VariablePlusFixedSolutionCostCalculatorFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VariablePlusFixedSolutionCostCalculatorFactory.java @@ -16,14 +16,14 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** * Default objective function which is the sum of all fixed vehicle and variable diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithm.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithm.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithm.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithm.java index 466ff4e6..1594b1d9 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithm.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithm.java @@ -14,17 +14,20 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.SearchStrategy.DiscoveredSolution; -import jsprit.core.algorithm.listener.*; -import jsprit.core.algorithm.termination.PrematureAlgorithmTermination; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy.DiscoveredSolution; +import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyListener; +import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyModuleListener; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListener; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners; +import com.graphhopper.jsprit.core.algorithm.termination.PrematureAlgorithmTermination; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.util.Solutions; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -182,10 +185,10 @@ public class VehicleRoutingAlgorithm { *

*

The algorithm runs as long as it is specified in nuOfIterations and prematureBreak. In each iteration it selects a searchStrategy according * to searchStrategyManager and runs the strategy to improve solutions. - *

Note that clients are allowed to observe/listen the algorithm. See {@link VehicleRoutingAlgorithmListener} and its according listeners. + *

Note that clients are allowed to observe/listen the algorithm. See {@link com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListener} and its according listeners. * * @return Collection the solutions - * @see {@link SearchStrategyManager}, {@link VehicleRoutingAlgorithmListener}, {@link AlgorithmStartsListener}, {@link AlgorithmEndsListener}, {@link IterationStartsListener}, {@link IterationEndsListener} + * @see {@link SearchStrategyManager}, {@link com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListener}, {@link com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener}, {@link com.graphhopper.jsprit.core.algorithm.listener.AlgorithmEndsListener}, {@link com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener}, {@link com.graphhopper.jsprit.core.algorithm.listener.IterationEndsListener} */ public Collection searchSolutions() { logger.info("algorithm starts: [maxIterations={}]", maxIterations); diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithmBuilder.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithmBuilder.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithmBuilder.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithmBuilder.java index 75c54357..3b5f24ef 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithmBuilder.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithmBuilder.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.io.AlgorithmConfig; -import jsprit.core.algorithm.io.AlgorithmConfigXmlReader; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.UpdateEndLocationIfRouteIsOpen; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.algorithm.io.AlgorithmConfig; +import com.graphhopper.jsprit.core.algorithm.io.AlgorithmConfigXmlReader; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.UpdateEndLocationIfRouteIsOpen; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; /** * Builder that builds a {@link VehicleRoutingAlgorithm}. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithmFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithmFactory.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithmFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithmFactory.java index 286bf0e2..cd19879c 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithmFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithmFactory.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; public interface VehicleRoutingAlgorithmFactory { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/AcceptNewRemoveFirst.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/AcceptNewRemoveFirst.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/AcceptNewRemoveFirst.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/AcceptNewRemoveFirst.java index 41421e3a..cae16527 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/AcceptNewRemoveFirst.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/AcceptNewRemoveFirst.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.acceptor; +package com.graphhopper.jsprit.core.algorithm.acceptor; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/ExperimentalSchrimpfAcceptance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/ExperimentalSchrimpfAcceptance.java similarity index 87% rename from jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/ExperimentalSchrimpfAcceptance.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/ExperimentalSchrimpfAcceptance.java index de49605e..22592250 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/ExperimentalSchrimpfAcceptance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/ExperimentalSchrimpfAcceptance.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.acceptor; +package com.graphhopper.jsprit.core.algorithm.acceptor; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.AlgorithmConfig; -import jsprit.core.algorithm.io.AlgorithmConfigXmlReader; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.listener.AlgorithmStartsListener; -import jsprit.core.algorithm.listener.IterationEndsListener; -import jsprit.core.algorithm.listener.IterationStartsListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.util.Resource; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.AlgorithmConfig; +import com.graphhopper.jsprit.core.algorithm.io.AlgorithmConfigXmlReader; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; +import com.graphhopper.jsprit.core.algorithm.listener.IterationEndsListener; +import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.util.Resource; +import com.graphhopper.jsprit.core.util.Solutions; import org.apache.commons.math.stat.descriptive.moment.StandardDeviation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/GreedyAcceptance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/GreedyAcceptance.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/GreedyAcceptance.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/GreedyAcceptance.java index 71a77a94..7023334e 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/GreedyAcceptance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/GreedyAcceptance.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.acceptor; +package com.graphhopper.jsprit.core.algorithm.acceptor; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/GreedyAcceptance_minVehFirst.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/GreedyAcceptance_minVehFirst.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/GreedyAcceptance_minVehFirst.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/GreedyAcceptance_minVehFirst.java index 57876c94..ca94cf95 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/GreedyAcceptance_minVehFirst.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/GreedyAcceptance_minVehFirst.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.acceptor; +package com.graphhopper.jsprit.core.algorithm.acceptor; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SchrimpfAcceptance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfAcceptance.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SchrimpfAcceptance.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfAcceptance.java index 5cc00af4..94352807 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SchrimpfAcceptance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfAcceptance.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.acceptor; +package com.graphhopper.jsprit.core.algorithm.acceptor; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.listener.AlgorithmStartsListener; -import jsprit.core.algorithm.listener.IterationStartsListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; +import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SchrimpfInitialThresholdGenerator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfInitialThresholdGenerator.java similarity index 81% rename from jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SchrimpfInitialThresholdGenerator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfInitialThresholdGenerator.java index b0549b37..824aee6d 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SchrimpfInitialThresholdGenerator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfInitialThresholdGenerator.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.acceptor; +package com.graphhopper.jsprit.core.algorithm.acceptor; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.AlgorithmConfig; -import jsprit.core.algorithm.io.AlgorithmConfigXmlReader; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.listener.AlgorithmStartsListener; -import jsprit.core.algorithm.listener.IterationEndsListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.util.Resource; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.AlgorithmConfig; +import com.graphhopper.jsprit.core.algorithm.io.AlgorithmConfigXmlReader; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; +import com.graphhopper.jsprit.core.algorithm.listener.IterationEndsListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.util.Resource; +import com.graphhopper.jsprit.core.util.Solutions; import org.apache.commons.math.stat.descriptive.moment.StandardDeviation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SolutionAcceptor.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SolutionAcceptor.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SolutionAcceptor.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SolutionAcceptor.java index c6377bf1..639e9d5c 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SolutionAcceptor.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SolutionAcceptor.java @@ -15,9 +15,9 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.acceptor; +package com.graphhopper.jsprit.core.algorithm.acceptor; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/box/ConcurrentInsertionNoiseMaker.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/ConcurrentInsertionNoiseMaker.java similarity index 73% rename from jsprit-core/src/main/java/jsprit/core/algorithm/box/ConcurrentInsertionNoiseMaker.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/ConcurrentInsertionNoiseMaker.java index 1c681224..68a843cb 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/box/ConcurrentInsertionNoiseMaker.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/ConcurrentInsertionNoiseMaker.java @@ -1,12 +1,12 @@ -package jsprit.core.algorithm.box; +package com.graphhopper.jsprit.core.algorithm.box; -import jsprit.core.algorithm.listener.IterationStartsListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.SoftActivityConstraint; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.SoftActivityConstraint; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import java.util.Collection; import java.util.Random; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/box/GreedySchrimpfFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/GreedySchrimpfFactory.java similarity index 74% rename from jsprit-core/src/main/java/jsprit/core/algorithm/box/GreedySchrimpfFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/GreedySchrimpfFactory.java index 7c82fba9..6bf5124d 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/box/GreedySchrimpfFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/GreedySchrimpfFactory.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.box; +package com.graphhopper.jsprit.core.algorithm.box; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.AlgorithmConfig; -import jsprit.core.algorithm.io.AlgorithmConfigXmlReader; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.util.Resource; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.AlgorithmConfig; +import com.graphhopper.jsprit.core.algorithm.io.AlgorithmConfigXmlReader; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.util.Resource; import java.net.URL; /** - * Factory that creates the {@link VehicleRoutingAlgorithm} as proposed by Schrimpf et al., 2000 with the following parameters: + * Factory that creates the {@link com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm} as proposed by Schrimpf et al., 2000 with the following parameters: *

*

* R&R_random (prob=0.5, F=0.5); @@ -47,7 +47,7 @@ import java.net.URL; public class GreedySchrimpfFactory { /** - * Creates the {@link VehicleRoutingAlgorithm}. + * Creates the {@link com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm}. * * @param vrp * @return algorithm diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/box/InsertionNoiseMaker.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/InsertionNoiseMaker.java similarity index 73% rename from jsprit-core/src/main/java/jsprit/core/algorithm/box/InsertionNoiseMaker.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/InsertionNoiseMaker.java index 4228bfa0..5d4bf432 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/box/InsertionNoiseMaker.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/InsertionNoiseMaker.java @@ -1,12 +1,12 @@ -package jsprit.core.algorithm.box; +package com.graphhopper.jsprit.core.algorithm.box; -import jsprit.core.algorithm.listener.IterationStartsListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.SoftActivityConstraint; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.SoftActivityConstraint; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import java.util.Collection; import java.util.Random; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/box/Jsprit.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/algorithm/box/Jsprit.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java index c410e43b..e1fce637 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/box/Jsprit.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java @@ -1,30 +1,30 @@ -package jsprit.core.algorithm.box; +package com.graphhopper.jsprit.core.algorithm.box; -import jsprit.core.algorithm.PrettyAlgorithmBuilder; -import jsprit.core.algorithm.SearchStrategy; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.acceptor.SchrimpfAcceptance; -import jsprit.core.algorithm.listener.AlgorithmEndsListener; -import jsprit.core.algorithm.listener.IterationStartsListener; -import jsprit.core.algorithm.module.RuinAndRecreateModule; -import jsprit.core.algorithm.recreate.*; -import jsprit.core.algorithm.ruin.*; -import jsprit.core.algorithm.ruin.distance.AvgServiceAndShipmentDistance; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.BreakActivity; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.FiniteFleetManagerFactory; -import jsprit.core.problem.vehicle.InfiniteFleetManagerFactory; -import jsprit.core.problem.vehicle.VehicleFleetManager; -import jsprit.core.util.NoiseMaker; -import jsprit.core.util.RandomNumberGeneration; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.PrettyAlgorithmBuilder; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.acceptor.SchrimpfAcceptance; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmEndsListener; +import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; +import com.graphhopper.jsprit.core.algorithm.module.RuinAndRecreateModule; +import com.graphhopper.jsprit.core.algorithm.recreate.*; +import com.graphhopper.jsprit.core.algorithm.ruin.*; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.AvgServiceAndShipmentDistance; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.BreakActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.FiniteFleetManagerFactory; +import com.graphhopper.jsprit.core.problem.vehicle.InfiniteFleetManagerFactory; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.util.NoiseMaker; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.util.Solutions; import java.util.Collection; import java.util.Properties; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/box/SchrimpfFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/SchrimpfFactory.java similarity index 74% rename from jsprit-core/src/main/java/jsprit/core/algorithm/box/SchrimpfFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/SchrimpfFactory.java index e02d1dc1..5a796a5f 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/box/SchrimpfFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/SchrimpfFactory.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.box; +package com.graphhopper.jsprit.core.algorithm.box; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.AlgorithmConfig; -import jsprit.core.algorithm.io.AlgorithmConfigXmlReader; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.util.Resource; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.AlgorithmConfig; +import com.graphhopper.jsprit.core.algorithm.io.AlgorithmConfigXmlReader; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.util.Resource; import java.net.URL; /** - * Factory that creates the {@link VehicleRoutingAlgorithm} as proposed by Schrimpf et al., 2000 with the following parameters: + * Factory that creates the {@link com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm} as proposed by Schrimpf et al., 2000 with the following parameters: *

*

* R&R_random (prob=0.5, F=0.5); @@ -47,7 +47,7 @@ import java.net.URL; public class SchrimpfFactory { /** - * Creates the {@link VehicleRoutingAlgorithm}. + * Creates the {@link com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm}. * * @param vrp the underlying vehicle routing problem * @return algorithm diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/io/AlgorithmConfig.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/AlgorithmConfig.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/algorithm/io/AlgorithmConfig.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/AlgorithmConfig.java index 086d6751..f227c403 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/io/AlgorithmConfig.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/AlgorithmConfig.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.io; +package com.graphhopper.jsprit.core.algorithm.io; import org.apache.commons.configuration.XMLConfiguration; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/io/AlgorithmConfigXmlReader.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/AlgorithmConfigXmlReader.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/algorithm/io/AlgorithmConfigXmlReader.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/AlgorithmConfigXmlReader.java index 47c536df..ee736162 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/io/AlgorithmConfigXmlReader.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/AlgorithmConfigXmlReader.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.io; +package com.graphhopper.jsprit.core.algorithm.io; -import jsprit.core.util.Resource; +import com.graphhopper.jsprit.core.util.Resource; import org.apache.commons.configuration.ConfigurationException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/io/InsertionFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/InsertionFactory.java similarity index 87% rename from jsprit-core/src/main/java/jsprit/core/algorithm/io/InsertionFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/InsertionFactory.java index 3802c803..a12461e5 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/io/InsertionFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/InsertionFactory.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.io; +package com.graphhopper.jsprit.core.algorithm.io; -import jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.PrioritizedVRAListener; -import jsprit.core.algorithm.recreate.InsertionBuilder; -import jsprit.core.algorithm.recreate.InsertionStrategy; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionBuilder; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionStrategy; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -37,7 +37,7 @@ class InsertionFactory { @SuppressWarnings("deprecation") public static InsertionStrategy createInsertion(VehicleRoutingProblem vrp, HierarchicalConfiguration config, - VehicleFleetManager vehicleFleetManager, StateManager stateManager, List algorithmListeners, ExecutorService executorService, int nuOfThreads, ConstraintManager constraintManager, boolean addDefaultCostCalculators) { + VehicleFleetManager vehicleFleetManager, StateManager stateManager, List algorithmListeners, ExecutorService executorService, int nuOfThreads, ConstraintManager constraintManager, boolean addDefaultCostCalculators) { if (config.containsKey("[@name]")) { String insertionName = config.getString("[@name]"); diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java index f0ea52a3..24c3d66e 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java @@ -14,43 +14,43 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.io; +package com.graphhopper.jsprit.core.algorithm.io; -import jsprit.core.algorithm.*; -import jsprit.core.algorithm.acceptor.*; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap.*; -import jsprit.core.algorithm.listener.AlgorithmEndsListener; -import jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.PrioritizedVRAListener; -import jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.Priority; -import jsprit.core.algorithm.module.RuinAndRecreateModule; -import jsprit.core.algorithm.recreate.InsertionStrategy; -import jsprit.core.algorithm.recreate.listener.InsertionListener; -import jsprit.core.algorithm.ruin.RadialRuinStrategyFactory; -import jsprit.core.algorithm.ruin.RandomRuinStrategyFactory; -import jsprit.core.algorithm.ruin.RuinStrategy; -import jsprit.core.algorithm.ruin.distance.AvgServiceAndShipmentDistance; -import jsprit.core.algorithm.ruin.distance.JobDistance; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.algorithm.selector.SelectRandomly; -import jsprit.core.algorithm.selector.SolutionSelector; -import jsprit.core.algorithm.state.*; -import jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; -import jsprit.core.algorithm.termination.PrematureAlgorithmTermination; -import jsprit.core.algorithm.termination.TimeTermination; -import jsprit.core.algorithm.termination.VariationCoefficientTermination; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.SwitchNotFeasible; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.*; -import jsprit.core.util.ActivityTimeTracker; +import com.graphhopper.jsprit.core.algorithm.*; +import com.graphhopper.jsprit.core.algorithm.acceptor.*; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap.*; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmEndsListener; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.PrioritizedVRAListener; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.Priority; +import com.graphhopper.jsprit.core.algorithm.module.RuinAndRecreateModule; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionStrategy; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListener; +import com.graphhopper.jsprit.core.algorithm.ruin.RadialRuinStrategyFactory; +import com.graphhopper.jsprit.core.algorithm.ruin.RandomRuinStrategyFactory; +import com.graphhopper.jsprit.core.algorithm.ruin.RuinStrategy; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.AvgServiceAndShipmentDistance; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.algorithm.selector.SelectRandomly; +import com.graphhopper.jsprit.core.algorithm.selector.SolutionSelector; +import com.graphhopper.jsprit.core.algorithm.state.*; +import com.graphhopper.jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; +import com.graphhopper.jsprit.core.algorithm.termination.PrematureAlgorithmTermination; +import com.graphhopper.jsprit.core.algorithm.termination.TimeTermination; +import com.graphhopper.jsprit.core.algorithm.termination.VariationCoefficientTermination; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.SwitchNotFeasible; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.*; +import com.graphhopper.jsprit.core.util.ActivityTimeTracker; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.commons.configuration.XMLConfiguration; import org.apache.logging.log4j.LogManager; @@ -353,11 +353,11 @@ public class VehicleRoutingAlgorithms { } /** - * Creates a {@link jsprit.core.algorithm.VehicleRoutingAlgorithm} from a AlgorithConfig based on the input vrp. + * Creates a {@link com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm} from a AlgorithConfig based on the input vrp. * * @param vrp the routing problem * @param algorithmConfig the algorithm config - * @return {@link jsprit.core.algorithm.VehicleRoutingAlgorithm} + * @return {@link com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm} */ public static VehicleRoutingAlgorithm createAlgorithm(final VehicleRoutingProblem vrp, final AlgorithmConfig algorithmConfig) { return createAlgo(vrp, algorithmConfig.getXMLConfiguration(), 0, null); @@ -372,7 +372,7 @@ public class VehicleRoutingAlgorithms { * * @param vrp the routing problem * @param configURL config url - * @return {@link jsprit.core.algorithm.VehicleRoutingAlgorithm} + * @return {@link com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm} */ public static VehicleRoutingAlgorithm readAndCreateAlgorithm(final VehicleRoutingProblem vrp, final URL configURL) { AlgorithmConfig algorithmConfig = new AlgorithmConfig(); @@ -389,11 +389,11 @@ public class VehicleRoutingAlgorithms { } /** - * Read and creates {@link jsprit.core.problem.VehicleRoutingProblem} from config-file. + * Read and creates {@link com.graphhopper.jsprit.core.problem.VehicleRoutingProblem} from config-file. * * @param vrp the routing problem * @param configFileName the config filename (and location) - * @return {@link jsprit.core.algorithm.VehicleRoutingAlgorithm} + * @return {@link com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm} */ public static VehicleRoutingAlgorithm readAndCreateAlgorithm(final VehicleRoutingProblem vrp, final String configFileName) { AlgorithmConfig algorithmConfig = new AlgorithmConfig(); diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/AlgorithmEndsListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/AlgorithmEndsListener.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/algorithm/listener/AlgorithmEndsListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/AlgorithmEndsListener.java index d0784ceb..13e4fc62 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/AlgorithmEndsListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/AlgorithmEndsListener.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.listener; +package com.graphhopper.jsprit.core.algorithm.listener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/AlgorithmStartsListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/AlgorithmStartsListener.java similarity index 80% rename from jsprit-core/src/main/java/jsprit/core/algorithm/listener/AlgorithmStartsListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/AlgorithmStartsListener.java index 9115f990..687b5821 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/AlgorithmStartsListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/AlgorithmStartsListener.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.listener; +package com.graphhopper.jsprit.core.algorithm.listener; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/IterationEndsListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/IterationEndsListener.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/algorithm/listener/IterationEndsListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/IterationEndsListener.java index 308ece2d..daba9bf8 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/IterationEndsListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/IterationEndsListener.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.listener; +package com.graphhopper.jsprit.core.algorithm.listener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/IterationStartsListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/IterationStartsListener.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/algorithm/listener/IterationStartsListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/IterationStartsListener.java index 2f2fe6f8..68a1667b 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/IterationStartsListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/IterationStartsListener.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.listener; +package com.graphhopper.jsprit.core.algorithm.listener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/SearchStrategyListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/SearchStrategyListener.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/algorithm/listener/SearchStrategyListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/SearchStrategyListener.java index 67720df5..71f1cdb6 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/SearchStrategyListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/SearchStrategyListener.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.listener; +package com.graphhopper.jsprit.core.algorithm.listener; public interface SearchStrategyListener extends VehicleRoutingAlgorithmListener { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/SearchStrategyModuleListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/SearchStrategyModuleListener.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/algorithm/listener/SearchStrategyModuleListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/SearchStrategyModuleListener.java index 2167e333..488feaae 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/SearchStrategyModuleListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/SearchStrategyModuleListener.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.listener; +package com.graphhopper.jsprit.core.algorithm.listener; public interface SearchStrategyModuleListener extends VehicleRoutingAlgorithmListener { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/StrategySelectedListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/StrategySelectedListener.java similarity index 81% rename from jsprit-core/src/main/java/jsprit/core/algorithm/listener/StrategySelectedListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/StrategySelectedListener.java index ab6c2cea..23f13fe1 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/StrategySelectedListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/StrategySelectedListener.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.listener; +package com.graphhopper.jsprit.core.algorithm.listener; -import jsprit.core.algorithm.SearchStrategy; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListener.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListener.java index e53c1977..c02733fa 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListener.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.listener; +package com.graphhopper.jsprit.core.algorithm.listener; public interface VehicleRoutingAlgorithmListener { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListeners.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListeners.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListeners.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListeners.java index c9d0d355..abe03175 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListeners.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListeners.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.listener; +package com.graphhopper.jsprit.core.algorithm.listener; -import jsprit.core.algorithm.SearchStrategy; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.*; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/module/RuinAndRecreateModule.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/module/RuinAndRecreateModule.java similarity index 81% rename from jsprit-core/src/main/java/jsprit/core/algorithm/module/RuinAndRecreateModule.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/module/RuinAndRecreateModule.java index e3d176cb..97e04091 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/module/RuinAndRecreateModule.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/module/RuinAndRecreateModule.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.module; +package com.graphhopper.jsprit.core.algorithm.module; -import jsprit.core.algorithm.SearchStrategyModule; -import jsprit.core.algorithm.listener.SearchStrategyModuleListener; -import jsprit.core.algorithm.recreate.InsertionStrategy; -import jsprit.core.algorithm.recreate.listener.InsertionListener; -import jsprit.core.algorithm.ruin.RuinStrategy; -import jsprit.core.algorithm.ruin.listener.RuinListener; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.SearchStrategyModule; +import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyModuleListener; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionStrategy; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListener; +import com.graphhopper.jsprit.core.algorithm.ruin.RuinStrategy; +import com.graphhopper.jsprit.core.algorithm.ruin.listener.RuinListener; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; import java.util.HashSet; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/AbstractInsertionStrategy.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AbstractInsertionStrategy.java similarity index 87% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/AbstractInsertionStrategy.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AbstractInsertionStrategy.java index b3d9b906..4b8a115d 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/AbstractInsertionStrategy.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AbstractInsertionStrategy.java @@ -15,17 +15,17 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.listener.InsertionListener; -import jsprit.core.algorithm.recreate.listener.InsertionListeners; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListeners; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ActivityInsertionCostsCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ActivityInsertionCostsCalculator.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ActivityInsertionCostsCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ActivityInsertionCostsCalculator.java index 884656c0..93024f61 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ActivityInsertionCostsCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ActivityInsertionCostsCalculator.java @@ -15,10 +15,10 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; public interface ActivityInsertionCostsCalculator { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/AdditionalAccessEgressCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AdditionalAccessEgressCalculator.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/AdditionalAccessEgressCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AdditionalAccessEgressCalculator.java index 42b5327f..646e3a99 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/AdditionalAccessEgressCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AdditionalAccessEgressCalculator.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** * Estimates additional access/egress costs when operating route with a new vehicle that has different start/end-location. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/AuxilliaryCostCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AuxilliaryCostCalculator.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/AuxilliaryCostCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AuxilliaryCostCalculator.java index c8ab1b1d..70d8a66e 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/AuxilliaryCostCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AuxilliaryCostCalculator.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import java.util.Iterator; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertion.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertion.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertion.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertion.java index c48a041e..79c12d25 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertion.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertion.java @@ -14,13 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.InsertionData.NoInsertionFound; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.util.NoiseMaker; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.util.NoiseMaker; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -71,7 +70,7 @@ public final class BestInsertion extends AbstractInsertionStrategy { double bestInsertionCost = Double.MAX_VALUE; for (VehicleRoute vehicleRoute : vehicleRoutes) { InsertionData iData = bestInsertionCostCalculator.getInsertionData(vehicleRoute, unassignedJob, NO_NEW_VEHICLE_YET, NO_NEW_DEPARTURE_TIME_YET, NO_NEW_DRIVER_YET, bestInsertionCost); - if (iData instanceof NoInsertionFound) { + if (iData instanceof InsertionData.NoInsertionFound) { continue; } if (iData.getInsertionCost() < bestInsertionCost + noiseMaker.makeNoise()) { @@ -81,7 +80,7 @@ public final class BestInsertion extends AbstractInsertionStrategy { } VehicleRoute newRoute = VehicleRoute.emptyRoute(); InsertionData newIData = bestInsertionCostCalculator.getInsertionData(newRoute, unassignedJob, NO_NEW_VEHICLE_YET, NO_NEW_DEPARTURE_TIME_YET, NO_NEW_DRIVER_YET, bestInsertionCost); - if (!(newIData instanceof NoInsertionFound)) { + if (!(newIData instanceof InsertionData.NoInsertionFound)) { if (newIData.getInsertionCost() < bestInsertionCost + noiseMaker.makeNoise()) { bestInsertion = new Insertion(newRoute, newIData); vehicleRoutes.add(newRoute); diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertionBuilder.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionBuilder.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertionBuilder.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionBuilder.java index badbadce..5998194b 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertionBuilder.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionBuilder.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.PrioritizedVRAListener; -import jsprit.core.algorithm.recreate.listener.InsertionListener; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.PrioritizedVRAListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListener; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import java.util.ArrayList; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java index de43da1b..5780b1a3 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.InsertionData.NoInsertionFound; -import jsprit.core.algorithm.recreate.listener.InsertionListeners; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionData.NoInsertionFound; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListeners; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java similarity index 86% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java index 200a9d10..a7a6687a 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.constraint.*; -import jsprit.core.problem.constraint.HardActivityConstraint.ConstraintsStatus; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.BreakActivity; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.Start; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.CalculationUtils; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.constraint.*; +import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint.ConstraintsStatus; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.BreakActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.Start; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.CalculationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -40,7 +40,7 @@ import java.util.Iterator; import java.util.List; /** - * Calculator that calculates the best insertion position for a {@link jsprit.core.problem.job.Service}. + * Calculator that calculates the best insertion position for a {@link com.graphhopper.jsprit.core.problem.job.Service}. * * @author schroeder */ diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java similarity index 86% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java index 06be01a6..2bef8fd1 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java @@ -1,11 +1,11 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.listener.InsertionStartsListener; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionStartsListener; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeSchedulingInSlices.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeSchedulingInSlices.java similarity index 92% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeSchedulingInSlices.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeSchedulingInSlices.java index d7273c68..cfaff58d 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeSchedulingInSlices.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeSchedulingInSlices.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ConfigureFixCostCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ConfigureFixCostCalculator.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ConfigureFixCostCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ConfigureFixCostCalculator.java index 6618da8d..dc4d6df4 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ConfigureFixCostCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ConfigureFixCostCalculator.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.listener.InsertionStartsListener; -import jsprit.core.algorithm.recreate.listener.JobInsertedListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionStartsListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.JobInsertedListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ConfigureLocalActivityInsertionCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ConfigureLocalActivityInsertionCalculator.java similarity index 77% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ConfigureLocalActivityInsertionCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ConfigureLocalActivityInsertionCalculator.java index fd55558a..b8b1558c 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ConfigureLocalActivityInsertionCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ConfigureLocalActivityInsertionCalculator.java @@ -1,10 +1,10 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.listener.InsertionStartsListener; -import jsprit.core.algorithm.recreate.listener.JobInsertedListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionStartsListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.JobInsertedListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DefaultScorer.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/DefaultScorer.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DefaultScorer.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/DefaultScorer.java index 44c4f1c7..19994ff5 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DefaultScorer.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/DefaultScorer.java @@ -1,10 +1,10 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; /** * Created by schroeder on 15/10/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java similarity index 80% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java index 22f0b5f0..4504303c 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java @@ -16,15 +16,15 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.listener.InsertionStartsListener; -import jsprit.core.algorithm.recreate.listener.JobInsertedListener; -import jsprit.core.problem.constraint.SoftRouteConstraint; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionStartsListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.JobInsertedListener; +import com.graphhopper.jsprit.core.problem.constraint.SoftRouteConstraint; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/Event.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/Event.java similarity index 56% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/Event.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/Event.java index c759efa4..ef70bc4f 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/Event.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/Event.java @@ -1,4 +1,4 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; /** * Created by schroeder on 19/05/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/EventListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/EventListener.java similarity index 65% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/EventListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/EventListener.java index 1781024b..a0870e99 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/EventListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/EventListener.java @@ -1,4 +1,4 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; /** * Created by schroeder on 19/05/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/EventListeners.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/EventListeners.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/EventListeners.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/EventListeners.java index 2ee92981..5385b2be 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/EventListeners.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/EventListeners.java @@ -1,4 +1,4 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; import java.util.ArrayList; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertActivity.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertActivity.java similarity index 73% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertActivity.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertActivity.java index a14c8c1b..faa40654 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertActivity.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertActivity.java @@ -1,8 +1,8 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** * Created by schroeder on 19/05/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertActivityListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertActivityListener.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertActivityListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertActivityListener.java index 58cc4ce1..a77bf1a1 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertActivityListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertActivityListener.java @@ -1,4 +1,4 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; /** * Created by schroeder on 19/05/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertBreak.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertBreak.java similarity index 73% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertBreak.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertBreak.java index 8c5e33d9..8a283590 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertBreak.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertBreak.java @@ -1,8 +1,8 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** * Created by schroeder on 19/05/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertBreakListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertBreakListener.java similarity index 92% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertBreakListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertBreakListener.java index 20b8bdca..4d8d24f2 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertBreakListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertBreakListener.java @@ -1,6 +1,6 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/Inserter.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/Inserter.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/Inserter.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/Inserter.java index f2e2a5d7..e5cdf884 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/Inserter.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/Inserter.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.InsertionData.NoInsertionFound; -import jsprit.core.algorithm.recreate.listener.InsertionListeners; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.*; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionData.NoInsertionFound; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListeners; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.*; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionBuilder.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionBuilder.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionBuilder.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionBuilder.java index e3ada608..b6573f61 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionBuilder.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionBuilder.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.PrioritizedVRAListener; -import jsprit.core.algorithm.recreate.listener.InsertionListener; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListener; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import java.util.ArrayList; import java.util.List; @@ -147,7 +147,7 @@ public class InsertionBuilder { public InsertionStrategy build() { List iListeners = new ArrayList(); - List algorithmListeners = new ArrayList(); + List algorithmListeners = new ArrayList(); JobInsertionCostsCalculatorBuilder calcBuilder = new JobInsertionCostsCalculatorBuilder(iListeners, algorithmListeners); if (local) { calcBuilder.setLocalLevel(addDefaultCostCalc); diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionData.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionData.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionData.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionData.java index b6cc36b6..d4dc3160 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionData.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionData.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import java.util.ArrayList; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionDataUpdater.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionDataUpdater.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionDataUpdater.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionDataUpdater.java index 9460d799..7e9df6f2 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionDataUpdater.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionDataUpdater.java @@ -1,10 +1,10 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleFleetManager; -import jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import java.util.*; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionStrategy.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionStrategy.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionStrategy.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionStrategy.java index 9638ba0c..3496f2e2 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionStrategy.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionStrategy.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.listener.InsertionListener; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListener; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionStrategyFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionStrategyFactory.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionStrategyFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionStrategyFactory.java index 94bfdcc2..40168242 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionStrategyFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionStrategyFactory.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; public interface InsertionStrategyFactory { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobCalculatorSwitcher.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobCalculatorSwitcher.java similarity index 86% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobCalculatorSwitcher.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobCalculatorSwitcher.java index 15bf4e04..f7592038 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobCalculatorSwitcher.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobCalculatorSwitcher.java @@ -16,12 +16,12 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import java.util.HashMap; import java.util.Map; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java similarity index 86% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java index 6540f0da..d5de17de 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java @@ -14,19 +14,18 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.InsertionData.NoInsertionFound; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.constraint.SoftRouteConstraint; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl.NoVehicle; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.constraint.SoftRouteConstraint; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -56,7 +55,7 @@ final class JobInsertionConsideringFixCostsCalculator implements JobInsertionCos return InsertionData.createEmptyInsertionData(); } InsertionData iData = standardServiceInsertion.getInsertionData(currentRoute, jobToInsert, newVehicle, newVehicleDepartureTime, newDriver, bestKnownPrice); - if (iData instanceof NoInsertionFound) { + if (iData instanceof InsertionData.NoInsertionFound) { return iData; } double totalInsertionCost = iData.getInsertionCost() + fixcost_contribution; @@ -93,7 +92,7 @@ final class JobInsertionConsideringFixCostsCalculator implements JobInsertionCos Capacity load = Capacity.addup(currentMaxLoadInRoute, job.getSize()); double currentFix = 0.0; if (route.getVehicle() != null) { - if (!(route.getVehicle() instanceof NoVehicle)) { + if (!(route.getVehicle() instanceof VehicleImpl.NoVehicle)) { currentFix += route.getVehicle().getType().getVehicleCostParams().fix; } } @@ -107,7 +106,7 @@ final class JobInsertionConsideringFixCostsCalculator implements JobInsertionCos Capacity load = Capacity.addup(currentLoad, job.getSize()); double currentRelFix = 0.0; if (route.getVehicle() != null) { - if (!(route.getVehicle() instanceof NoVehicle)) { + if (!(route.getVehicle() instanceof VehicleImpl.NoVehicle)) { currentRelFix += route.getVehicle().getType().getVehicleCostParams().fix * Capacity.divide(currentLoad, route.getVehicle().getType().getCapacityDimensions()); } } diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculator.java similarity index 78% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculator.java index 0434f36a..2228d398 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculator.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; public interface JobInsertionCostsCalculator { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java index 1a056438..bde3c089 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.PrioritizedVRAListener; -import jsprit.core.algorithm.recreate.listener.InsertionListener; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.job.*; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.PrioritizedVRAListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListener; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.job.*; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import java.util.ArrayList; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLight.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLight.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLight.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLight.java index 9414e351..f9273e51 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLight.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLight.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; public interface JobInsertionCostsCalculatorLight { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLightFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLightFactory.java similarity index 81% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLightFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLightFactory.java index 1079d644..e5e03f78 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLightFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorLightFactory.java @@ -15,16 +15,16 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners; -import jsprit.core.algorithm.recreate.listener.InsertionListener; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListener; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import java.util.ArrayList; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java index 11b42742..e792e8fb 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java @@ -15,17 +15,17 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.CalculationUtils; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.CalculationUtils; /** * Calculates activity insertion costs locally, i.e. by comparing the additional costs of insertion the new activity k between diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/NoSolutionFoundException.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/NoSolutionFoundException.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/NoSolutionFoundException.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/NoSolutionFoundException.java index 28cb3367..0676b134 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/NoSolutionFoundException.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/NoSolutionFoundException.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; public class NoSolutionFoundException extends IllegalStateException { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertion.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertion.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertion.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertion.java index 199b65ab..80f48c35 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertion.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertion.java @@ -15,12 +15,12 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertionConcurrent.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrent.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertionConcurrent.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrent.java index 3bc622a9..cab96597 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertionConcurrent.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrent.java @@ -15,12 +15,12 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java index 38f3d213..4c84d052 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java @@ -15,13 +15,13 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertionFast.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionFast.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertionFast.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionFast.java index da0ea0dd..a4db5e8c 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RegretInsertionFast.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionFast.java @@ -15,13 +15,13 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RouteLevelActivityInsertionCostsEstimator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RouteLevelActivityInsertionCostsEstimator.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RouteLevelActivityInsertionCostsEstimator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RouteLevelActivityInsertionCostsEstimator.java index fc7b3429..dfa49127 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/RouteLevelActivityInsertionCostsEstimator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RouteLevelActivityInsertionCostsEstimator.java @@ -15,17 +15,17 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.Start; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.Start; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; import java.util.ArrayList; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ScoredJob.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ScoredJob.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ScoredJob.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ScoredJob.java index 32d952e2..4c184dce 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ScoredJob.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ScoredJob.java @@ -1,7 +1,7 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; /** * Created by schroeder on 15/10/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ScoringFunction.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ScoringFunction.java similarity index 56% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ScoringFunction.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ScoringFunction.java index 434de325..26da0bbe 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ScoringFunction.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ScoringFunction.java @@ -1,6 +1,6 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Job; /** * Created by schroeder on 15/10/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java similarity index 86% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java index 0591ec14..ea9d089e 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java @@ -14,31 +14,31 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.constraint.*; -import jsprit.core.problem.constraint.HardActivityConstraint.ConstraintsStatus; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -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; -import jsprit.core.problem.solution.route.activity.Start; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.CalculationUtils; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.constraint.*; +import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint.ConstraintsStatus; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.misc.ActivityContext; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.Start; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.CalculationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.Iterator; /** - * Calculator that calculates the best insertion position for a {@link Service}. + * Calculator that calculates the best insertion position for a {@link com.graphhopper.jsprit.core.problem.job.Service}. * * @author schroeder */ diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java index 0f189d16..4fd935d3 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java @@ -14,28 +14,28 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.constraint.HardActivityConstraint; -import jsprit.core.problem.constraint.HardActivityConstraint.ConstraintsStatus; -import jsprit.core.problem.constraint.HardRouteConstraint; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.Start; -import jsprit.core.problem.solution.route.activity.TourActivities; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl.NoVehicle; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint; +import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint.ConstraintsStatus; +import com.graphhopper.jsprit.core.problem.constraint.HardRouteConstraint; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.Start; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivities; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -118,7 +118,7 @@ final class ServiceInsertionOnRouteLevelCalculator implements JobInsertionCostsC public InsertionData getInsertionData(final VehicleRoute currentRoute, final Job jobToInsert, final Vehicle newVehicle, double newVehicleDepartureTime, final Driver newDriver, final double best_known_insertion_costs) { if (jobToInsert == null) throw new IllegalStateException("job is null. cannot calculate the insertion of a null-job."); - if (newVehicle == null || newVehicle instanceof NoVehicle) + if (newVehicle == null || newVehicle instanceof VehicleImpl.NoVehicle) throw new IllegalStateException("no vehicle given. set para vehicle!"); JobInsertionContext insertionContext = new JobInsertionContext(currentRoute, jobToInsert, newVehicle, newDriver, newVehicleDepartureTime); diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java index cfdb63bb..0c35524c 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.constraint.*; -import jsprit.core.problem.constraint.HardActivityConstraint.ConstraintsStatus; -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; -import jsprit.core.problem.solution.route.activity.Start; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.CalculationUtils; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.constraint.*; +import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint.ConstraintsStatus; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.misc.ActivityContext; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.Start; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.CalculationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/SwitchVehicle.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SwitchVehicle.java similarity index 75% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/SwitchVehicle.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SwitchVehicle.java index 48d5a1ea..eadf401c 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/SwitchVehicle.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SwitchVehicle.java @@ -1,7 +1,7 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** * Created by schroeder on 19/05/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/SwitchVehicleListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SwitchVehicleListener.java similarity index 92% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/SwitchVehicleListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SwitchVehicleListener.java index a25c2800..15a45ba0 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/SwitchVehicleListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SwitchVehicleListener.java @@ -1,6 +1,6 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Break; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java index 29b401bb..dae3cb0e 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.constraint.SoftActivityConstraint; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.util.CalculationUtils; +import com.graphhopper.jsprit.core.problem.constraint.SoftActivityConstraint; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.util.CalculationUtils; public class VariableTransportCostCalculator implements SoftActivityConstraint { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VehicleSwitched.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VehicleSwitched.java similarity index 78% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VehicleSwitched.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VehicleSwitched.java index 29130e78..ab2da6b2 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VehicleSwitched.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VehicleSwitched.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.listener.VehicleSwitchedListener; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.VehicleSwitchedListener; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; public class VehicleSwitched implements VehicleSwitchedListener { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java index 6dc17a48..0b7adc2d 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java @@ -14,16 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.InsertionData.NoInsertionFound; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleFleetManager; -import jsprit.core.problem.vehicle.VehicleImpl.NoVehicle; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -101,7 +100,7 @@ final class VehicleTypeDependentJobInsertionCalculator implements JobInsertionCo InsertionData bestIData = InsertionData.createEmptyInsertionData(); double bestKnownCost_ = bestKnownCost; Collection relevantVehicles = new ArrayList(); - if (!(selectedVehicle instanceof NoVehicle)) { + if (!(selectedVehicle instanceof VehicleImpl.NoVehicle)) { relevantVehicles.add(selectedVehicle); if (vehicleSwitchAllowed && !isVehicleWithInitialRoute(selectedVehicle)) { relevantVehicles.addAll(fleetManager.getAvailableVehicles(selectedVehicle)); @@ -114,7 +113,7 @@ final class VehicleTypeDependentJobInsertionCalculator implements JobInsertionCo if (v == selectedVehicle) depTime = currentRoute.getDepartureTime(); else depTime = v.getEarliestDeparture(); InsertionData iData = insertionCalculator.getInsertionData(currentRoute, jobToInsert, v, depTime, selectedDriver, bestKnownCost_); - if (iData instanceof NoInsertionFound) { + if (iData instanceof InsertionData.NoInsertionFound) { continue; } if (iData.getInsertionCost() < bestKnownCost_) { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VersionedInsertionData.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VersionedInsertionData.java similarity index 81% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VersionedInsertionData.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VersionedInsertionData.java index fcc4aa3c..5449ba6c 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VersionedInsertionData.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VersionedInsertionData.java @@ -1,6 +1,6 @@ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; /** * Created by schroeder on 15/10/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/BeforeJobInsertionListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/BeforeJobInsertionListener.java similarity index 80% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/BeforeJobInsertionListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/BeforeJobInsertionListener.java index db1ee05b..dc7f72b0 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/BeforeJobInsertionListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/BeforeJobInsertionListener.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate.listener; +package com.graphhopper.jsprit.core.algorithm.recreate.listener; -import jsprit.core.algorithm.recreate.InsertionData; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionData; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; public interface BeforeJobInsertionListener extends InsertionListener { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionEndsListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionEndsListener.java similarity index 88% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionEndsListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionEndsListener.java index e6be0d0b..f94af975 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionEndsListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionEndsListener.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate.listener; +package com.graphhopper.jsprit.core.algorithm.recreate.listener; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionListener.java similarity index 86% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionListener.java index a03751d6..d0c1a1ec 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionListener.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate.listener; +package com.graphhopper.jsprit.core.algorithm.recreate.listener; -import jsprit.core.algorithm.listener.SearchStrategyModuleListener; +import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyModuleListener; public interface InsertionListener extends SearchStrategyModuleListener { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionListeners.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionListeners.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionListeners.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionListeners.java index c669a1f8..d79116a4 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionListeners.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionListeners.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate.listener; +package com.graphhopper.jsprit.core.algorithm.recreate.listener; -import jsprit.core.algorithm.recreate.InsertionData; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionData; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionStartsListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionStartsListener.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionStartsListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionStartsListener.java index bcfd1d0e..b7835aa6 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionStartsListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/InsertionStartsListener.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate.listener; +package com.graphhopper.jsprit.core.algorithm.recreate.listener; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/JobInsertedListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/JobInsertedListener.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/JobInsertedListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/JobInsertedListener.java index 9e48347f..d42510da 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/JobInsertedListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/JobInsertedListener.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate.listener; +package com.graphhopper.jsprit.core.algorithm.recreate.listener; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; public interface JobInsertedListener extends InsertionListener { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/VehicleSwitchedListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/VehicleSwitchedListener.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/VehicleSwitchedListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/VehicleSwitchedListener.java index 483a3763..bd1431fc 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/VehicleSwitchedListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/listener/VehicleSwitchedListener.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate.listener; +package com.graphhopper.jsprit.core.algorithm.recreate.listener; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; public interface VehicleSwitchedListener extends InsertionListener { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/AbstractRuinStrategy.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/AbstractRuinStrategy.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/AbstractRuinStrategy.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/AbstractRuinStrategy.java index f25269b7..1637fa4f 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/AbstractRuinStrategy.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/AbstractRuinStrategy.java @@ -15,15 +15,15 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.listener.RuinListener; -import jsprit.core.algorithm.ruin.listener.RuinListeners; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.algorithm.ruin.listener.RuinListener; +import com.graphhopper.jsprit.core.algorithm.ruin.listener.RuinListeners; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/DBSCANClusterer.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/DBSCANClusterer.java similarity index 92% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/DBSCANClusterer.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/DBSCANClusterer.java index fa34c58c..6e42881f 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/DBSCANClusterer.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/DBSCANClusterer.java @@ -1,12 +1,12 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.util.RandomNumberGeneration; -import jsprit.core.util.RandomUtils; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.util.RandomUtils; import org.apache.commons.math3.ml.clustering.Cluster; import org.apache.commons.math3.ml.clustering.Clusterable; import org.apache.commons.math3.ml.distance.DistanceMeasure; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoods.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoods.java similarity index 72% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoods.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoods.java index 3b2e579d..460dac0c 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoods.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoods.java @@ -1,6 +1,6 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Job; import java.util.Iterator; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsFactory.java similarity index 71% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsFactory.java index 691ede9e..9ac38a43 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsFactory.java @@ -1,7 +1,7 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.distance.JobDistance; -import jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; /** * Created by schroeder on 05/03/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImpl.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImpl.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImpl.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImpl.java index 4bb0b043..cc475d9f 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImpl.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImpl.java @@ -1,9 +1,9 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.distance.JobDistance; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.util.StopWatch; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.util.StopWatch; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImplWithCapRestriction.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImplWithCapRestriction.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImplWithCapRestriction.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImplWithCapRestriction.java index 8288bc8e..af6e143e 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImplWithCapRestriction.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImplWithCapRestriction.java @@ -1,9 +1,9 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.distance.JobDistance; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.util.StopWatch; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.util.StopWatch; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/NearestNeighborhoodIterator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/NearestNeighborhoodIterator.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/NearestNeighborhoodIterator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/NearestNeighborhoodIterator.java index 2b7fda43..308931b3 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/NearestNeighborhoodIterator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/NearestNeighborhoodIterator.java @@ -1,6 +1,6 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Job; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RadialRuinStrategyFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RadialRuinStrategyFactory.java similarity index 88% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RadialRuinStrategyFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RadialRuinStrategyFactory.java index c6c6a7b0..79c90d1b 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RadialRuinStrategyFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RadialRuinStrategyFactory.java @@ -16,10 +16,10 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.distance.JobDistance; -import jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; public class RadialRuinStrategyFactory implements RuinStrategyFactory { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RandomRuinStrategyFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RandomRuinStrategyFactory.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RandomRuinStrategyFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RandomRuinStrategyFactory.java index 44d64889..ec46a86e 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RandomRuinStrategyFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RandomRuinStrategyFactory.java @@ -16,9 +16,9 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; public class RandomRuinStrategyFactory implements RuinStrategyFactory { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/ReferencedJob.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/ReferencedJob.java similarity index 78% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/ReferencedJob.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/ReferencedJob.java index 7dc610fd..27b062b8 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/ReferencedJob.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/ReferencedJob.java @@ -1,6 +1,6 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Job; /** * Created by schroeder on 07/01/15. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinBreaks.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinBreaks.java similarity index 74% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinBreaks.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinBreaks.java index 912982d0..ee0cb295 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinBreaks.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinBreaks.java @@ -1,9 +1,9 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.listener.RuinListener; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.algorithm.ruin.listener.RuinListener; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinClusters.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinClusters.java similarity index 92% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinClusters.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinClusters.java index cdc7e349..22121970 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinClusters.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinClusters.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.listener.IterationStartsListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.util.RandomUtils; +import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.util.RandomUtils; import org.apache.commons.math3.ml.clustering.Clusterable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinRadial.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadial.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinRadial.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadial.java index 792dcba6..a2843f4c 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinRadial.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadial.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.distance.JobDistance; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.util.RandomUtils; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.util.RandomUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinRadialMultipleCenters.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadialMultipleCenters.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinRadialMultipleCenters.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadialMultipleCenters.java index 26ce3e44..2ee891fc 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinRadialMultipleCenters.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadialMultipleCenters.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.distance.JobDistance; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinRandom.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRandom.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinRandom.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRandom.java index 05de6fdb..36dcf1a7 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinRandom.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRandom.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinShareFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinShareFactory.java similarity index 61% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinShareFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinShareFactory.java index f70f0f63..d374672f 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinShareFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinShareFactory.java @@ -1,4 +1,4 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; public interface RuinShareFactory { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinStrategy.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinStrategy.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinStrategy.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinStrategy.java index e1435b00..b4174d2f 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinStrategy.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinStrategy.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.listener.RuinListener; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.algorithm.ruin.listener.RuinListener; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import java.util.Collection; @@ -34,7 +34,7 @@ public interface RuinStrategy { * returns a collection of removed and thus unassigned jobs. * * @param {@link VehicleRoute} - * @return Collection of {@link Job} + * @return Collection of {@link com.graphhopper.jsprit.core.problem.job.Job} */ public Collection ruin(Collection vehicleRoutes); diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinStrategyFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinStrategyFactory.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinStrategyFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinStrategyFactory.java index d236213e..8fa18e42 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinStrategyFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinStrategyFactory.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; public interface RuinStrategyFactory { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinWorst.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinWorst.java similarity index 92% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinWorst.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinWorst.java index 9bdae023..e80f9b6f 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/RuinWorst.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinWorst.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.driver.DriverImpl; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.NoiseMaker; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.NoiseMaker; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/AvgServiceAndShipmentDistance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/AvgServiceAndShipmentDistance.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/AvgServiceAndShipmentDistance.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/AvgServiceAndShipmentDistance.java index 908eb4e3..8473a012 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/AvgServiceAndShipmentDistance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/AvgServiceAndShipmentDistance.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin.distance; +package com.graphhopper.jsprit.core.algorithm.ruin.distance; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.util.EuclideanDistanceCalculator; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.util.EuclideanDistanceCalculator; /** diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/AvgServiceDistance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/AvgServiceDistance.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/AvgServiceDistance.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/AvgServiceDistance.java index f05c4712..4466ea62 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/AvgServiceDistance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/AvgServiceDistance.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin.distance; +package com.graphhopper.jsprit.core.algorithm.ruin.distance; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; /** diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/EuclideanServiceDistance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/EuclideanServiceDistance.java similarity index 88% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/EuclideanServiceDistance.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/EuclideanServiceDistance.java index 29cff947..b9009481 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/EuclideanServiceDistance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/EuclideanServiceDistance.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin.distance; +package com.graphhopper.jsprit.core.algorithm.ruin.distance; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.util.EuclideanDistanceCalculator; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.util.EuclideanDistanceCalculator; public class EuclideanServiceDistance implements JobDistance { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/JobDistance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/JobDistance.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/JobDistance.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/JobDistance.java index c8364bf5..f225cc9d 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/distance/JobDistance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/JobDistance.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin.distance; +package com.graphhopper.jsprit.core.algorithm.ruin.distance; -import jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Job; public interface JobDistance { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/listener/RuinListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/listener/RuinListener.java similarity index 86% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/listener/RuinListener.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/listener/RuinListener.java index c01834c7..49dd0f74 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/listener/RuinListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/listener/RuinListener.java @@ -16,11 +16,11 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.ruin.listener; +package com.graphhopper.jsprit.core.algorithm.ruin.listener; -import jsprit.core.algorithm.listener.SearchStrategyModuleListener; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyModuleListener; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/listener/RuinListeners.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/listener/RuinListeners.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/algorithm/ruin/listener/RuinListeners.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/listener/RuinListeners.java index 56e5d65a..0ff84479 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/listener/RuinListeners.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/listener/RuinListeners.java @@ -15,10 +15,10 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin.listener; +package com.graphhopper.jsprit.core.algorithm.ruin.listener; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/selector/SelectBest.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/selector/SelectBest.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/algorithm/selector/SelectBest.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/selector/SelectBest.java index da77d346..9ec208d2 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/selector/SelectBest.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/selector/SelectBest.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.selector; +package com.graphhopper.jsprit.core.algorithm.selector; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/selector/SelectRandomly.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/selector/SelectRandomly.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/algorithm/selector/SelectRandomly.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/selector/SelectRandomly.java index b61277c2..ff7bca80 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/selector/SelectRandomly.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/selector/SelectRandomly.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.selector; +package com.graphhopper.jsprit.core.algorithm.selector; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/selector/SolutionSelector.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/selector/SolutionSelector.java similarity index 88% rename from jsprit-core/src/main/java/jsprit/core/algorithm/selector/SolutionSelector.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/selector/SolutionSelector.java index cfc95110..051bb437 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/selector/SolutionSelector.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/selector/SolutionSelector.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.selector; +package com.graphhopper.jsprit.core.algorithm.selector; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/InternalStates.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/InternalStates.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/InternalStates.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/InternalStates.java index 45d5efc1..309b2a50 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/InternalStates.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/InternalStates.java @@ -15,7 +15,7 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; public class InternalStates { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateFactory.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/StateFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateFactory.java index cf7e0172..d929cf35 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateFactory.java @@ -1,4 +1,4 @@ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; import java.util.Arrays; import java.util.List; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateId.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateId.java new file mode 100644 index 00000000..9b3b04ec --- /dev/null +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateId.java @@ -0,0 +1,10 @@ +package com.graphhopper.jsprit.core.algorithm.state; + +import com.graphhopper.jsprit.core.problem.HasIndex; + +/** + * Created by schroeder on 28.07.14. + */ +public interface StateId extends HasIndex { + +} diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateManager.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/StateManager.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateManager.java index be09f491..1748673b 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateManager.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.algorithm.listener.IterationStartsListener; -import jsprit.core.algorithm.recreate.listener.*; -import jsprit.core.algorithm.ruin.listener.RuinListener; -import jsprit.core.algorithm.ruin.listener.RuinListeners; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.ReverseRouteActivityVisitor; -import jsprit.core.problem.solution.route.RouteActivityVisitor; -import jsprit.core.problem.solution.route.RouteVisitor; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ActivityVisitor; -import jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.*; +import com.graphhopper.jsprit.core.algorithm.ruin.listener.RuinListener; +import com.graphhopper.jsprit.core.algorithm.ruin.listener.RuinListeners; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.ReverseRouteActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.RouteActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.RouteVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import java.util.*; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateUpdater.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateUpdater.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/StateUpdater.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateUpdater.java index 26237bd8..7c56b646 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateUpdater.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/StateUpdater.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; public interface StateUpdater { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateActivityTimes.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateActivityTimes.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateActivityTimes.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateActivityTimes.java index 175c8701..5a1a17a2 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateActivityTimes.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateActivityTimes.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.cost.ForwardTransportTime; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.util.ActivityTimeTracker; +import com.graphhopper.jsprit.core.problem.cost.ForwardTransportTime; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.util.ActivityTimeTracker; /** diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateEndLocationIfRouteIsOpen.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateEndLocationIfRouteIsOpen.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateEndLocationIfRouteIsOpen.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateEndLocationIfRouteIsOpen.java index 1fbc5002..78bf504f 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateEndLocationIfRouteIsOpen.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateEndLocationIfRouteIsOpen.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.solution.route.RouteVisitor; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.RouteVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; public class UpdateEndLocationIfRouteIsOpen implements StateUpdater, RouteVisitor { diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateFutureWaitingTimes.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateFutureWaitingTimes.java similarity index 83% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateFutureWaitingTimes.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateFutureWaitingTimes.java index 07770758..f90e3942 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateFutureWaitingTimes.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateFutureWaitingTimes.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; /** * Updates and memorizes latest operation start times at activities. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateLoads.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateLoads.java similarity index 86% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateLoads.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateLoads.java index ee8f3355..731bb0c4 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateLoads.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateLoads.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.algorithm.recreate.listener.InsertionStartsListener; -import jsprit.core.algorithm.recreate.listener.JobInsertedListener; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionStartsListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.JobInsertedListener; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingBackwardInRoute.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingBackwardInRoute.java similarity index 87% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingBackwardInRoute.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingBackwardInRoute.java index b186d926..1662f981 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingBackwardInRoute.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingBackwardInRoute.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; /** * Determines and memorizes the maximum capacity utilization at each activity by looking backward in route, diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingForwardInRoute.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingForwardInRoute.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingForwardInRoute.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingForwardInRoute.java index 15b606a7..34742725 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingForwardInRoute.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingForwardInRoute.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; /** - * A {@link ReverseActivityVisitor} that looks forward in the vehicle route and determines + * A {@link com.graphhopper.jsprit.core.problem.solution.route.activity.ReverseActivityVisitor} that looks forward in the vehicle route and determines * the maximum capacity utilization (in terms of loads) at subsequent activities. *

*

Assume a vehicle route with the following activity sequence {start,pickup(1,4),delivery(2,3),pickup(3,2),end} where diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtRoute.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtRoute.java similarity index 87% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtRoute.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtRoute.java index 8ebad292..0dde3ff3 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtRoute.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtRoute.java @@ -16,12 +16,12 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; /** * Updates load at activity level. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdatePracticalTimeWindows.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindows.java similarity index 86% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdatePracticalTimeWindows.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindows.java index 2ed9d99d..bb576476 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdatePracticalTimeWindows.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindows.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; /** * Updates and memorizes latest operation start times at activities. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateSkills.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateSkills.java similarity index 73% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateSkills.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateSkills.java index bafa2484..ce17230a 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateSkills.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateSkills.java @@ -1,9 +1,9 @@ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.Skills; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; /** * Update to update required skills on route diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateVariableCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCosts.java similarity index 88% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateVariableCosts.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCosts.java index 8dddca4b..4c99217a 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateVariableCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCosts.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.cost.ForwardTransportCost; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.util.ActivityTimeTracker; +import com.graphhopper.jsprit.core.problem.cost.ForwardTransportCost; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.util.ActivityTimeTracker; /** diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java index fab7dc9f..6b0aef51 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java @@ -15,14 +15,14 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.solution.route.RouteVisitor; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.solution.route.RouteVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import java.util.Arrays; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/termination/IterationWithoutImprovementTermination.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/IterationWithoutImprovementTermination.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/algorithm/termination/IterationWithoutImprovementTermination.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/IterationWithoutImprovementTermination.java index b424c569..7e00a9ac 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/termination/IterationWithoutImprovementTermination.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/IterationWithoutImprovementTermination.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.termination; +package com.graphhopper.jsprit.core.algorithm.termination; -import jsprit.core.algorithm.SearchStrategy.DiscoveredSolution; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -53,7 +53,7 @@ public class IterationWithoutImprovementTermination implements PrematureAlgorith } @Override - public boolean isPrematureBreak(DiscoveredSolution discoveredSolution) { + public boolean isPrematureBreak(SearchStrategy.DiscoveredSolution discoveredSolution) { if (discoveredSolution.isAccepted()) iterationsWithoutImprovement = 0; else iterationsWithoutImprovement++; return (iterationsWithoutImprovement > noIterationWithoutImprovement); diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/termination/PrematureAlgorithmTermination.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/PrematureAlgorithmTermination.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/algorithm/termination/PrematureAlgorithmTermination.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/PrematureAlgorithmTermination.java index 858f0459..1b42a7f1 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/termination/PrematureAlgorithmTermination.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/PrematureAlgorithmTermination.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.termination; +package com.graphhopper.jsprit.core.algorithm.termination; -import jsprit.core.algorithm.SearchStrategy.DiscoveredSolution; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy.DiscoveredSolution; /** * Basic interface for prematureTermination. diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/termination/TimeTermination.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/TimeTermination.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/algorithm/termination/TimeTermination.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/TimeTermination.java index 2081548a..4c157ab7 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/termination/TimeTermination.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/TimeTermination.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.termination; +package com.graphhopper.jsprit.core.algorithm.termination; -import jsprit.core.algorithm.SearchStrategy.DiscoveredSolution; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.listener.AlgorithmStartsListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -82,7 +82,7 @@ public class TimeTermination implements PrematureAlgorithmTermination, Algorithm } @Override - public boolean isPrematureBreak(DiscoveredSolution discoveredSolution) { + public boolean isPrematureBreak(SearchStrategy.DiscoveredSolution discoveredSolution) { return (now() - startTime) > timeThreshold; } diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/termination/VariationCoefficientTermination.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/VariationCoefficientTermination.java similarity index 87% rename from jsprit-core/src/main/java/jsprit/core/algorithm/termination/VariationCoefficientTermination.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/VariationCoefficientTermination.java index df47369e..6ed64194 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/termination/VariationCoefficientTermination.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/VariationCoefficientTermination.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.termination; +package com.graphhopper.jsprit.core.algorithm.termination; -import jsprit.core.algorithm.SearchStrategy.DiscoveredSolution; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.listener.AlgorithmStartsListener; -import jsprit.core.algorithm.listener.IterationEndsListener; -import jsprit.core.algorithm.listener.IterationStartsListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; +import com.graphhopper.jsprit.core.algorithm.listener.IterationEndsListener; +import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.util.Solutions; import org.apache.commons.math.stat.StatUtils; import org.apache.commons.math.stat.descriptive.moment.StandardDeviation; import org.apache.logging.log4j.LogManager; @@ -80,7 +80,7 @@ public class VariationCoefficientTermination implements PrematureAlgorithmTermin } @Override - public boolean isPrematureBreak(DiscoveredSolution discoveredSolution) { + public boolean isPrematureBreak(SearchStrategy.DiscoveredSolution discoveredSolution) { if (discoveredSolution.isAccepted()) { lastAccepted = discoveredSolution.getSolution(); solutionValues[currentIteration] = discoveredSolution.getSolution().getCost(); diff --git a/jsprit-core/src/main/java/jsprit/core/analysis/SolutionAnalyser.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java similarity index 98% rename from jsprit-core/src/main/java/jsprit/core/analysis/SolutionAnalyser.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java index 655e9d5b..1453e334 100644 --- a/jsprit-core/src/main/java/jsprit/core/analysis/SolutionAnalyser.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java @@ -15,20 +15,20 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.analysis; +package com.graphhopper.jsprit.core.analysis; -import jsprit.core.algorithm.VariablePlusFixedSolutionCostCalculatorFactory; -import jsprit.core.algorithm.state.*; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.cost.TransportDistance; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.*; -import jsprit.core.util.ActivityTimeTracker; +import com.graphhopper.jsprit.core.algorithm.VariablePlusFixedSolutionCostCalculatorFactory; +import com.graphhopper.jsprit.core.algorithm.state.*; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.cost.TransportDistance; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.*; +import com.graphhopper.jsprit.core.util.ActivityTimeTracker; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/AbstractActivity.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/AbstractActivity.java similarity index 68% rename from jsprit-core/src/main/java/jsprit/core/problem/AbstractActivity.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/AbstractActivity.java index 736ae2a5..9e2dd67f 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/AbstractActivity.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/AbstractActivity.java @@ -1,6 +1,6 @@ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; /** * Created by schroeder on 14.07.14. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/AbstractJob.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/AbstractJob.java similarity index 72% rename from jsprit-core/src/main/java/jsprit/core/problem/AbstractJob.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/AbstractJob.java index 558bdb05..a4505f50 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/AbstractJob.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/AbstractJob.java @@ -1,6 +1,6 @@ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; -import jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Job; /** * Created by schroeder on 14.07.14. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/AbstractVehicle.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/AbstractVehicle.java similarity index 82% rename from jsprit-core/src/main/java/jsprit/core/problem/AbstractVehicle.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/AbstractVehicle.java index d8414362..37826474 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/AbstractVehicle.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/AbstractVehicle.java @@ -1,7 +1,7 @@ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleTypeKey; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeKey; /** * AbstractVehicle to handle indeces of vehicles. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/Capacity.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/Capacity.java similarity index 99% rename from jsprit-core/src/main/java/jsprit/core/problem/Capacity.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/Capacity.java index dc7c7e30..d7af1a5e 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/Capacity.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/Capacity.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; /** * Capacity with an arbitrary number of capacity-dimension. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/HasId.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/HasId.java similarity index 69% rename from jsprit-core/src/main/java/jsprit/core/problem/HasId.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/HasId.java index 04fe8c45..48808b81 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/HasId.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/HasId.java @@ -1,4 +1,4 @@ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; /** * Created by schroeder on 14.07.14. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/HasIndex.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/HasIndex.java similarity index 70% rename from jsprit-core/src/main/java/jsprit/core/problem/HasIndex.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/HasIndex.java index cd0f8529..2dfc6947 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/HasIndex.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/HasIndex.java @@ -1,4 +1,4 @@ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; /** * Created by schroeder on 14.07.14. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/JobActivityFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/JobActivityFactory.java similarity index 68% rename from jsprit-core/src/main/java/jsprit/core/problem/JobActivityFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/JobActivityFactory.java index 82fae577..b64ca1db 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/JobActivityFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/JobActivityFactory.java @@ -1,6 +1,6 @@ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; -import jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Job; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/Location.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/Location.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/problem/Location.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/Location.java index e9ba31cf..58c33903 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/Location.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/Location.java @@ -15,9 +15,9 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Coordinate; /** * Created by schroeder on 16.12.14. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/Skills.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/Skills.java similarity index 98% rename from jsprit-core/src/main/java/jsprit/core/problem/Skills.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/Skills.java index ba5d255f..c75f3aa1 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/Skills.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/Skills.java @@ -15,7 +15,7 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; import java.util.Collection; import java.util.Collections; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java index 4c1d516f..26786188 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java @@ -14,26 +14,25 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.cost.WaitingTimeCosts; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.BreakActivity; -import jsprit.core.problem.solution.route.activity.DefaultShipmentActivityFactory; -import jsprit.core.problem.solution.route.activity.DefaultTourActivityFactory; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.problem.vehicle.VehicleTypeKey; -import jsprit.core.util.Coordinate; -import jsprit.core.util.CrowFlyCosts; -import jsprit.core.util.Locations; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.WaitingTimeCosts; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.BreakActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.DefaultShipmentActivityFactory; +import com.graphhopper.jsprit.core.problem.solution.route.activity.DefaultTourActivityFactory; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeKey; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.CrowFlyCosts; +import com.graphhopper.jsprit.core.util.Locations; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -630,7 +629,7 @@ public class VehicleRoutingProblem { * Returns the entire, unmodifiable collection of types. * * @return unmodifiable collection of types - * @see VehicleTypeImpl + * @see com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl */ public Collection getTypes() { return Collections.unmodifiableCollection(vehicleTypes); diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/AdditionalTransportationCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/AdditionalTransportationCosts.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/AdditionalTransportationCosts.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/AdditionalTransportationCosts.java index 777716e3..3a112f4e 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/AdditionalTransportationCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/AdditionalTransportationCosts.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.util.CalculationUtils; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.util.CalculationUtils; /** * Calculates additional transportation costs induced by inserting newAct. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/Constraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/Constraint.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/Constraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/Constraint.java index 41aed9c5..942abed2 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/Constraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/Constraint.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; public interface Constraint { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/ConstraintManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ConstraintManager.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/ConstraintManager.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ConstraintManager.java index 65b2212c..c4f80430 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/ConstraintManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ConstraintManager.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -64,14 +64,14 @@ public class ConstraintManager implements HardActivityConstraint, HardRouteConst this.stateManager = stateManager; } - public ConstraintManager(VehicleRoutingProblem vrp, RouteAndActivityStateGetter stateManager, Collection constraints) { + public ConstraintManager(VehicleRoutingProblem vrp, RouteAndActivityStateGetter stateManager, Collection constraints) { this.vrp = vrp; this.stateManager = stateManager; resolveConstraints(constraints); } - private void resolveConstraints(Collection constraints) { - for (jsprit.core.problem.constraint.Constraint c : constraints) { + private void resolveConstraints(Collection constraints) { + for (Constraint c : constraints) { boolean constraintTypeKnown = false; if (c instanceof HardActivityConstraint) { actLevelConstraintManager.addConstraint((HardActivityConstraint) c, Priority.HIGH); @@ -148,8 +148,8 @@ public class ConstraintManager implements HardActivityConstraint, HardRouteConst return actLevelConstraintManager.fulfilled(iFacts, prevAct, newAct, nextAct, prevActDepTime); } - public Collection getConstraints() { - List constraints = new ArrayList(); + public Collection getConstraints() { + List constraints = new ArrayList(); constraints.addAll(actLevelConstraintManager.getAllConstraints()); constraints.addAll(routeLevelConstraintManager.getConstraints()); constraints.addAll(softActivityConstraintManager.getConstraints()); diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardActivityConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardActivityConstraint.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/HardActivityConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardActivityConstraint.java index a11cfbd7..ec7317f1 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardActivityConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardActivityConstraint.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; /** * Hard constraint that evaluates whether a new activity can be inserted between an activity segment (prevAct,nextAct). diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardActivityLevelConstraintManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardActivityLevelConstraintManager.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/HardActivityLevelConstraintManager.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardActivityLevelConstraintManager.java index 608a31a8..e9b87168 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardActivityLevelConstraintManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardActivityLevelConstraintManager.java @@ -14,11 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.constraint.ConstraintManager.Priority; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import java.util.ArrayList; import java.util.Collection; @@ -34,10 +33,10 @@ class HardActivityLevelConstraintManager implements HardActivityConstraint { private Collection lowPrioConstraints = new ArrayList(); - public void addConstraint(HardActivityConstraint constraint, Priority priority) { - if (priority.equals(Priority.CRITICAL)) { + public void addConstraint(HardActivityConstraint constraint, ConstraintManager.Priority priority) { + if (priority.equals(ConstraintManager.Priority.CRITICAL)) { criticalConstraints.add(constraint); - } else if (priority.equals(Priority.HIGH)) { + } else if (priority.equals(ConstraintManager.Priority.HIGH)) { highPrioConstraints.add(constraint); } else { lowPrioConstraints.add(constraint); diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardConstraint.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/HardConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardConstraint.java index 39f10844..550145e9 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardConstraint.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; public interface HardConstraint extends Constraint { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardRouteConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardRouteConstraint.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/HardRouteConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardRouteConstraint.java index 20068cd4..24d3ac29 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardRouteConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardRouteConstraint.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; /** * Hard constraint that evaluates whether a new job (insertionContext.getJob()) can be inserted diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardRouteLevelConstraintManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardRouteLevelConstraintManager.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/HardRouteLevelConstraintManager.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardRouteLevelConstraintManager.java index dc51465a..93b7b23f 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardRouteLevelConstraintManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardRouteLevelConstraintManager.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardSkillConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardSkillConstraint.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/HardSkillConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardSkillConstraint.java index 9ba8ab5e..e6be1358 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/HardSkillConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/HardSkillConstraint.java @@ -15,12 +15,12 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.Skills; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; /** * SkillConstraint that ensures that only vehicles with according skills can serve route and job to be inserted. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/PickupAndDeliverShipmentLoadActivityLevelConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/PickupAndDeliverShipmentLoadActivityLevelConstraint.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/PickupAndDeliverShipmentLoadActivityLevelConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/PickupAndDeliverShipmentLoadActivityLevelConstraint.java index 7a5fdb59..8e3bdbdf 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/PickupAndDeliverShipmentLoadActivityLevelConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/PickupAndDeliverShipmentLoadActivityLevelConstraint.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.DeliverShipment; -import jsprit.core.problem.solution.route.activity.PickupShipment; -import jsprit.core.problem.solution.route.activity.Start; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.DeliverShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.Start; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; /** diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/ServiceDeliveriesFirstConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ServiceDeliveriesFirstConstraint.java similarity index 92% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/ServiceDeliveriesFirstConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ServiceDeliveriesFirstConstraint.java index 334f3ef7..5221abb9 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/ServiceDeliveriesFirstConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ServiceDeliveriesFirstConstraint.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.*; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.*; public class ServiceDeliveriesFirstConstraint implements HardActivityConstraint { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/ServiceLoadActivityLevelConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ServiceLoadActivityLevelConstraint.java similarity index 88% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/ServiceLoadActivityLevelConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ServiceLoadActivityLevelConstraint.java index 3d45b3d0..007586a5 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/ServiceLoadActivityLevelConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ServiceLoadActivityLevelConstraint.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.*; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.*; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; /** diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraint.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraint.java index deb92d45..6f7ad33f 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraint.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; /** * Ensures that capacity constraint is met, i.e. that current load plus diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/ShipmentPickupsFirstConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ShipmentPickupsFirstConstraint.java similarity index 79% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/ShipmentPickupsFirstConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ShipmentPickupsFirstConstraint.java index fb9421f6..5ab372db 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/ShipmentPickupsFirstConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ShipmentPickupsFirstConstraint.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.DeliverShipment; -import jsprit.core.problem.solution.route.activity.PickupShipment; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.DeliverShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; public class ShipmentPickupsFirstConstraint implements HardActivityConstraint { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftActivityConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftActivityConstraint.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftActivityConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftActivityConstraint.java index 4694044c..026ee17b 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftActivityConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftActivityConstraint.java @@ -16,10 +16,10 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; public interface SoftActivityConstraint extends SoftConstraint { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftActivityConstraintManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftActivityConstraintManager.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftActivityConstraintManager.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftActivityConstraintManager.java index f2dfd02e..43133364 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftActivityConstraintManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftActivityConstraintManager.java @@ -16,10 +16,10 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftConstraint.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftConstraint.java index 97a7ceb0..d39d9175 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftConstraint.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; public interface SoftConstraint extends Constraint { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftRouteConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftRouteConstraint.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftRouteConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftRouteConstraint.java index f673c128..12a5a039 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftRouteConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftRouteConstraint.java @@ -16,9 +16,9 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; public interface SoftRouteConstraint extends SoftConstraint { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftRouteConstraintManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftRouteConstraintManager.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftRouteConstraintManager.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftRouteConstraintManager.java index 89a53853..8d9a60ad 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftRouteConstraintManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SoftRouteConstraintManager.java @@ -16,9 +16,9 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SwitchNotFeasible.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SwitchNotFeasible.java similarity index 74% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/SwitchNotFeasible.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SwitchNotFeasible.java index c0ad04a2..4d019ee3 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/SwitchNotFeasible.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/SwitchNotFeasible.java @@ -1,8 +1,8 @@ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; /** * Created by schroeder on 19/09/15. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/TimeWindowConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/TimeWindowConstraint.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/TimeWindowConstraint.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/TimeWindowConstraint.java index 6b09061d..9a6f6a33 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/TimeWindowConstraint.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/TimeWindowConstraint.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.util.CalculationUtils; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.util.CalculationUtils; /** diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java index e8a93a6e..f48806e7 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java @@ -15,16 +15,16 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.util.CalculationUtils; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.util.CalculationUtils; /** diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/AbstractForwardVehicleRoutingTransportCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/AbstractForwardVehicleRoutingTransportCosts.java similarity index 88% rename from jsprit-core/src/main/java/jsprit/core/problem/cost/AbstractForwardVehicleRoutingTransportCosts.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/AbstractForwardVehicleRoutingTransportCosts.java index 57750d30..f3cdfed1 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/cost/AbstractForwardVehicleRoutingTransportCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/AbstractForwardVehicleRoutingTransportCosts.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.cost; +package com.graphhopper.jsprit.core.problem.cost; -import jsprit.core.problem.Location; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; public abstract class AbstractForwardVehicleRoutingTransportCosts implements VehicleRoutingTransportCosts { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/BackwardTransportCost.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/BackwardTransportCost.java similarity index 82% rename from jsprit-core/src/main/java/jsprit/core/problem/cost/BackwardTransportCost.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/BackwardTransportCost.java index a586aa01..09230caa 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/cost/BackwardTransportCost.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/BackwardTransportCost.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.cost; +package com.graphhopper.jsprit.core.problem.cost; -import jsprit.core.problem.Location; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; public interface BackwardTransportCost { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/BackwardTransportTime.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/BackwardTransportTime.java similarity index 82% rename from jsprit-core/src/main/java/jsprit/core/problem/cost/BackwardTransportTime.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/BackwardTransportTime.java index 849a7e5b..039873fd 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/cost/BackwardTransportTime.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/BackwardTransportTime.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.cost; +package com.graphhopper.jsprit.core.problem.cost; -import jsprit.core.problem.Location; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; public interface BackwardTransportTime { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/ForwardTransportCost.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/ForwardTransportCost.java similarity index 82% rename from jsprit-core/src/main/java/jsprit/core/problem/cost/ForwardTransportCost.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/ForwardTransportCost.java index 53cd9a04..3a87016c 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/cost/ForwardTransportCost.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/ForwardTransportCost.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.cost; +package com.graphhopper.jsprit.core.problem.cost; -import jsprit.core.problem.Location; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; public interface ForwardTransportCost { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/ForwardTransportTime.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/ForwardTransportTime.java similarity index 82% rename from jsprit-core/src/main/java/jsprit/core/problem/cost/ForwardTransportTime.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/ForwardTransportTime.java index c77232bd..f990c98e 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/cost/ForwardTransportTime.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/ForwardTransportTime.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.cost; +package com.graphhopper.jsprit.core.problem.cost; -import jsprit.core.problem.Location; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; public interface ForwardTransportTime { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/TransportCost.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportCost.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/problem/cost/TransportCost.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportCost.java index c4375be2..7ce09f25 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/cost/TransportCost.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportCost.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.cost; +package com.graphhopper.jsprit.core.problem.cost; public interface TransportCost extends ForwardTransportCost, BackwardTransportCost { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/TransportDistance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportDistance.java similarity index 58% rename from jsprit-core/src/main/java/jsprit/core/problem/cost/TransportDistance.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportDistance.java index e33c3044..b5c0857f 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/cost/TransportDistance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportDistance.java @@ -1,6 +1,6 @@ -package jsprit.core.problem.cost; +package com.graphhopper.jsprit.core.problem.cost; -import jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.Location; /** * Created by schroeder on 23/12/14. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/TransportTime.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportTime.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/problem/cost/TransportTime.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportTime.java index 077f9bd0..02b03745 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/cost/TransportTime.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportTime.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.cost; +package com.graphhopper.jsprit.core.problem.cost; public interface TransportTime extends ForwardTransportTime, BackwardTransportTime { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java index ec9ea858..c19962de 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.cost; +package com.graphhopper.jsprit.core.problem.cost; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** * Interface for overall routing and operation costs. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/VehicleRoutingTransportCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/VehicleRoutingTransportCosts.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/problem/cost/VehicleRoutingTransportCosts.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/VehicleRoutingTransportCosts.java index 2d4ef280..ece0ce42 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/cost/VehicleRoutingTransportCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/VehicleRoutingTransportCosts.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.cost; +package com.graphhopper.jsprit.core.problem.cost; /** diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/WaitingTimeCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/WaitingTimeCosts.java similarity index 72% rename from jsprit-core/src/main/java/jsprit/core/problem/cost/WaitingTimeCosts.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/WaitingTimeCosts.java index 73b9a35a..9eba596f 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/cost/WaitingTimeCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/WaitingTimeCosts.java @@ -1,8 +1,8 @@ -package jsprit.core.problem.cost; +package com.graphhopper.jsprit.core.problem.cost; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** * Created by schroeder on 23/07/15. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/driver/Driver.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/driver/Driver.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/problem/driver/Driver.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/driver/Driver.java index da06de59..7f6261e1 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/driver/Driver.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/driver/Driver.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.driver; +package com.graphhopper.jsprit.core.problem.driver; public interface Driver { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/driver/DriverImpl.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/driver/DriverImpl.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/problem/driver/DriverImpl.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/driver/DriverImpl.java index bc8d6c97..35aa18c3 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/driver/DriverImpl.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/driver/DriverImpl.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.driver; +package com.graphhopper.jsprit.core.problem.driver; public class DriverImpl implements Driver { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/io/Schema.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/Schema.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/problem/io/Schema.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/Schema.java index d7edc5cc..8492eff5 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/io/Schema.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/Schema.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.io; +package com.graphhopper.jsprit.core.problem.io; final class Schema { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLReader.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLReader.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLReader.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLReader.java index aad52d1f..2a0a9f33 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLReader.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLReader.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.io; +package com.graphhopper.jsprit.core.problem.io; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.driver.DriverImpl; -import jsprit.core.problem.job.*; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TourActivityFactory; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Resource; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl; +import com.graphhopper.jsprit.core.problem.job.*; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivityFactory; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Resource; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.commons.configuration.XMLConfiguration; @@ -55,7 +55,7 @@ public class VrpXMLReader { static class DefaultServiceBuilderFactory implements ServiceBuilderFactory { @Override - public jsprit.core.problem.job.Service.Builder createBuilder(String serviceType, String id, Integer size) { + public Service.Builder createBuilder(String serviceType, String id, Integer size) { if (serviceType.equals("pickup")) { if (size != null) return Pickup.Builder.newInstance(id).addSizeDimension(0, size); else return Pickup.Builder.newInstance(id); diff --git a/jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLWriter.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLWriter.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLWriter.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLWriter.java index f06aa2a1..f533c701 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLWriter.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLWriter.java @@ -14,20 +14,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.io; +package com.graphhopper.jsprit.core.problem.io; -import jsprit.core.problem.Location; -import jsprit.core.problem.Skills; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.XMLConfiguration; import org.apache.logging.log4j.LogManager; @@ -143,8 +142,8 @@ public class VrpXMLWriter { int actCounter = 0; for (TourActivity act : route.getTourActivities().getActivities()) { xmlConfig.setProperty(path + "(" + routeCounter + ").act(" + actCounter + ")[@type]", act.getName()); - if (act instanceof JobActivity) { - Job job = ((JobActivity) act).getJob(); + if (act instanceof TourActivity.JobActivity) { + Job job = ((TourActivity.JobActivity) act).getJob(); if (job instanceof Service) { xmlConfig.setProperty(path + "(" + routeCounter + ").act(" + actCounter + ").serviceId", job.getId()); } else if (job instanceof Shipment) { @@ -178,8 +177,8 @@ public class VrpXMLWriter { int actCounter = 0; for (TourActivity act : route.getTourActivities().getActivities()) { xmlConfig.setProperty(solutionPath + "(" + counter + ").routes.route(" + routeCounter + ").act(" + actCounter + ")[@type]", act.getName()); - if (act instanceof JobActivity) { - Job job = ((JobActivity) act).getJob(); + if (act instanceof TourActivity.JobActivity) { + Job job = ((TourActivity.JobActivity) act).getJob(); if (job instanceof Service) { xmlConfig.setProperty(solutionPath + "(" + counter + ").routes.route(" + routeCounter + ").act(" + actCounter + ").serviceId", job.getId()); } else if (job instanceof Shipment) { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/job/Break.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Break.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/problem/job/Break.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Break.java index d0921ff2..295b5d0f 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/job/Break.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Break.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.job; +package com.graphhopper.jsprit.core.problem.job; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Skills; /** * Pickup extends Service and is intended to model a Service where smth is LOADED (i.e. picked up) to a transport unit. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/job/Delivery.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Delivery.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/problem/job/Delivery.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Delivery.java index 8a95f69a..dda0df4f 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/job/Delivery.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Delivery.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.job; +package com.graphhopper.jsprit.core.problem.job; /** diff --git a/jsprit-core/src/main/java/jsprit/core/problem/job/Job.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Job.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/problem/job/Job.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Job.java index cdd57702..fd9d9517 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/job/Job.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Job.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.job; +package com.graphhopper.jsprit.core.problem.job; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.HasId; -import jsprit.core.problem.HasIndex; -import jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.HasId; +import com.graphhopper.jsprit.core.problem.HasIndex; +import com.graphhopper.jsprit.core.problem.Skills; /** * Basic interface for all jobs. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/job/Pickup.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Pickup.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/problem/job/Pickup.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Pickup.java index ce3e05ff..20ccad25 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/job/Pickup.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Pickup.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.job; +package com.graphhopper.jsprit.core.problem.job; /** diff --git a/jsprit-core/src/main/java/jsprit/core/problem/job/Service.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Service.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/problem/job/Service.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Service.java index bc0bc6ce..2da00146 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/job/Service.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Service.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.job; +package com.graphhopper.jsprit.core.problem.job; -import jsprit.core.problem.AbstractJob; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.Skills; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TimeWindows; -import jsprit.core.problem.solution.route.activity.TimeWindowsImpl; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.problem.AbstractJob; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindows; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindowsImpl; +import com.graphhopper.jsprit.core.util.Coordinate; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/job/Shipment.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/problem/job/Shipment.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java index 7d3bc0d3..a339dcb8 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/job/Shipment.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.job; +package com.graphhopper.jsprit.core.problem.job; -import jsprit.core.problem.AbstractJob; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.Skills; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TimeWindowsImpl; +import com.graphhopper.jsprit.core.problem.AbstractJob; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindowsImpl; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/misc/ActivityContext.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/misc/ActivityContext.java similarity index 98% rename from jsprit-core/src/main/java/jsprit/core/problem/misc/ActivityContext.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/misc/ActivityContext.java index 935a250a..5335bd53 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/misc/ActivityContext.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/misc/ActivityContext.java @@ -15,7 +15,7 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.misc; +package com.graphhopper.jsprit.core.problem.misc; /** * Provides insertion context information about a particular activity. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/misc/JobInsertionContext.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/misc/JobInsertionContext.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/problem/misc/JobInsertionContext.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/misc/JobInsertionContext.java index eb074366..23a097f8 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/misc/JobInsertionContext.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/misc/JobInsertionContext.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.misc; +package com.graphhopper.jsprit.core.problem.misc; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import java.util.ArrayList; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/InitialSolutionFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/InitialSolutionFactory.java similarity index 78% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/InitialSolutionFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/InitialSolutionFactory.java index 7153269d..06583e39 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/InitialSolutionFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/InitialSolutionFactory.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution; +package com.graphhopper.jsprit.core.problem.solution; -import jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; /** - * Interface for all factories that create initial solutions for the specified {@link VehicleRoutingProblem}. + * Interface for all factories that create initial solutions for the specified {@link com.graphhopper.jsprit.core.problem.VehicleRoutingProblem}. * * @author schroeder */ public interface InitialSolutionFactory { /** - * Creates an initial solution for the specified {@link VehicleRoutingProblem}. + * Creates an initial solution for the specified {@link com.graphhopper.jsprit.core.problem.VehicleRoutingProblem}. * * @param vrp * @return diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/SolutionCostCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/SolutionCostCalculator.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/SolutionCostCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/SolutionCostCalculator.java index ef454286..5911b6ac 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/SolutionCostCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/SolutionCostCalculator.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution; +package com.graphhopper.jsprit.core.problem.solution; /** * Interface for all solutionCostCalculators which should be the objective-functions of the problem. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/VehicleRoutingProblemSolution.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/VehicleRoutingProblemSolution.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/VehicleRoutingProblemSolution.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/VehicleRoutingProblemSolution.java index b5aeaf50..ee1cda55 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/VehicleRoutingProblemSolution.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/VehicleRoutingProblemSolution.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution; +package com.graphhopper.jsprit.core.problem.solution; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/ReverseRouteActivityVisitor.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/ReverseRouteActivityVisitor.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/ReverseRouteActivityVisitor.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/ReverseRouteActivityVisitor.java index f9234abe..b3969cf5 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/ReverseRouteActivityVisitor.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/ReverseRouteActivityVisitor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route; +package com.graphhopper.jsprit.core.problem.solution.route; -import jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/RouteActivityVisitor.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/RouteActivityVisitor.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/RouteActivityVisitor.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/RouteActivityVisitor.java index 1faa16c4..5f56f41a 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/RouteActivityVisitor.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/RouteActivityVisitor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route; +package com.graphhopper.jsprit.core.problem.solution.route; -import jsprit.core.problem.solution.route.activity.ActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/RouteVisitor.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/RouteVisitor.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/RouteVisitor.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/RouteVisitor.java index 78559542..5192aedb 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/RouteVisitor.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/RouteVisitor.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route; +package com.graphhopper.jsprit.core.problem.solution.route; public interface RouteVisitor { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/VehicleRoute.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/VehicleRoute.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/VehicleRoute.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/VehicleRoute.java index 857b0323..85a56c3c 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/VehicleRoute.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/VehicleRoute.java @@ -14,17 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route; +package com.graphhopper.jsprit.core.problem.solution.route; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.driver.DriverImpl; -import jsprit.core.problem.job.*; -import jsprit.core.problem.solution.route.activity.*; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.NoVehicle; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl; +import com.graphhopper.jsprit.core.problem.job.*; +import com.graphhopper.jsprit.core.problem.solution.route.activity.*; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import java.util.*; @@ -431,7 +430,7 @@ public class VehicleRoute { } private void setStartAndEnd(Vehicle vehicle, double vehicleDepTime) { - if (!(vehicle instanceof NoVehicle)) { + if (!(vehicle instanceof VehicleImpl.NoVehicle)) { if (start == null && end == null) { start = new Start(vehicle.getStartLocation(), vehicle.getEarliestDeparture(), vehicle.getLatestArrival()); end = new End(vehicle.getEndLocation(), vehicle.getEarliestDeparture(), vehicle.getLatestArrival()); diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Activities.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/Activities.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Activities.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/Activities.java index 16218831..f39516cf 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Activities.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/Activities.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; class Activities { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityStartAsSoonAsArrived.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityStartAsSoonAsArrived.java similarity index 78% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityStartAsSoonAsArrived.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityStartAsSoonAsArrived.java index 957de835..134703fd 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityStartAsSoonAsArrived.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityStartAsSoonAsArrived.java @@ -1,4 +1,4 @@ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; /** * Created by schroeder on 08/07/15. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityStartStrategy.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityStartStrategy.java similarity index 71% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityStartStrategy.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityStartStrategy.java index 937f4602..51a3d9e4 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityStartStrategy.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityStartStrategy.java @@ -1,4 +1,4 @@ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; /** * Created by schroeder on 08/07/15. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityStartsAsSoonAsTimeWindowOpens.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityStartsAsSoonAsTimeWindowOpens.java similarity index 82% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityStartsAsSoonAsTimeWindowOpens.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityStartsAsSoonAsTimeWindowOpens.java index 40f7d0c4..f0a35948 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityStartsAsSoonAsTimeWindowOpens.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityStartsAsSoonAsTimeWindowOpens.java @@ -1,4 +1,4 @@ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; /** * Created by schroeder on 08/07/15. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityVisitor.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityVisitor.java similarity index 87% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityVisitor.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityVisitor.java index e319df66..1d45062d 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ActivityVisitor.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ActivityVisitor.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; public interface ActivityVisitor { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/BreakActivity.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/BreakActivity.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/BreakActivity.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/BreakActivity.java index 5b70c91f..725f96b1 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/BreakActivity.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/BreakActivity.java @@ -14,16 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Service; -public class BreakActivity extends AbstractActivity implements JobActivity { +public class BreakActivity extends AbstractActivity implements TourActivity.JobActivity { public static int counter = 0; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactory.java similarity index 87% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactory.java index c99b3670..f904d71f 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactory.java @@ -16,10 +16,10 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.job.Shipment; public class DefaultShipmentActivityFactory implements TourShipmentActivityFactory { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactory.java similarity index 82% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactory.java index bb6207dc..37ea4bf6 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactory.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Service; public class DefaultTourActivityFactory implements TourActivityFactory { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverService.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverService.java similarity index 92% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverService.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverService.java index 4c94ed8f..3fa4c317 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverService.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverService.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Delivery; public final class DeliverService extends AbstractActivity implements DeliveryActivity { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverShipment.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverShipment.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverShipment.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverShipment.java index 0987e752..700686b0 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverShipment.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverShipment.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Shipment; public final class DeliverShipment extends AbstractActivity implements DeliveryActivity { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliveryActivity.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliveryActivity.java similarity index 82% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliveryActivity.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliveryActivity.java index 958ea785..6b8f6439 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliveryActivity.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliveryActivity.java @@ -14,11 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; - -public interface DeliveryActivity extends JobActivity { +public interface DeliveryActivity extends TourActivity.JobActivity { } diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/End.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/End.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/End.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/End.java index 648ae686..77fea323 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/End.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/End.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.util.Coordinate; public final class End extends AbstractActivity implements TourActivity { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupActivity.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupActivity.java similarity index 82% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupActivity.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupActivity.java index 44de9b0c..13563dc7 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupActivity.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupActivity.java @@ -14,11 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; - -public interface PickupActivity extends JobActivity { +public interface PickupActivity extends TourActivity.JobActivity { } diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupService.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupService.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupService.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupService.java index 40854dfe..209461a8 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupService.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupService.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Service; public final class PickupService extends AbstractActivity implements PickupActivity { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupShipment.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupShipment.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupShipment.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupShipment.java index 27ebe7b2..000f6090 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupShipment.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupShipment.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Shipment; public final class PickupShipment extends AbstractActivity implements PickupActivity{ diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ReverseActivityVisitor.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ReverseActivityVisitor.java similarity index 88% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ReverseActivityVisitor.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ReverseActivityVisitor.java index c9706204..2894ff74 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ReverseActivityVisitor.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ReverseActivityVisitor.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; public interface ReverseActivityVisitor { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ServiceActivity.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ServiceActivity.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ServiceActivity.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ServiceActivity.java index eb0ad2b7..38241dbe 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ServiceActivity.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ServiceActivity.java @@ -14,15 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Service; -public class ServiceActivity extends AbstractActivity implements JobActivity { +public class ServiceActivity extends AbstractActivity implements TourActivity.JobActivity { @Deprecated public static int counter = 0; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Start.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/Start.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Start.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/Start.java index f0f72345..d0ac8d87 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/Start.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/Start.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; public final class Start extends AbstractActivity implements TourActivity { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TimeWindow.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindow.java similarity index 98% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TimeWindow.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindow.java index 933956ec..5ff7115b 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TimeWindow.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindow.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; /** * TimeWindow consists of a startTime and endTime. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TimeWindows.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindows.java similarity index 70% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TimeWindows.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindows.java index ceeda7c1..b4e482fa 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TimeWindows.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindows.java @@ -1,4 +1,4 @@ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TimeWindowsImpl.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindowsImpl.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TimeWindowsImpl.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindowsImpl.java index e449004f..bd9c899e 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TimeWindowsImpl.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindowsImpl.java @@ -1,4 +1,4 @@ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourActivities.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivities.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourActivities.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivities.java index 946dbe73..1984db81 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourActivities.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivities.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; import java.util.*; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourActivity.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivity.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourActivity.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivity.java index 320a1eec..b17f0fbd 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourActivity.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivity.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.HasIndex; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.HasIndex; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Job; /** * Basic interface for tour-activities. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourActivityFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivityFactory.java similarity index 84% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourActivityFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivityFactory.java index e49be3d0..d42efa54 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourActivityFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivityFactory.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.job.Service; public interface TourActivityFactory { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourShipmentActivityFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourShipmentActivityFactory.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourShipmentActivityFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourShipmentActivityFactory.java index b9b3dde0..de492f26 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/TourShipmentActivityFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourShipmentActivityFactory.java @@ -16,10 +16,10 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.job.Shipment; public interface TourShipmentActivityFactory { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/state/RouteAndActivityStateGetter.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/state/RouteAndActivityStateGetter.java similarity index 79% rename from jsprit-core/src/main/java/jsprit/core/problem/solution/route/state/RouteAndActivityStateGetter.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/state/RouteAndActivityStateGetter.java index f7f35b43..33f530e6 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/state/RouteAndActivityStateGetter.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/state/RouteAndActivityStateGetter.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.state; +package com.graphhopper.jsprit.core.problem.solution.route.state; -import jsprit.core.algorithm.state.StateId; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.algorithm.state.StateId; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; public interface RouteAndActivityStateGetter { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java index 5127ffbe..adabb440 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import java.util.Collection; import java.util.Random; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java index 3a0f4b09..99867776 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteVehicles.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/InfiniteVehicles.java similarity index 98% rename from jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteVehicles.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/InfiniteVehicles.java index df60c65b..24cdc29f 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteVehicles.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/InfiniteVehicles.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/Vehicle.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/Vehicle.java similarity index 87% rename from jsprit-core/src/main/java/jsprit/core/problem/vehicle/Vehicle.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/Vehicle.java index 0ab8fbf7..09b72aaa 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/Vehicle.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/Vehicle.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; -import jsprit.core.problem.HasId; -import jsprit.core.problem.HasIndex; -import jsprit.core.problem.Location; -import jsprit.core.problem.Skills; -import jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.HasId; +import com.graphhopper.jsprit.core.problem.HasIndex; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.job.Break; /** * Basic interface for vehicle-data. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleFleetManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManager.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleFleetManager.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManager.java index 7fefb989..c1167857 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleFleetManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManager.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleFleetManagerFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerFactory.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleFleetManagerFactory.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerFactory.java index 834cb69f..b2abc042 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleFleetManagerFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerFactory.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; public interface VehicleFleetManagerFactory { diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java index 209f2d0f..380f0523 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java @@ -14,10 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; -import jsprit.core.problem.vehicle.VehicleImpl.NoVehicle; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -173,7 +172,7 @@ class VehicleFleetManagerImpl implements VehicleFleetManager { */ @Override public void lock(Vehicle vehicle) { - if (vehicles.isEmpty() || vehicle instanceof NoVehicle) { + if (vehicles.isEmpty() || vehicle instanceof VehicleImpl.NoVehicle) { return; } if(locked[vehicle.getIndex()]){ @@ -190,7 +189,7 @@ class VehicleFleetManagerImpl implements VehicleFleetManager { */ @Override public void unlock(Vehicle vehicle) { - if (vehicle == null || vehicles.isEmpty() || vehicle instanceof NoVehicle) { + if (vehicle == null || vehicles.isEmpty() || vehicle instanceof VehicleImpl.NoVehicle) { return; } locked[vehicle.getIndex()] = false; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleImpl.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleImpl.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java index 5a0c115f..930bbd84 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleImpl.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; -import jsprit.core.problem.AbstractVehicle; -import jsprit.core.problem.Location; -import jsprit.core.problem.Skills; -import jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.AbstractVehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.job.Break; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleType.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleType.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleType.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleType.java index 69b28650..8b7b0a14 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleType.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleType.java @@ -14,10 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.vehicle.VehicleTypeImpl.VehicleCostParams; +import com.graphhopper.jsprit.core.problem.Capacity; /** * Basic interface for vehicle-type-data. @@ -36,7 +35,7 @@ public interface VehicleType { /** * Returns capacity dimensions. * - * @return {@link Capacity} + * @return {@link com.graphhopper.jsprit.core.problem.Capacity} */ public Capacity getCapacityDimensions(); @@ -52,7 +51,7 @@ public interface VehicleType { * * @return parameter */ - public VehicleCostParams getVehicleCostParams(); + public VehicleTypeImpl.VehicleCostParams getVehicleCostParams(); public String getProfile(); diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeImpl.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeImpl.java similarity index 99% rename from jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeImpl.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeImpl.java index fcdd8162..8c75b531 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeImpl.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeImpl.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; -import jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Capacity; /** * Implementation of {@link VehicleType}. diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeKey.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeKey.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeKey.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeKey.java index da9bfc0f..f4d5743e 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeKey.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeKey.java @@ -16,10 +16,10 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; -import jsprit.core.problem.AbstractVehicle; -import jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.AbstractVehicle; +import com.graphhopper.jsprit.core.problem.Skills; /** * Key to identify similar vehicles diff --git a/jsprit-core/src/main/java/jsprit/core/reporting/SolutionPrinter.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/reporting/SolutionPrinter.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/reporting/SolutionPrinter.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/reporting/SolutionPrinter.java index 0f3d24f6..f708a8ca 100644 --- a/jsprit-core/src/main/java/jsprit/core/reporting/SolutionPrinter.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/reporting/SolutionPrinter.java @@ -14,16 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.reporting; +package com.graphhopper.jsprit.core.reporting; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import java.io.PrintWriter; @@ -154,8 +153,8 @@ public class SolutionPrinter { TourActivity prevAct = route.getStart(); for (TourActivity act : route.getActivities()) { String jobId; - if (act instanceof JobActivity) { - jobId = ((JobActivity) act).getJob().getId(); + if (act instanceof TourActivity.JobActivity) { + jobId = ((TourActivity.JobActivity) act).getJob().getId(); } else { jobId = "-"; } diff --git a/jsprit-core/src/main/java/jsprit/core/util/ActivityTimeTracker.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ActivityTimeTracker.java similarity index 93% rename from jsprit-core/src/main/java/jsprit/core/util/ActivityTimeTracker.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ActivityTimeTracker.java index a94f33ef..edb192dd 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/ActivityTimeTracker.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ActivityTimeTracker.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.cost.ForwardTransportTime; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.*; +import com.graphhopper.jsprit.core.problem.cost.ForwardTransportTime; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.*; public class ActivityTimeTracker implements ActivityVisitor { diff --git a/jsprit-core/src/main/java/jsprit/core/util/ArrayUtils.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ArrayUtils.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/util/ArrayUtils.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ArrayUtils.java index 8d695946..816aa06f 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/ArrayUtils.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ArrayUtils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; import java.util.Collection; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/util/BenchmarkInstance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/BenchmarkInstance.java similarity index 92% rename from jsprit-core/src/main/java/jsprit/core/util/BenchmarkInstance.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/BenchmarkInstance.java index 9e90c255..77ab9e86 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/BenchmarkInstance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/BenchmarkInstance.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; public class BenchmarkInstance { public final String name; diff --git a/jsprit-core/src/main/java/jsprit/core/util/BenchmarkResult.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/BenchmarkResult.java similarity index 98% rename from jsprit-core/src/main/java/jsprit/core/util/BenchmarkResult.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/BenchmarkResult.java index c7c03d57..ab3e6620 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/BenchmarkResult.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/BenchmarkResult.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; import org.apache.commons.math.stat.descriptive.DescriptiveStatistics; diff --git a/jsprit-core/src/main/java/jsprit/core/util/CalculationUtils.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CalculationUtils.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/util/CalculationUtils.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CalculationUtils.java index 265fbd64..1ff6f131 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/CalculationUtils.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CalculationUtils.java @@ -16,9 +16,9 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; public class CalculationUtils { diff --git a/jsprit-core/src/main/java/jsprit/core/util/Coordinate.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Coordinate.java similarity index 98% rename from jsprit-core/src/main/java/jsprit/core/util/Coordinate.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Coordinate.java index 431d9a06..d8f18967 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/Coordinate.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Coordinate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; public class Coordinate { diff --git a/jsprit-core/src/main/java/jsprit/core/util/CrowFlyCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CrowFlyCosts.java similarity index 90% rename from jsprit-core/src/main/java/jsprit/core/util/CrowFlyCosts.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CrowFlyCosts.java index 2c4b7bb6..5bca9243 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/CrowFlyCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CrowFlyCosts.java @@ -17,13 +17,13 @@ /** * */ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; -import jsprit.core.problem.cost.TransportDistance; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.TransportDistance; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** diff --git a/jsprit-core/src/main/java/jsprit/core/util/DistanceUnit.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/DistanceUnit.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/util/DistanceUnit.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/DistanceUnit.java index 66ec5a90..3a25590a 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/DistanceUnit.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/DistanceUnit.java @@ -15,7 +15,7 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; /** * Created by schroeder on 04.12.14. diff --git a/jsprit-core/src/main/java/jsprit/core/util/EuclideanCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/EuclideanCosts.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/util/EuclideanCosts.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/EuclideanCosts.java index 7cee59f0..f58b364d 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/EuclideanCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/EuclideanCosts.java @@ -17,13 +17,13 @@ /** * */ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; -import jsprit.core.problem.cost.TransportDistance; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.TransportDistance; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** diff --git a/jsprit-core/src/main/java/jsprit/core/util/EuclideanDistanceCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/EuclideanDistanceCalculator.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/util/EuclideanDistanceCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/EuclideanDistanceCalculator.java index 638b7977..1b218e2a 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/EuclideanDistanceCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/EuclideanDistanceCalculator.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; public class EuclideanDistanceCalculator { diff --git a/jsprit-core/src/main/java/jsprit/core/util/FastVehicleRoutingTransportCostsMatrix.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/FastVehicleRoutingTransportCostsMatrix.java similarity index 88% rename from jsprit-core/src/main/java/jsprit/core/util/FastVehicleRoutingTransportCostsMatrix.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/FastVehicleRoutingTransportCostsMatrix.java index 8209d8b1..ae586439 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/FastVehicleRoutingTransportCostsMatrix.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/FastVehicleRoutingTransportCostsMatrix.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; -import jsprit.core.problem.cost.TransportDistance; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleTypeImpl.VehicleCostParams; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.TransportDistance; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; /** - * CostMatrix that allows pre-compiled time and distance-matrices to be considered as {@link jsprit.core.problem.cost.VehicleRoutingTransportCosts} - * in the {@link jsprit.core.problem.VehicleRoutingProblem}. + * CostMatrix that allows pre-compiled time and distance-matrices to be considered as {@link com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts} + * in the {@link com.graphhopper.jsprit.core.problem.VehicleRoutingProblem}. *

Note that you can also use it with distance matrix only (or time matrix). * * @author schroeder @@ -164,7 +164,7 @@ public class FastVehicleRoutingTransportCostsMatrix extends AbstractForwardVehic if (from.getIndex() < 0 || to.getIndex() < 0) throw new IllegalArgumentException("index of from " + from + " to " + to + " < 0 "); if (vehicle == null) return getDistance(from.getIndex(), to.getIndex()); - VehicleCostParams costParams = vehicle.getType().getVehicleCostParams(); + VehicleTypeImpl.VehicleCostParams costParams = vehicle.getType().getVehicleCostParams(); return costParams.perDistanceUnit * getDistance(from.getIndex(), to.getIndex()) + costParams.perTimeUnit * getTransportTime(from, to, departureTime, driver, vehicle); } diff --git a/jsprit-core/src/main/java/jsprit/core/util/GreatCircleCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/GreatCircleCosts.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/util/GreatCircleCosts.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/GreatCircleCosts.java index e86be112..bbcd5357 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/GreatCircleCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/GreatCircleCosts.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; -import jsprit.core.problem.cost.TransportDistance; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.TransportDistance; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** * @author stefan schroeder diff --git a/jsprit-core/src/main/java/jsprit/core/util/GreatCircleDistanceCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/GreatCircleDistanceCalculator.java similarity index 98% rename from jsprit-core/src/main/java/jsprit/core/util/GreatCircleDistanceCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/GreatCircleDistanceCalculator.java index 534e0e9c..ff122949 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/GreatCircleDistanceCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/GreatCircleDistanceCalculator.java @@ -15,7 +15,7 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; /** * Created by schroeder on 28.11.14. diff --git a/jsprit-core/src/main/java/jsprit/core/util/Locations.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Locations.java similarity index 95% rename from jsprit-core/src/main/java/jsprit/core/util/Locations.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Locations.java index 4e7e55ea..f0f3dd32 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/Locations.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Locations.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; public interface Locations { diff --git a/jsprit-core/src/main/java/jsprit/core/util/ManhattanCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ManhattanCosts.java similarity index 89% rename from jsprit-core/src/main/java/jsprit/core/util/ManhattanCosts.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ManhattanCosts.java index 81755001..2827da1a 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/ManhattanCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ManhattanCosts.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; -import jsprit.core.problem.cost.TransportDistance; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.TransportDistance; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** * @author stefan schroeder diff --git a/jsprit-core/src/main/java/jsprit/core/util/ManhattanDistanceCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ManhattanDistanceCalculator.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/util/ManhattanDistanceCalculator.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ManhattanDistanceCalculator.java index bcfa9794..86b6778e 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/ManhattanDistanceCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ManhattanDistanceCalculator.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; public class ManhattanDistanceCalculator { diff --git a/jsprit-core/src/main/java/jsprit/core/util/NoiseMaker.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/NoiseMaker.java similarity index 72% rename from jsprit-core/src/main/java/jsprit/core/util/NoiseMaker.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/NoiseMaker.java index ffcb1f7a..7b919c68 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/NoiseMaker.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/NoiseMaker.java @@ -1,4 +1,4 @@ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; /** * Created by schroeder on 16/01/15. diff --git a/jsprit-core/src/main/java/jsprit/core/util/RandomNumberGeneration.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RandomNumberGeneration.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/util/RandomNumberGeneration.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RandomNumberGeneration.java index 3cfa7194..f649364e 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/RandomNumberGeneration.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RandomNumberGeneration.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; import java.util.Random; diff --git a/jsprit-core/src/main/java/jsprit/core/util/RandomUtils.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RandomUtils.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/util/RandomUtils.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RandomUtils.java index 02ddcbba..651c0dd6 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/RandomUtils.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RandomUtils.java @@ -1,7 +1,7 @@ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import java.util.Collection; import java.util.List; diff --git a/jsprit-core/src/main/java/jsprit/core/util/Resource.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Resource.java similarity index 98% rename from jsprit-core/src/main/java/jsprit/core/util/Resource.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Resource.java index 6aa97936..a299dbec 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/Resource.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Resource.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/main/java/jsprit/core/util/RouteUtils.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RouteUtils.java similarity index 85% rename from jsprit-core/src/main/java/jsprit/core/util/RouteUtils.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RouteUtils.java index a7ff0e5f..533c180a 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/RouteUtils.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RouteUtils.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.algorithm.state.UpdateActivityTimes; -import jsprit.core.problem.cost.TransportTime; -import jsprit.core.problem.driver.DriverImpl; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.RouteActivityVisitor; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.algorithm.state.UpdateActivityTimes; +import com.graphhopper.jsprit.core.problem.cost.TransportTime; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.RouteActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/util/SolutionVerifier.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/SolutionVerifier.java similarity index 81% rename from jsprit-core/src/main/java/jsprit/core/util/SolutionVerifier.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/SolutionVerifier.java index e6eb4087..cdbea9d3 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/SolutionVerifier.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/SolutionVerifier.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.algorithm.listener.AlgorithmEndsListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmEndsListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import java.util.Collection; import java.util.HashSet; diff --git a/jsprit-core/src/main/java/jsprit/core/util/Solutions.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Solutions.java similarity index 91% rename from jsprit-core/src/main/java/jsprit/core/util/Solutions.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Solutions.java index 7e181500..0d9eff6d 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/Solutions.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Solutions.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import java.util.Collection; diff --git a/jsprit-core/src/main/java/jsprit/core/util/StopWatch.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/StopWatch.java similarity index 97% rename from jsprit-core/src/main/java/jsprit/core/util/StopWatch.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/StopWatch.java index 80fb771e..fd0a422c 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/StopWatch.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/StopWatch.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; public class StopWatch { diff --git a/jsprit-core/src/main/java/jsprit/core/util/Time.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Time.java similarity index 98% rename from jsprit-core/src/main/java/jsprit/core/util/Time.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Time.java index a5690353..4a268b6f 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/Time.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Time.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; public class Time { diff --git a/jsprit-core/src/main/java/jsprit/core/util/TimeUnit.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/TimeUnit.java similarity index 96% rename from jsprit-core/src/main/java/jsprit/core/util/TimeUnit.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/TimeUnit.java index 5d5015bc..bb63fb6c 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/TimeUnit.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/TimeUnit.java @@ -15,7 +15,7 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; /** * Created by schroeder on 04.12.14. diff --git a/jsprit-core/src/main/java/jsprit/core/util/VehicleRoutingTransportCostsMatrix.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/VehicleRoutingTransportCostsMatrix.java similarity index 94% rename from jsprit-core/src/main/java/jsprit/core/util/VehicleRoutingTransportCostsMatrix.java rename to jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/VehicleRoutingTransportCostsMatrix.java index febfc243..cdc78064 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/VehicleRoutingTransportCostsMatrix.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/VehicleRoutingTransportCostsMatrix.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleTypeImpl.VehicleCostParams; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl.VehicleCostParams; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -29,8 +29,8 @@ import java.util.Map; /** - * CostMatrix that allows pre-compiled time and distance-matrices to be considered as {@link jsprit.core.problem.cost.VehicleRoutingTransportCosts} - * in the {@link jsprit.core.problem.VehicleRoutingProblem}. + * CostMatrix that allows pre-compiled time and distance-matrices to be considered as {@link com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts} + * in the {@link com.graphhopper.jsprit.core.problem.VehicleRoutingProblem}. *

Note that you can also use it with distance matrix only (or time matrix). But ones * you set a particular distance, this expects distance-entries for all relations. This counts also * for a particular time. If the method getTransportCosts(...) is then invoked for a relation, where no distance can be found, an diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateId.java b/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateId.java deleted file mode 100644 index a1c23ff2..00000000 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateId.java +++ /dev/null @@ -1,10 +0,0 @@ -package jsprit.core.algorithm.state; - -import jsprit.core.problem.HasIndex; - -/** - * Created by schroeder on 28.07.14. - */ -public interface StateId extends HasIndex { - -} diff --git a/jsprit-core/src/test/java/jsprit/core/IntegrationTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/IntegrationTest.java similarity index 69% rename from jsprit-core/src/test/java/jsprit/core/IntegrationTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/IntegrationTest.java index b16ee817..797fd642 100644 --- a/jsprit-core/src/test/java/jsprit/core/IntegrationTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/IntegrationTest.java @@ -1,4 +1,4 @@ -package jsprit.core; +package com.graphhopper.jsprit.core; /** * Created by schroeder on 17/09/15. diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/BuildCVRPAlgoFromScratch_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildCVRPAlgoFromScratch_IT.java similarity index 71% rename from jsprit-core/src/test/java/jsprit/core/algorithm/BuildCVRPAlgoFromScratch_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildCVRPAlgoFromScratch_IT.java index fbe11cab..b9edd5d5 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/BuildCVRPAlgoFromScratch_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildCVRPAlgoFromScratch_IT.java @@ -14,29 +14,29 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.acceptor.GreedyAcceptance; -import jsprit.core.algorithm.module.RuinAndRecreateModule; -import jsprit.core.algorithm.recreate.BestInsertionBuilder; -import jsprit.core.algorithm.recreate.InsertionStrategy; -import jsprit.core.algorithm.ruin.RadialRuinStrategyFactory; -import jsprit.core.algorithm.ruin.RandomRuinStrategyFactory; -import jsprit.core.algorithm.ruin.RuinStrategy; -import jsprit.core.algorithm.ruin.distance.AvgServiceDistance; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.InfiniteFleetManagerFactory; -import jsprit.core.problem.vehicle.VehicleFleetManager; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.acceptor.GreedyAcceptance; +import com.graphhopper.jsprit.core.algorithm.module.RuinAndRecreateModule; +import com.graphhopper.jsprit.core.algorithm.recreate.BestInsertionBuilder; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionStrategy; +import com.graphhopper.jsprit.core.algorithm.ruin.RadialRuinStrategyFactory; +import com.graphhopper.jsprit.core.algorithm.ruin.RandomRuinStrategyFactory; +import com.graphhopper.jsprit.core.algorithm.ruin.RuinStrategy; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.AvgServiceDistance; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.InfiniteFleetManagerFactory; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.util.Solutions; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/BuildPDVRPAlgoFromScratch_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildPDVRPAlgoFromScratch_IT.java similarity index 72% rename from jsprit-core/src/test/java/jsprit/core/algorithm/BuildPDVRPAlgoFromScratch_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildPDVRPAlgoFromScratch_IT.java index 59a559c0..4346860f 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/BuildPDVRPAlgoFromScratch_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildPDVRPAlgoFromScratch_IT.java @@ -14,30 +14,30 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.acceptor.GreedyAcceptance; -import jsprit.core.algorithm.module.RuinAndRecreateModule; -import jsprit.core.algorithm.recreate.BestInsertionBuilder; -import jsprit.core.algorithm.recreate.InsertionStrategy; -import jsprit.core.algorithm.ruin.RadialRuinStrategyFactory; -import jsprit.core.algorithm.ruin.RandomRuinStrategyFactory; -import jsprit.core.algorithm.ruin.RuinStrategy; -import jsprit.core.algorithm.ruin.distance.AvgServiceDistance; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.InfiniteFleetManagerFactory; -import jsprit.core.problem.vehicle.VehicleFleetManager; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.acceptor.GreedyAcceptance; +import com.graphhopper.jsprit.core.algorithm.module.RuinAndRecreateModule; +import com.graphhopper.jsprit.core.algorithm.recreate.BestInsertionBuilder; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionStrategy; +import com.graphhopper.jsprit.core.algorithm.ruin.RadialRuinStrategyFactory; +import com.graphhopper.jsprit.core.algorithm.ruin.RandomRuinStrategyFactory; +import com.graphhopper.jsprit.core.algorithm.ruin.RuinStrategy; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.AvgServiceDistance; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.InfiniteFleetManagerFactory; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.util.Solutions; import junit.framework.Assert; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/BuildPDVRPWithShipmentsAlgoFromScratch_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildPDVRPWithShipmentsAlgoFromScratch_IT.java similarity index 73% rename from jsprit-core/src/test/java/jsprit/core/algorithm/BuildPDVRPWithShipmentsAlgoFromScratch_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildPDVRPWithShipmentsAlgoFromScratch_IT.java index 9c756ca4..c55b60e5 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/BuildPDVRPWithShipmentsAlgoFromScratch_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildPDVRPWithShipmentsAlgoFromScratch_IT.java @@ -14,29 +14,29 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.acceptor.GreedyAcceptance; -import jsprit.core.algorithm.module.RuinAndRecreateModule; -import jsprit.core.algorithm.recreate.BestInsertionBuilder; -import jsprit.core.algorithm.recreate.InsertionStrategy; -import jsprit.core.algorithm.ruin.RadialRuinStrategyFactory; -import jsprit.core.algorithm.ruin.RandomRuinStrategyFactory; -import jsprit.core.algorithm.ruin.RuinStrategy; -import jsprit.core.algorithm.ruin.distance.AvgServiceAndShipmentDistance; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.UpdateVariableCosts; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.InfiniteFleetManagerFactory; -import jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.acceptor.GreedyAcceptance; +import com.graphhopper.jsprit.core.algorithm.module.RuinAndRecreateModule; +import com.graphhopper.jsprit.core.algorithm.recreate.BestInsertionBuilder; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionStrategy; +import com.graphhopper.jsprit.core.algorithm.ruin.RadialRuinStrategyFactory; +import com.graphhopper.jsprit.core.algorithm.ruin.RandomRuinStrategyFactory; +import com.graphhopper.jsprit.core.algorithm.ruin.RuinStrategy; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.AvgServiceAndShipmentDistance; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.UpdateVariableCosts; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.InfiniteFleetManagerFactory; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithDeliveriesAndDifferentInsertionStrategies_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithDeliveriesAndDifferentInsertionStrategies_IT.java similarity index 87% rename from jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithDeliveriesAndDifferentInsertionStrategies_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithDeliveriesAndDifferentInsertionStrategies_IT.java index 19cdd207..2ea8caf3 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithDeliveriesAndDifferentInsertionStrategies_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithDeliveriesAndDifferentInsertionStrategies_IT.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import junit.framework.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithDeliveries_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithDeliveries_IT.java similarity index 83% rename from jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithDeliveries_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithDeliveries_IT.java index ba823254..11569adf 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithDeliveries_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithDeliveries_IT.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.util.Solutions; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithMatrix_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithMatrix_IT.java similarity index 84% rename from jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithMatrix_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithMatrix_IT.java index a37205de..a880dc25 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithMatrix_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithMatrix_IT.java @@ -14,23 +14,24 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.analysis.SolutionAnalyser; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.cost.TransportDistance; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.EuclideanDistanceCalculator; -import jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.analysis.SolutionAnalyser; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.cost.TransportDistance; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.EuclideanDistanceCalculator; +import com.graphhopper.jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; +import com.graphhopper.jsprit.core.util.Solutions; +import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -54,7 +55,7 @@ public class CVRPwithMatrix_IT { VehicleRoutingProblem vrp = createVrpWithLocationIndecesAndMatrix(vrp_, true); VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "src/test/resources/algorithmConfig.xml"); Collection solutions = vra.searchSolutions(); - assertEquals(530.0, Solutions.bestOf(solutions).getCost(), 50.0); + Assert.assertEquals(530.0, Solutions.bestOf(solutions).getCost(), 50.0); assertEquals(5, Solutions.bestOf(solutions).getRoutes().size()); } diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithPickups_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithPickups_IT.java similarity index 84% rename from jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithPickups_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithPickups_IT.java index c80d4e73..ccf2a7d9 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/CVRPwithPickups_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithPickups_IT.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.util.Solutions; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/DeactivateTimeWindowsTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/DeactivateTimeWindowsTest.java similarity index 89% rename from jsprit-core/src/test/java/jsprit/core/algorithm/DeactivateTimeWindowsTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/DeactivateTimeWindowsTest.java index 3fb28e47..d3f631e5 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/DeactivateTimeWindowsTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/DeactivateTimeWindowsTest.java @@ -15,19 +15,19 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.Solutions; import org.junit.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/ExampleActivityCostFunction.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ExampleActivityCostFunction.java similarity index 83% rename from jsprit-core/src/test/java/jsprit/core/algorithm/ExampleActivityCostFunction.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ExampleActivityCostFunction.java index 3054ed95..485d3143 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/ExampleActivityCostFunction.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ExampleActivityCostFunction.java @@ -14,13 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; public class ExampleActivityCostFunction implements VehicleRoutingActivityCosts { @@ -46,7 +45,7 @@ public class ExampleActivityCostFunction implements VehicleRoutingActivityCosts double totalCost = timeAtAct * parameter_timeAtAct; //penalty tooLate - if (tourAct instanceof JobActivity) { + if (tourAct instanceof TourActivity.JobActivity) { if (arrivalTime > tourAct.getTheoreticalLatestOperationStartTime()) { double penTime = arrivalTime - tourAct.getTheoreticalLatestOperationStartTime(); totalCost += penTime * parameter_penaltyTooLate; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/ExternalInitialSolutionIsInValidTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ExternalInitialSolutionIsInValidTest.java similarity index 67% rename from jsprit-core/src/test/java/jsprit/core/algorithm/ExternalInitialSolutionIsInValidTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ExternalInitialSolutionIsInValidTest.java index ccbe943b..393517c3 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/ExternalInitialSolutionIsInValidTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ExternalInitialSolutionIsInValidTest.java @@ -1,14 +1,14 @@ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; import org.junit.Test; import java.util.Arrays; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/FiniteVehicleFleetManagerIdentifiesDistinctVehicle_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/FiniteVehicleFleetManagerIdentifiesDistinctVehicle_IT.java similarity index 86% rename from jsprit-core/src/test/java/jsprit/core/algorithm/FiniteVehicleFleetManagerIdentifiesDistinctVehicle_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/FiniteVehicleFleetManagerIdentifiesDistinctVehicle_IT.java index 42b48d3e..a006437f 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/FiniteVehicleFleetManagerIdentifiesDistinctVehicle_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/FiniteVehicleFleetManagerIdentifiesDistinctVehicle_IT.java @@ -16,15 +16,15 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.box.SchrimpfFactory; -import jsprit.core.algorithm.recreate.NoSolutionFoundException; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.box.SchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.recreate.NoSolutionFoundException; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/IgnoreBreakTimeWindowTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/IgnoreBreakTimeWindowTest.java similarity index 79% rename from jsprit-core/src/test/java/jsprit/core/algorithm/IgnoreBreakTimeWindowTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/IgnoreBreakTimeWindowTest.java index 0161d2f4..912b41bf 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/IgnoreBreakTimeWindowTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/IgnoreBreakTimeWindowTest.java @@ -1,18 +1,18 @@ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.activity.BreakActivity; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.activity.BreakActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Solutions; import junit.framework.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/InitialRoutesTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/InitialRoutesTest.java similarity index 90% rename from jsprit-core/src/test/java/jsprit/core/algorithm/InitialRoutesTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/InitialRoutesTest.java index 1e395411..2c592271 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/InitialRoutesTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/InitialRoutesTest.java @@ -15,37 +15,36 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.box.GreedySchrimpfFactory; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.box.Jsprit.Builder; -import jsprit.core.algorithm.box.SchrimpfFactory; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.UpdateEndLocationIfRouteIsOpen; -import jsprit.core.algorithm.state.UpdateVariableCosts; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.ConstraintManager.Priority; -import jsprit.core.problem.constraint.ServiceLoadActivityLevelConstraint; -import jsprit.core.problem.constraint.ServiceLoadRouteLevelConstraint; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.PickupShipment; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.box.GreedySchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit.Builder; +import com.graphhopper.jsprit.core.algorithm.box.SchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.UpdateEndLocationIfRouteIsOpen; +import com.graphhopper.jsprit.core.algorithm.state.UpdateVariableCosts; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.ServiceLoadActivityLevelConstraint; +import com.graphhopper.jsprit.core.problem.constraint.ServiceLoadRouteLevelConstraint; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; import org.junit.Test; import java.util.Collection; @@ -419,7 +418,7 @@ public class InitialRoutesTest { StateManager stateManager = new StateManager(vrp); ConstraintManager constraintManager = new ConstraintManager(vrp, stateManager); constraintManager.addConstraint(new ServiceLoadRouteLevelConstraint(stateManager)); - constraintManager.addConstraint(new ServiceLoadActivityLevelConstraint(stateManager), Priority.LOW); + constraintManager.addConstraint(new ServiceLoadActivityLevelConstraint(stateManager), ConstraintManager.Priority.LOW); stateManager.updateLoadStates(); stateManager.addStateUpdater(new UpdateEndLocationIfRouteIsOpen()); stateManager.addStateUpdater(new UpdateVariableCosts(vrp.getActivityCosts(), vrp.getTransportCosts(), stateManager)); diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/MeetTimeWindowConstraint_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/MeetTimeWindowConstraint_IT.java similarity index 96% rename from jsprit-core/src/test/java/jsprit/core/algorithm/MeetTimeWindowConstraint_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/MeetTimeWindowConstraint_IT.java index 4160b166..0496ce16 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/MeetTimeWindowConstraint_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/MeetTimeWindowConstraint_IT.java @@ -16,22 +16,23 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.box.GreedySchrimpfFactory; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.box.SchrimpfFactory; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.recreate.listener.JobInsertedListener; -import jsprit.core.algorithm.recreate.listener.VehicleSwitchedListener; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.box.GreedySchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.box.SchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.JobInsertedListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.VehicleSwitchedListener; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; +import com.graphhopper.jsprit.core.util.Solutions; +import org.junit.Assert; import org.junit.Test; import java.io.BufferedReader; @@ -57,7 +58,7 @@ public class MeetTimeWindowConstraint_IT { vra.setMaxIterations(100); Collection solutions = vra.searchSolutions(); - assertEquals(2, Solutions.bestOf(solutions).getRoutes().size()); + Assert.assertEquals(2, Solutions.bestOf(solutions).getRoutes().size()); } @Test diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/MultipleTimeWindowsTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/MultipleTimeWindowsTest.java similarity index 85% rename from jsprit-core/src/test/java/jsprit/core/algorithm/MultipleTimeWindowsTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/MultipleTimeWindowsTest.java index 369aa645..c51d1b24 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/MultipleTimeWindowsTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/MultipleTimeWindowsTest.java @@ -1,12 +1,12 @@ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.Solutions; import junit.framework.Assert; import org.junit.Test; @@ -17,7 +17,7 @@ public class MultipleTimeWindowsTest { @Test public void service2ShouldNotBeInserted(){ - Service s = Service.Builder.newInstance("s1").setLocation(Location.newInstance(10,0)).build(); + Service s = Service.Builder.newInstance("s1").setLocation(Location.newInstance(10, 0)).build(); Service s2 = Service.Builder.newInstance("s2") .addTimeWindow(50.,60.) diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/OpenRoutesTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/OpenRoutesTest.java similarity index 84% rename from jsprit-core/src/test/java/jsprit/core/algorithm/OpenRoutesTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/OpenRoutesTest.java index ee5fa064..93e27849 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/OpenRoutesTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/OpenRoutesTest.java @@ -16,27 +16,29 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.box.SchrimpfFactory; -import jsprit.core.algorithm.recreate.NoSolutionFoundException; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; -import jsprit.core.util.GreatCircleCosts; -import jsprit.core.util.Solutions; -import jsprit.core.util.TestUtils; +import com.graphhopper.jsprit.core.algorithm.box.SchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.recreate.NoSolutionFoundException; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.GreatCircleCosts; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.util.TestUtils; +import org.junit.Assert; import org.junit.Test; import java.util.Collection; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class OpenRoutesTest { @@ -113,7 +115,7 @@ public class OpenRoutesTest { Collection solutions = vra.searchSolutions(); - assertEquals(10., Solutions.bestOf(solutions).getCost(), 0.01); + Assert.assertEquals(10., Solutions.bestOf(solutions).getCost(), 0.01); } @@ -133,7 +135,7 @@ public class OpenRoutesTest { Collection solutions = vra.searchSolutions(); - assertEquals(5., Solutions.bestOf(solutions).getCost(), 0.01); + Assert.assertEquals(5., Solutions.bestOf(solutions).getCost(), 0.01); } diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/PickupsAndDeliveries_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/PickupsAndDeliveries_IT.java similarity index 84% rename from jsprit-core/src/test/java/jsprit/core/algorithm/PickupsAndDeliveries_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/PickupsAndDeliveries_IT.java index 2c36121f..e8fe1c65 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/PickupsAndDeliveries_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/PickupsAndDeliveries_IT.java @@ -16,15 +16,15 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.util.Solutions; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java similarity index 84% rename from jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java index 2e815568..b67d1c20 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java @@ -14,24 +14,21 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.box.GreedySchrimpfFactory; -import jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.reporting.SolutionPrinter.Print; -import jsprit.core.util.Solutions; -import jsprit.core.util.VehicleRoutingTransportCostsMatrix; -import jsprit.core.util.VehicleRoutingTransportCostsMatrix.Builder; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.box.GreedySchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.util.VehicleRoutingTransportCostsMatrix; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -124,7 +121,7 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT { * start building the problem */ VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); - vrpBuilder.setFleetSize(FleetSize.INFINITE); + vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.INFINITE); vrpBuilder.addVehicle(bigVehicle); /* @@ -149,7 +146,7 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT { vra.setPrematureAlgorithmTermination(new IterationWithoutImprovementTermination(100)); Collection solutions = vra.searchSolutions(); - SolutionPrinter.print(vrp, Solutions.bestOf(solutions), Print.VERBOSE); + SolutionPrinter.print(vrp, Solutions.bestOf(solutions), SolutionPrinter.Print.VERBOSE); assertEquals(2. * 397., Solutions.bestOf(solutions).getCost(), 0.01); assertEquals(2, Solutions.bestOf(solutions).getRoutes().size()); @@ -180,7 +177,7 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT { } - private static void readDistances(Builder matrixBuilder) throws IOException { + private static void readDistances(VehicleRoutingTransportCostsMatrix.Builder matrixBuilder) throws IOException { BufferedReader reader = new BufferedReader(new FileReader(new File("src/test/resources/refuseCollectionExample_Distances"))); String line = null; boolean firstLine = true; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java similarity index 84% rename from jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java index 37c44ca2..4fe337f2 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java @@ -14,24 +14,22 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.box.GreedySchrimpfFactory; -import jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.reporting.SolutionPrinter.Print; -import jsprit.core.util.Solutions; -import jsprit.core.util.VehicleRoutingTransportCostsMatrix; -import jsprit.core.util.VehicleRoutingTransportCostsMatrix.Builder; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.box.GreedySchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter.Print; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.util.VehicleRoutingTransportCostsMatrix; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -124,7 +122,7 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndD * start building the problem */ VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); - vrpBuilder.setFleetSize(FleetSize.INFINITE); + vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.INFINITE); vrpBuilder.addVehicle(bigVehicle); /* @@ -180,7 +178,7 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndD } - private static void readDistances(Builder matrixBuilder) throws IOException { + private static void readDistances(VehicleRoutingTransportCostsMatrix.Builder matrixBuilder) throws IOException { BufferedReader reader = new BufferedReader(new FileReader(new File("src/test/resources/refuseCollectionExample_Distances"))); String line = null; boolean firstLine = true; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollection_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/RefuseCollection_IT.java similarity index 83% rename from jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollection_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/RefuseCollection_IT.java index 48838c15..44ebe782 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollection_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/RefuseCollection_IT.java @@ -14,34 +14,30 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.box.SchrimpfFactory; -import jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.reporting.SolutionPrinter.Print; -import jsprit.core.util.Solutions; -import jsprit.core.util.VehicleRoutingTransportCostsMatrix; -import jsprit.core.util.VehicleRoutingTransportCostsMatrix.Builder; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.box.SchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.util.VehicleRoutingTransportCostsMatrix; +import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; import java.io.*; import java.util.Collection; -import static org.junit.Assert.assertEquals; - public class RefuseCollection_IT { @@ -66,7 +62,7 @@ public class RefuseCollection_IT { * start building the problem */ VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); - vrpBuilder.setFleetSize(FleetSize.INFINITE); + vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.INFINITE); vrpBuilder.addVehicle(bigVehicle); /* @@ -85,10 +81,10 @@ public class RefuseCollection_IT { vra.setPrematureAlgorithmTermination(new IterationWithoutImprovementTermination(100)); Collection solutions = vra.searchSolutions(); - SolutionPrinter.print(vrp, Solutions.bestOf(solutions), Print.VERBOSE); + SolutionPrinter.print(vrp, Solutions.bestOf(solutions), SolutionPrinter.Print.VERBOSE); - assertEquals(397.0, Solutions.bestOf(solutions).getCost(), 40.); - assertEquals(2, Solutions.bestOf(solutions).getRoutes().size()); + Assert.assertEquals(397.0, Solutions.bestOf(solutions).getCost(), 40.); + Assert.assertEquals(2, Solutions.bestOf(solutions).getRoutes().size()); } @Test @@ -111,7 +107,7 @@ public class RefuseCollection_IT { * start building the problem */ VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); - vrpBuilder.setFleetSize(FleetSize.INFINITE); + vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.INFINITE); vrpBuilder.addVehicle(bigVehicle); /* @@ -130,10 +126,10 @@ public class RefuseCollection_IT { vra.setPrematureAlgorithmTermination(new IterationWithoutImprovementTermination(100)); Collection solutions = vra.searchSolutions(); - SolutionPrinter.print(vrp, Solutions.bestOf(solutions), Print.VERBOSE); + SolutionPrinter.print(vrp, Solutions.bestOf(solutions), SolutionPrinter.Print.VERBOSE); - assertEquals(397.0, Solutions.bestOf(solutions).getCost(), 40.); - assertEquals(2, Solutions.bestOf(solutions).getRoutes().size()); + Assert.assertEquals(397.0, Solutions.bestOf(solutions).getCost(), 40.); + Assert.assertEquals(2, Solutions.bestOf(solutions).getRoutes().size()); } @Test @@ -156,7 +152,7 @@ public class RefuseCollection_IT { * start building the problem */ VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); - vrpBuilder.setFleetSize(FleetSize.INFINITE); + vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.INFINITE); vrpBuilder.addVehicle(bigVehicle); /* @@ -175,10 +171,10 @@ public class RefuseCollection_IT { vra.setPrematureAlgorithmTermination(new IterationWithoutImprovementTermination(100)); Collection solutions = vra.searchSolutions(); - SolutionPrinter.print(vrp, Solutions.bestOf(solutions), Print.VERBOSE); + SolutionPrinter.print(vrp, Solutions.bestOf(solutions), SolutionPrinter.Print.VERBOSE); - assertEquals(397.0, Solutions.bestOf(solutions).getCost(), 40.); - assertEquals(2, Solutions.bestOf(solutions).getRoutes().size()); + Assert.assertEquals(397.0, Solutions.bestOf(solutions).getCost(), 40.); + Assert.assertEquals(2, Solutions.bestOf(solutions).getRoutes().size()); } @Test @@ -201,7 +197,7 @@ public class RefuseCollection_IT { * start building the problem */ VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); - vrpBuilder.setFleetSize(FleetSize.INFINITE); + vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.INFINITE); vrpBuilder.addVehicle(bigVehicle); /* @@ -220,10 +216,10 @@ public class RefuseCollection_IT { vra.setPrematureAlgorithmTermination(new IterationWithoutImprovementTermination(100)); Collection solutions = vra.searchSolutions(); - SolutionPrinter.print(vrp, Solutions.bestOf(solutions), Print.VERBOSE); + SolutionPrinter.print(vrp, Solutions.bestOf(solutions), SolutionPrinter.Print.VERBOSE); - assertEquals(397.0, Solutions.bestOf(solutions).getCost(), 40.); - assertEquals(2, Solutions.bestOf(solutions).getRoutes().size()); + Assert.assertEquals(397.0, Solutions.bestOf(solutions).getCost(), 40.); + Assert.assertEquals(2, Solutions.bestOf(solutions).getRoutes().size()); } @@ -325,7 +321,7 @@ public class RefuseCollection_IT { } - private static void readDistances(Builder matrixBuilder) { + private static void readDistances(VehicleRoutingTransportCostsMatrix.Builder matrixBuilder) { BufferedReader reader = getBufferedReader("src/test/resources/refuseCollectionExample_Distances"); String line; boolean firstLine = true; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/SearchStrategyManagerTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyManagerTest.java similarity index 96% rename from jsprit-core/src/test/java/jsprit/core/algorithm/SearchStrategyManagerTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyManagerTest.java index 21b4309d..252a8190 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/SearchStrategyManagerTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyManagerTest.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.acceptor.SolutionAcceptor; -import jsprit.core.algorithm.selector.SolutionSelector; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.algorithm.acceptor.SolutionAcceptor; +import com.graphhopper.jsprit.core.algorithm.selector.SolutionSelector; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import org.junit.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/SearchStrategyTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyTest.java similarity index 93% rename from jsprit-core/src/test/java/jsprit/core/algorithm/SearchStrategyTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyTest.java index cf22d8da..b4110b46 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/SearchStrategyTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyTest.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.acceptor.SolutionAcceptor; -import jsprit.core.algorithm.listener.SearchStrategyModuleListener; -import jsprit.core.algorithm.selector.SolutionSelector; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.acceptor.SolutionAcceptor; +import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyModuleListener; +import com.graphhopper.jsprit.core.algorithm.selector.SolutionSelector; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.junit.Test; import java.util.ArrayList; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/SelectRandomlyTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SelectRandomlyTest.java similarity index 74% rename from jsprit-core/src/test/java/jsprit/core/algorithm/SelectRandomlyTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SelectRandomlyTest.java index a0fd134b..63281794 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/SelectRandomlyTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SelectRandomlyTest.java @@ -1,8 +1,8 @@ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; import org.junit.Test; import static org.junit.Assert.fail; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/SolomonSkills_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SolomonSkills_IT.java similarity index 82% rename from jsprit-core/src/test/java/jsprit/core/algorithm/SolomonSkills_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SolomonSkills_IT.java index e358360d..739c85ae 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/SolomonSkills_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/SolomonSkills_IT.java @@ -15,24 +15,24 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.recreate.NoSolutionFoundException; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.Skills; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.util.Solutions; -import jsprit.core.util.TestUtils; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.recreate.NoSolutionFoundException; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.util.TestUtils; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/Solomon_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/Solomon_IT.java similarity index 65% rename from jsprit-core/src/test/java/jsprit/core/algorithm/Solomon_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/Solomon_IT.java index 39b24daa..5a211f7e 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/Solomon_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/Solomon_IT.java @@ -1,18 +1,17 @@ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.util.Solutions; +import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; import java.util.Collection; -import static org.junit.Assert.assertEquals; - /** * Created by schroeder on 23.07.14. */ @@ -32,7 +31,7 @@ public class Solomon_IT { // VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "src/test/resources/algorithmConfig.xml"); vra.setMaxIterations(2000); Collection solutions = vra.searchSolutions(); - assertEquals(828.94, Solutions.bestOf(solutions).getCost(), 0.01); + Assert.assertEquals(828.94, Solutions.bestOf(solutions).getCost(), 0.01); } } diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/UnassignedJobListTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/UnassignedJobListTest.java similarity index 82% rename from jsprit-core/src/test/java/jsprit/core/algorithm/UnassignedJobListTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/UnassignedJobListTest.java index a0a452d8..92fc14d7 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/UnassignedJobListTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/UnassignedJobListTest.java @@ -1,13 +1,13 @@ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.box.GreedySchrimpfFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.box.GreedySchrimpfFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.Solutions; import org.junit.Test; import java.util.Collection; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java similarity index 76% rename from jsprit-core/src/test/java/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java index 6d94565c..e42bad4c 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java @@ -1,24 +1,24 @@ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.IntegrationTest; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.analysis.SolutionAnalyser; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.cost.TransportDistance; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.CostFactory; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.IntegrationTest; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.analysis.SolutionAnalyser; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.cost.TransportDistance; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.CostFactory; +import com.graphhopper.jsprit.core.util.Solutions; import junit.framework.Assert; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/VehicleRoutingAlgorithmTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithmTest.java similarity index 90% rename from jsprit-core/src/test/java/jsprit/core/algorithm/VehicleRoutingAlgorithmTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithmTest.java index 5f0df33a..5208a7b4 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/VehicleRoutingAlgorithmTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithmTest.java @@ -14,13 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm; +package com.graphhopper.jsprit.core.algorithm; -import jsprit.core.algorithm.SearchStrategy.DiscoveredSolution; -import jsprit.core.algorithm.listener.IterationStartsListener; -import jsprit.core.algorithm.termination.PrematureAlgorithmTermination; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; +import com.graphhopper.jsprit.core.algorithm.termination.PrematureAlgorithmTermination; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.junit.Test; import java.util.Arrays; @@ -104,7 +103,7 @@ public class VehicleRoutingAlgorithmTest { private int nuOfIterations = 1; @Override - public boolean isPrematureBreak(DiscoveredSolution discoveredSolution) { + public boolean isPrematureBreak(SearchStrategy.DiscoveredSolution discoveredSolution) { if (nuOfIterations == 50) return true; nuOfIterations++; return false; @@ -129,7 +128,7 @@ public class VehicleRoutingAlgorithmTest { private int nuOfIterations = 1; @Override - public boolean isPrematureBreak(DiscoveredSolution discoveredSolution) { + public boolean isPrematureBreak(SearchStrategy.DiscoveredSolution discoveredSolution) { if (nuOfIterations == 50) return true; nuOfIterations++; return false; @@ -155,7 +154,7 @@ public class VehicleRoutingAlgorithmTest { private int nuOfIterations = 1; @Override - public boolean isPrematureBreak(DiscoveredSolution discoveredSolution) { + public boolean isPrematureBreak(SearchStrategy.DiscoveredSolution discoveredSolution) { if (nuOfIterations == 50) return true; nuOfIterations++; return false; @@ -167,7 +166,7 @@ public class VehicleRoutingAlgorithmTest { private int nuOfIterations = 1; @Override - public boolean isPrematureBreak(DiscoveredSolution discoveredSolution) { + public boolean isPrematureBreak(SearchStrategy.DiscoveredSolution discoveredSolution) { if (nuOfIterations == 25) return true; nuOfIterations++; return false; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/acceptor/GreedyAcceptanceTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/acceptor/GreedyAcceptanceTest.java similarity index 93% rename from jsprit-core/src/test/java/jsprit/core/algorithm/acceptor/GreedyAcceptanceTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/acceptor/GreedyAcceptanceTest.java index 65142c39..3c7c0919 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/acceptor/GreedyAcceptanceTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/acceptor/GreedyAcceptanceTest.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.acceptor; +package com.graphhopper.jsprit.core.algorithm.acceptor; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.junit.Test; import java.util.ArrayList; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/acceptor/SchrimpfAcceptanceTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfAcceptanceTest.java similarity index 97% rename from jsprit-core/src/test/java/jsprit/core/algorithm/acceptor/SchrimpfAcceptanceTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfAcceptanceTest.java index b82df7d0..25586a87 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/acceptor/SchrimpfAcceptanceTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfAcceptanceTest.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.acceptor; +package com.graphhopper.jsprit.core.algorithm.acceptor; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/box/JspritTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/box/JspritTest.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/algorithm/box/JspritTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/box/JspritTest.java index b5e6c1cb..72355810 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/box/JspritTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/box/JspritTest.java @@ -1,20 +1,20 @@ -package jsprit.core.algorithm.box; +package com.graphhopper.jsprit.core.algorithm.box; -import jsprit.core.algorithm.SearchStrategy; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.listener.StrategySelectedListener; -import jsprit.core.algorithm.recreate.InsertionData; -import jsprit.core.algorithm.recreate.listener.BeforeJobInsertionListener; -import jsprit.core.algorithm.recreate.listener.JobInsertedListener; -import jsprit.core.algorithm.ruin.listener.RuinListener; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.listener.StrategySelectedListener; +import com.graphhopper.jsprit.core.algorithm.recreate.InsertionData; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.BeforeJobInsertionListener; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.JobInsertedListener; +import com.graphhopper.jsprit.core.algorithm.ruin.listener.RuinListener; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import junit.framework.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/io/TestAlgorithmReader.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/io/TestAlgorithmReader.java similarity index 81% rename from jsprit-core/src/test/java/jsprit/core/algorithm/io/TestAlgorithmReader.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/io/TestAlgorithmReader.java index b5bb07c2..1c333bfe 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/io/TestAlgorithmReader.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/io/TestAlgorithmReader.java @@ -14,29 +14,29 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.io; +package com.graphhopper.jsprit.core.algorithm.io; -import jsprit.core.algorithm.SearchStrategy; -import jsprit.core.algorithm.SearchStrategyModule; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.acceptor.GreedyAcceptance; -import jsprit.core.algorithm.acceptor.SolutionAcceptor; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms.ModKey; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap.AcceptorKey; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap.RuinStrategyKey; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap.SelectorKey; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap.StrategyModuleKey; -import jsprit.core.algorithm.listener.IterationEndsListener; -import jsprit.core.algorithm.listener.SearchStrategyModuleListener; -import jsprit.core.algorithm.ruin.RuinStrategy; -import jsprit.core.algorithm.ruin.listener.RuinListener; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.algorithm.selector.SolutionSelector; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy; +import com.graphhopper.jsprit.core.algorithm.SearchStrategyModule; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.acceptor.GreedyAcceptance; +import com.graphhopper.jsprit.core.algorithm.acceptor.SolutionAcceptor; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms.ModKey; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap.AcceptorKey; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap.RuinStrategyKey; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap.SelectorKey; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap.StrategyModuleKey; +import com.graphhopper.jsprit.core.algorithm.listener.IterationEndsListener; +import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyModuleListener; +import com.graphhopper.jsprit.core.algorithm.ruin.RuinStrategy; +import com.graphhopper.jsprit.core.algorithm.ruin.listener.RuinListener; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.algorithm.selector.SolutionSelector; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import junit.framework.Assert; import org.apache.commons.configuration.ConfigurationException; import org.junit.Before; @@ -105,7 +105,7 @@ public class TestAlgorithmReader { @Test public void testTypedMap() { - jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap typedMap = new jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap(); + VehicleRoutingAlgorithms.TypedMap typedMap = new VehicleRoutingAlgorithms.TypedMap(); String acceptorName = "acceptor"; String acceptorId = "acceptorId"; @@ -123,7 +123,7 @@ public class TestAlgorithmReader { @Test public void testTypedMap2() { - jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap typedMap = new jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap(); + VehicleRoutingAlgorithms.TypedMap typedMap = new VehicleRoutingAlgorithms.TypedMap(); String acceptorName = "acceptor"; String acceptorId = "acceptorId"; @@ -147,7 +147,7 @@ public class TestAlgorithmReader { @Test public void testTypedMap3() { - jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap typedMap = new jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap(); + VehicleRoutingAlgorithms.TypedMap typedMap = new VehicleRoutingAlgorithms.TypedMap(); String acceptorName = "acceptor"; String acceptorId = "acceptorId"; @@ -179,7 +179,7 @@ public class TestAlgorithmReader { @Test public void testTypedMap4() { - jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap typedMap = new jsprit.core.algorithm.io.VehicleRoutingAlgorithms.TypedMap(); + VehicleRoutingAlgorithms.TypedMap typedMap = new VehicleRoutingAlgorithms.TypedMap(); String acceptorName = "acceptor"; String acceptorId = "acceptorId"; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/CalcVehicleTypeDependentServiceInsertionTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/CalcVehicleTypeDependentServiceInsertionTest.java similarity index 91% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/CalcVehicleTypeDependentServiceInsertionTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/CalcVehicleTypeDependentServiceInsertionTest.java index 88846578..d7b01d4a 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/CalcVehicleTypeDependentServiceInsertionTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/CalcVehicleTypeDependentServiceInsertionTest.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.*; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.*; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/CalcWithTimeSchedulingTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/CalcWithTimeSchedulingTest.java similarity index 76% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/CalcWithTimeSchedulingTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/CalcWithTimeSchedulingTest.java index adeab6b6..a6cd8141 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/CalcWithTimeSchedulingTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/CalcWithTimeSchedulingTest.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; -import jsprit.core.util.CrowFlyCosts; -import jsprit.core.util.Solutions; -import jsprit.core.util.TestUtils; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.CrowFlyCosts; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.util.TestUtils; import java.util.Collection; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculatorTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculatorTest.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculatorTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculatorTest.java index fbcd7dc2..eca63d53 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculatorTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculatorTest.java @@ -16,16 +16,16 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/RegretInsertionTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionTest.java similarity index 91% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/RegretInsertionTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionTest.java index 5b54e596..e192e9fe 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/RegretInsertionTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionTest.java @@ -15,22 +15,22 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.listener.BeforeJobInsertionListener; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.FiniteFleetManagerFactory; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleFleetManager; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.BeforeJobInsertionListener; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.FiniteFleetManagerFactory; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.Coordinate; import junit.framework.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java similarity index 76% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java index c071c26f..786d7a16 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java @@ -14,34 +14,34 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.listener.InsertionListeners; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.HardActivityConstraint; -import jsprit.core.problem.constraint.HardRouteConstraint; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.driver.DriverImpl; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.CostFactory; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListeners; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint; +import com.graphhopper.jsprit.core.problem.constraint.HardRouteConstraint; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.CostFactory; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java similarity index 88% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java index f972b55d..f73f5f75 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java @@ -14,38 +14,37 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.listener.InsertionListeners; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.ConstraintManager.Priority; -import jsprit.core.problem.constraint.HardRouteConstraint; -import jsprit.core.problem.constraint.PickupAndDeliverShipmentLoadActivityLevelConstraint; -import jsprit.core.problem.constraint.ShipmentPickupsFirstConstraint; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.driver.DriverImpl; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.DeliverShipment; -import jsprit.core.problem.solution.route.activity.PickupService; -import jsprit.core.problem.solution.route.activity.PickupShipment; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.CostFactory; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListeners; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.HardRouteConstraint; +import com.graphhopper.jsprit.core.problem.constraint.PickupAndDeliverShipmentLoadActivityLevelConstraint; +import com.graphhopper.jsprit.core.problem.constraint.ShipmentPickupsFirstConstraint; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.DeliverShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupService; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.CostFactory; import org.junit.Before; import org.junit.Test; @@ -251,8 +250,8 @@ public class ShipmentInsertionCalculatorTest { stateManager.informInsertionStarts(Arrays.asList(route), null); ConstraintManager constraintManager = new ConstraintManager(vrp, stateManager); - constraintManager.addConstraint(new PickupAndDeliverShipmentLoadActivityLevelConstraint(stateManager), Priority.CRITICAL); - constraintManager.addConstraint(new ShipmentPickupsFirstConstraint(), Priority.CRITICAL); + constraintManager.addConstraint(new PickupAndDeliverShipmentLoadActivityLevelConstraint(stateManager), ConstraintManager.Priority.CRITICAL); + constraintManager.addConstraint(new ShipmentPickupsFirstConstraint(), ConstraintManager.Priority.CRITICAL); ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager); diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestAuxilliaryCostCalculator.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestAuxilliaryCostCalculator.java similarity index 91% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestAuxilliaryCostCalculator.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestAuxilliaryCostCalculator.java index 720b93ac..61abd261 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestAuxilliaryCostCalculator.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestAuxilliaryCostCalculator.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java similarity index 87% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java index bf2d4d71..4723182e 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java @@ -14,33 +14,32 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.driver.DriverImpl; -import jsprit.core.problem.driver.DriverImpl.NoDriver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; -import jsprit.core.util.EuclideanDistanceCalculator; -import jsprit.core.util.Locations; -import jsprit.core.util.ManhattanDistanceCalculator; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.EuclideanDistanceCalculator; +import com.graphhopper.jsprit.core.util.Locations; +import com.graphhopper.jsprit.core.util.ManhattanDistanceCalculator; import org.junit.Before; import org.junit.Test; @@ -68,7 +67,7 @@ public class TestCalculatesServiceInsertion { private StateManager states; - private NoDriver driver; + private DriverImpl.NoDriver driver; private VehicleRoutingProblem vrp; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertionOnRouteLevel.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertionOnRouteLevel.java similarity index 85% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertionOnRouteLevel.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertionOnRouteLevel.java index c9f74ac1..97754f1b 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertionOnRouteLevel.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertionOnRouteLevel.java @@ -14,27 +14,27 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.ExampleActivityCostFunction; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.UpdateVariableCosts; -import jsprit.core.problem.*; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.driver.DriverImpl; -import jsprit.core.problem.driver.DriverImpl.NoDriver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.CostFactory; +import com.graphhopper.jsprit.core.algorithm.ExampleActivityCostFunction; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.UpdateVariableCosts; +import com.graphhopper.jsprit.core.problem.*; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl.NoDriver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.CostFactory; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestDepartureTimeOpt.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestDepartureTimeOpt.java similarity index 81% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestDepartureTimeOpt.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestDepartureTimeOpt.java index 9ed591c5..c515ee11 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestDepartureTimeOpt.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestDepartureTimeOpt.java @@ -14,32 +14,30 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.Builder; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; -import jsprit.core.util.TestUtils; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.util.TestUtils; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; import java.util.Collection; -import static org.junit.Assert.assertEquals; - @Ignore public class TestDepartureTimeOpt { @@ -50,7 +48,7 @@ public class TestDepartureTimeOpt { Vehicle vehicle = VehicleImpl.Builder.newInstance("v").setStartLocation(TestUtils.loc("vehLoc", Coordinate.newInstance(0, 0))) .setType(VehicleTypeImpl.Builder.newInstance("vType").build()).build(); - Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); vrpBuilder.setActivityCosts(new VehicleRoutingActivityCosts() { @Override @@ -66,7 +64,7 @@ public class TestDepartureTimeOpt { VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "src/test/resources/algorithmConfig.xml"); Collection solutions = vra.searchSolutions(); - assertEquals(20.0 + 30.0, Solutions.bestOf(solutions).getCost(), 0.1); + Assert.assertEquals(20.0 + 30.0, Solutions.bestOf(solutions).getCost(), 0.1); } @@ -78,7 +76,7 @@ public class TestDepartureTimeOpt { Vehicle vehicle = VehicleImpl.Builder.newInstance("v").setStartLocation(Location.Builder.newInstance().setId("vehLoc").setCoordinate(Coordinate.newInstance(0, 0)).build()) .setType(VehicleTypeImpl.Builder.newInstance("vType").build()).build(); - Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); vrpBuilder.setActivityCosts(new VehicleRoutingActivityCosts() { @Override @@ -94,7 +92,7 @@ public class TestDepartureTimeOpt { VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "src/test/resources/algorithmConfig.xml"); Collection solutions = vra.searchSolutions(); - assertEquals(0.0, Solutions.bestOf(solutions).getRoutes().iterator().next().getStart().getEndTime(), 0.1); + Assert.assertEquals(0.0, Solutions.bestOf(solutions).getRoutes().iterator().next().getStart().getEndTime(), 0.1); } @@ -105,7 +103,7 @@ public class TestDepartureTimeOpt { Vehicle vehicle = VehicleImpl.Builder.newInstance("v").setStartLocation(TestUtils.loc("vehLoc", Coordinate.newInstance(0, 0))) .setType(VehicleTypeImpl.Builder.newInstance("vType").build()).build(); - Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); vrpBuilder.setActivityCosts(new VehicleRoutingActivityCosts() { @Override @@ -122,7 +120,7 @@ public class TestDepartureTimeOpt { VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "src/test/resources/algorithmConfigWithDepartureTimeChoice.xml"); Collection solutions = vra.searchSolutions(); - assertEquals(20.0, Solutions.bestOf(solutions).getCost(), 0.1); + Assert.assertEquals(20.0, Solutions.bestOf(solutions).getCost(), 0.1); } @@ -133,7 +131,7 @@ public class TestDepartureTimeOpt { Vehicle vehicle = VehicleImpl.Builder.newInstance("v").setStartLocation(TestUtils.loc("vehLoc", Coordinate.newInstance(0, 0))) .setType(VehicleTypeImpl.Builder.newInstance("vType").build()).build(); - Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); vrpBuilder.setActivityCosts(new VehicleRoutingActivityCosts() { @Override @@ -150,7 +148,7 @@ public class TestDepartureTimeOpt { VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "src/test/resources/algorithmConfigWithDepartureTimeChoice.xml"); Collection solutions = vra.searchSolutions(); - assertEquals(30.0, Solutions.bestOf(solutions).getRoutes().iterator().next().getStart().getEndTime(), 0.1); + Assert.assertEquals(30.0, Solutions.bestOf(solutions).getRoutes().iterator().next().getStart().getEndTime(), 0.1); } @@ -165,7 +163,7 @@ public class TestDepartureTimeOpt { Vehicle vehicle = VehicleImpl.Builder.newInstance("v").setStartLocation(TestUtils.loc("vehLoc", Coordinate.newInstance(0, 0))) .setType(VehicleTypeImpl.Builder.newInstance("vType").build()).build(); - Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); vrpBuilder.setActivityCosts(new VehicleRoutingActivityCosts() { @Override @@ -182,7 +180,7 @@ public class TestDepartureTimeOpt { VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "src/test/resources/algorithmConfigWithDepartureTimeChoice.xml"); Collection solutions = vra.searchSolutions(); - assertEquals(40.0, Solutions.bestOf(solutions).getCost(), 0.1); + Assert.assertEquals(40.0, Solutions.bestOf(solutions).getCost(), 0.1); } @@ -197,7 +195,7 @@ public class TestDepartureTimeOpt { Vehicle vehicle = VehicleImpl.Builder.newInstance("v").setStartLocation(TestUtils.loc("vehLoc", Coordinate.newInstance(0, 0))) .setType(VehicleTypeImpl.Builder.newInstance("vType").build()).build(); - Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); vrpBuilder.setActivityCosts(new VehicleRoutingActivityCosts() { @Override @@ -214,7 +212,7 @@ public class TestDepartureTimeOpt { VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "src/test/resources/algorithmConfigWithDepartureTimeChoice.xml"); Collection solutions = vra.searchSolutions(); - assertEquals(10.0, Solutions.bestOf(solutions).getRoutes().iterator().next().getStart().getEndTime(), 0.1); + Assert.assertEquals(10.0, Solutions.bestOf(solutions).getRoutes().iterator().next().getStart().getEndTime(), 0.1); } diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestInserter.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestInserter.java similarity index 92% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestInserter.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestInserter.java index 011dab8d..b97ed515 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestInserter.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestInserter.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.recreate.listener.InsertionListeners; -import jsprit.core.algorithm.state.UpdateEndLocationIfRouteIsOpen; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.DeliverShipment; -import jsprit.core.problem.solution.route.activity.PickupService; -import jsprit.core.problem.solution.route.activity.PickupShipment; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.algorithm.recreate.listener.InsertionListeners; +import com.graphhopper.jsprit.core.algorithm.state.UpdateEndLocationIfRouteIsOpen; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.DeliverShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupService; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; import org.junit.Test; import java.util.ArrayList; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java index 5a9d481d..c176c4c5 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java @@ -14,29 +14,29 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.UpdateActivityTimes; -import jsprit.core.algorithm.state.UpdateFutureWaitingTimes; -import jsprit.core.algorithm.state.UpdateVehicleDependentPracticalTimeWindows; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.cost.WaitingTimeCosts; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.End; -import jsprit.core.problem.solution.route.activity.Start; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.CostFactory; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.UpdateActivityTimes; +import com.graphhopper.jsprit.core.algorithm.state.UpdateFutureWaitingTimes; +import com.graphhopper.jsprit.core.algorithm.state.UpdateVehicleDependentPracticalTimeWindows; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.WaitingTimeCosts; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.End; +import com.graphhopper.jsprit.core.problem.solution.route.activity.Start; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.CostFactory; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestMixedServiceAndShipmentsProblemOnRouteLevel.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestMixedServiceAndShipmentsProblemOnRouteLevel.java similarity index 90% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestMixedServiceAndShipmentsProblemOnRouteLevel.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestMixedServiceAndShipmentsProblemOnRouteLevel.java index 0b4df767..2bcdaf5e 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestMixedServiceAndShipmentsProblemOnRouteLevel.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestMixedServiceAndShipmentsProblemOnRouteLevel.java @@ -16,18 +16,17 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.vehicle.*; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.util.Coordinate; -import jsprit.core.util.TestUtils; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.vehicle.*; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.TestUtils; import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -46,7 +45,7 @@ public class TestMixedServiceAndShipmentsProblemOnRouteLevel { /* * get a vehicle-builder and build a vehicle located at (10,10) with type "vehicleType" */ - Builder vehicleBuilder = VehicleImpl.Builder.newInstance("vehicle"); + VehicleImpl.Builder vehicleBuilder = VehicleImpl.Builder.newInstance("vehicle"); vehicleBuilder.setStartLocation(Location.newInstance(10, 10)); vehicleBuilder.setType(vehicleType); VehicleImpl vehicle = vehicleBuilder.build(); @@ -111,7 +110,7 @@ public class TestMixedServiceAndShipmentsProblemOnRouteLevel { /* * get a vehicle-builder and build a vehicle located at (10,10) with type "vehicleType" */ - Builder vehicleBuilder = VehicleImpl.Builder.newInstance("vehicle"); + VehicleImpl.Builder vehicleBuilder = VehicleImpl.Builder.newInstance("vehicle"); vehicleBuilder.setStartLocation(Location.newInstance(10, 10)); vehicleBuilder.setType(vehicleType); VehicleImpl vehicle = vehicleBuilder.build(); diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestRouteLevelActivityInsertionCostEstimator.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelActivityInsertionCostEstimator.java similarity index 87% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestRouteLevelActivityInsertionCostEstimator.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelActivityInsertionCostEstimator.java index 7b675fc6..a4d3a8f4 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestRouteLevelActivityInsertionCostEstimator.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelActivityInsertionCostEstimator.java @@ -16,30 +16,30 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.UpdateVariableCosts; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.PickupActivity; -import jsprit.core.problem.solution.route.activity.PickupService; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.CostFactory; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.UpdateVariableCosts; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupService; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.CostFactory; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestRouteLevelServiceInsertionCostEstimator.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelServiceInsertionCostEstimator.java similarity index 89% rename from jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestRouteLevelServiceInsertionCostEstimator.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelServiceInsertionCostEstimator.java index 4bc8754e..0a7d2223 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestRouteLevelServiceInsertionCostEstimator.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelServiceInsertionCostEstimator.java @@ -16,29 +16,29 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.recreate; +package com.graphhopper.jsprit.core.algorithm.recreate; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.UpdateVariableCosts; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.PickupService; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.CostFactory; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.UpdateVariableCosts; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupService; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.CostFactory; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/DBSCANClustererTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/DBSCANClustererTest.java similarity index 88% rename from jsprit-core/src/test/java/jsprit/core/algorithm/ruin/DBSCANClustererTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/DBSCANClustererTest.java index 6d6624fa..ac2f3b7e 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/DBSCANClustererTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/DBSCANClustererTest.java @@ -1,11 +1,11 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.EuclideanCosts; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.EuclideanCosts; import junit.framework.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImplTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImplTest.java similarity index 91% rename from jsprit-core/src/test/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImplTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImplTest.java index 95ff1b38..cb41d85c 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImplTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImplTest.java @@ -16,14 +16,14 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.distance.EuclideanServiceDistance; -import jsprit.core.algorithm.ruin.distance.JobDistance; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.EuclideanServiceDistance; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/JobNeighborhoodsWithCapRestrictionImplTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsWithCapRestrictionImplTest.java similarity index 92% rename from jsprit-core/src/test/java/jsprit/core/algorithm/ruin/JobNeighborhoodsWithCapRestrictionImplTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsWithCapRestrictionImplTest.java index fc1c2f02..099a215b 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/JobNeighborhoodsWithCapRestrictionImplTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsWithCapRestrictionImplTest.java @@ -16,14 +16,14 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.distance.EuclideanServiceDistance; -import jsprit.core.algorithm.ruin.distance.JobDistance; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.EuclideanServiceDistance; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/RuinBreakTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinBreakTest.java similarity index 68% rename from jsprit-core/src/test/java/jsprit/core/algorithm/ruin/RuinBreakTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinBreakTest.java index 193e57a4..85b10d7d 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/RuinBreakTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinBreakTest.java @@ -1,13 +1,13 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.BreakActivity; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.BreakActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import junit.framework.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/RuinClustersTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinClustersTest.java similarity index 79% rename from jsprit-core/src/test/java/jsprit/core/algorithm/ruin/RuinClustersTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinClustersTest.java index 25460197..3a973c7c 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/RuinClustersTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinClustersTest.java @@ -1,13 +1,13 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.algorithm.ruin.distance.AvgServiceAndShipmentDistance; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.AvgServiceAndShipmentDistance; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; import junit.framework.Assert; import org.junit.Test; @@ -50,5 +50,5 @@ public class RuinClustersTest { } - + } diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/RuinWorstTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinWorstTest.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/algorithm/ruin/RuinWorstTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinWorstTest.java index 253d4a5b..fad528c6 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/RuinWorstTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinWorstTest.java @@ -1,13 +1,13 @@ -package jsprit.core.algorithm.ruin; +package com.graphhopper.jsprit.core.algorithm.ruin; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.Coordinate; import org.junit.Test; import java.util.Arrays; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/distance/AverageJobDistanceTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/AverageJobDistanceTest.java similarity index 90% rename from jsprit-core/src/test/java/jsprit/core/algorithm/ruin/distance/AverageJobDistanceTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/AverageJobDistanceTest.java index 481bd360..196c1b2b 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/distance/AverageJobDistanceTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/AverageJobDistanceTest.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin.distance; +package com.graphhopper.jsprit.core.algorithm.ruin.distance; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.util.Coordinate; -import jsprit.core.util.CrowFlyCosts; -import jsprit.core.util.Locations; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.CrowFlyCosts; +import com.graphhopper.jsprit.core.util.Locations; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/distance/TestJobDistanceAvgCosts.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/TestJobDistanceAvgCosts.java similarity index 91% rename from jsprit-core/src/test/java/jsprit/core/algorithm/ruin/distance/TestJobDistanceAvgCosts.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/TestJobDistanceAvgCosts.java index 23eb5fb6..54fc46bf 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/distance/TestJobDistanceAvgCosts.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/distance/TestJobDistanceAvgCosts.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.ruin.distance; +package com.graphhopper.jsprit.core.algorithm.ruin.distance; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/selector/SelectBestTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/selector/SelectBestTest.java similarity index 93% rename from jsprit-core/src/test/java/jsprit/core/algorithm/selector/SelectBestTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/selector/SelectBestTest.java index e8ce3ace..6ef556cf 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/selector/SelectBestTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/selector/SelectBestTest.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.selector; +package com.graphhopper.jsprit.core.algorithm.selector; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.junit.Test; import java.util.Arrays; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/selector/SelectRandomlyTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/selector/SelectRandomlyTest.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/algorithm/selector/SelectRandomlyTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/selector/SelectRandomlyTest.java index a32b8920..9425cd7b 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/selector/SelectRandomlyTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/selector/SelectRandomlyTest.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.selector; +package com.graphhopper.jsprit.core.algorithm.selector; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import org.junit.Test; import java.util.Arrays; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/state/HardPickupAndDeliveryShipmentActivityConstraintTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/HardPickupAndDeliveryShipmentActivityConstraintTest.java similarity index 80% rename from jsprit-core/src/test/java/jsprit/core/algorithm/state/HardPickupAndDeliveryShipmentActivityConstraintTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/HardPickupAndDeliveryShipmentActivityConstraintTest.java index 78cc9cbb..328542e3 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/state/HardPickupAndDeliveryShipmentActivityConstraintTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/HardPickupAndDeliveryShipmentActivityConstraintTest.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.HardActivityConstraint.ConstraintsStatus; -import jsprit.core.problem.constraint.PickupAndDeliverShipmentLoadActivityLevelConstraint; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.DeliverShipment; -import jsprit.core.problem.solution.route.activity.PickupService; -import jsprit.core.problem.solution.route.activity.PickupShipment; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint.ConstraintsStatus; +import com.graphhopper.jsprit.core.problem.constraint.PickupAndDeliverShipmentLoadActivityLevelConstraint; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.DeliverShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupService; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupShipment; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/state/LoadStateTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/LoadStateTest.java similarity index 97% rename from jsprit-core/src/test/java/jsprit/core/algorithm/state/LoadStateTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/LoadStateTest.java index d138cc4b..4bb52dd3 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/state/LoadStateTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/LoadStateTest.java @@ -15,13 +15,13 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.*; -import jsprit.core.problem.job.*; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.*; +import com.graphhopper.jsprit.core.problem.job.*; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/state/StateManagerTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/StateManagerTest.java similarity index 94% rename from jsprit-core/src/test/java/jsprit/core/algorithm/state/StateManagerTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/StateManagerTest.java index 9d20eefa..0e7cc249 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/state/StateManagerTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/StateManagerTest.java @@ -14,18 +14,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.*; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ServiceActivity; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.problem.*; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ServiceActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -205,7 +206,7 @@ public class StateManagerTest { public void whenCreatingNewState_itShouldHaveAnIndex() { StateManager stateManager = new StateManager(vrpMock); StateId stateId = stateManager.createStateId("foo-state"); - assertEquals(21, stateId.getIndex()); + Assert.assertEquals(21, stateId.getIndex()); } @Test @@ -213,8 +214,8 @@ public class StateManagerTest { StateManager stateManager = new StateManager(vrpMock); StateId fooState = stateManager.createStateId("foo-state"); StateId foofooState = stateManager.createStateId("foo-foo-state"); - assertEquals(21, fooState.getIndex()); - assertEquals(22, foofooState.getIndex()); + Assert.assertEquals(21, fooState.getIndex()); + Assert.assertEquals(22, foofooState.getIndex()); } @Test @@ -222,8 +223,8 @@ public class StateManagerTest { StateManager stateManager = new StateManager(vrpMock); StateId fooState = stateManager.createStateId("foo-state"); StateId foofooState = stateManager.createStateId("foo-state"); - assertEquals(21, fooState.getIndex()); - assertEquals(21, foofooState.getIndex()); + Assert.assertEquals(21, fooState.getIndex()); + Assert.assertEquals(21, foofooState.getIndex()); } @Test diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdatePracticalTimeWindowTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindowTest.java similarity index 80% rename from jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdatePracticalTimeWindowTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindowTest.java index 5b97b4a5..5bb79a9a 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdatePracticalTimeWindowTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindowTest.java @@ -16,24 +16,24 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.solution.route.ReverseRouteActivityVisitor; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.util.CostFactory; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.solution.route.ReverseRouteActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.util.CostFactory; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdateRequiredSkillsTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateRequiredSkillsTest.java similarity index 79% rename from jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdateRequiredSkillsTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateRequiredSkillsTest.java index 1c2ef585..0d9325bf 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdateRequiredSkillsTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateRequiredSkillsTest.java @@ -1,13 +1,13 @@ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.Location; -import jsprit.core.problem.Skills; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.Skills; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import junit.framework.Assert; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdateVariableCostsTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCostsTest.java similarity index 94% rename from jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdateVariableCostsTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCostsTest.java index 1438a00b..d804dd97 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdateVariableCostsTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCostsTest.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; public class UpdateVariableCostsTest { diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdateVehicleDependentTimeWindowTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentTimeWindowTest.java similarity index 90% rename from jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdateVehicleDependentTimeWindowTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentTimeWindowTest.java index 5d457a43..c20f2758 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/state/UpdateVehicleDependentTimeWindowTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentTimeWindowTest.java @@ -1,19 +1,19 @@ -package jsprit.core.algorithm.state; +package com.graphhopper.jsprit.core.algorithm.state; -import jsprit.core.problem.AbstractActivity; -import jsprit.core.problem.JobActivityFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.FiniteFleetManagerFactory; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleFleetManager; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.CostFactory; +import com.graphhopper.jsprit.core.problem.AbstractActivity; +import com.graphhopper.jsprit.core.problem.JobActivityFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.FiniteFleetManagerFactory; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.CostFactory; import org.junit.Before; import org.junit.Test; @@ -193,7 +193,7 @@ public class UpdateVehicleDependentTimeWindowTest { .setRoutingCost(routingCosts).build(); VehicleRoute route = VehicleRoute.Builder.newInstance(vehicle).setJobActivityFactory(vrp.getJobActivityFactory()) - .addService(service).addService(service2, TimeWindow.newInstance(70,80)).build(); + .addService(service).addService(service2, TimeWindow.newInstance(70, 80)).build(); StateManager stateManager = new StateManager(vrp); UpdateVehicleDependentPracticalTimeWindows updater = new UpdateVehicleDependentPracticalTimeWindows(stateManager,routingCosts); diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/termination/IterationsWithoutImprovementTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/termination/IterationsWithoutImprovementTest.java similarity index 94% rename from jsprit-core/src/test/java/jsprit/core/algorithm/termination/IterationsWithoutImprovementTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/termination/IterationsWithoutImprovementTest.java index 044bdd93..aa625545 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/termination/IterationsWithoutImprovementTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/termination/IterationsWithoutImprovementTest.java @@ -1,7 +1,7 @@ -package jsprit.core.algorithm.termination; +package com.graphhopper.jsprit.core.algorithm.termination; -import jsprit.core.algorithm.SearchStrategy; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy; import junit.framework.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/termination/TimeTerminationTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/termination/TimeTerminationTest.java similarity index 96% rename from jsprit-core/src/test/java/jsprit/core/algorithm/termination/TimeTerminationTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/termination/TimeTerminationTest.java index 3c9fb015..39a5f79a 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/termination/TimeTerminationTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/termination/TimeTerminationTest.java @@ -15,7 +15,7 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.algorithm.termination; +package com.graphhopper.jsprit.core.algorithm.termination; import junit.framework.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/analysis/SolutionAnalyserTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyserTest.java similarity index 98% rename from jsprit-core/src/test/java/jsprit/core/analysis/SolutionAnalyserTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyserTest.java index b3c98aee..21703538 100644 --- a/jsprit-core/src/test/java/jsprit/core/analysis/SolutionAnalyserTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyserTest.java @@ -15,29 +15,29 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.analysis; +package com.graphhopper.jsprit.core.analysis; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.cost.TransportDistance; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.ManhattanCosts; -import jsprit.core.util.TestUtils; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.cost.TransportDistance; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.ManhattanCosts; +import com.graphhopper.jsprit.core.util.TestUtils; import junit.framework.Assert; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/CapacityTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/CapacityTest.java similarity index 99% rename from jsprit-core/src/test/java/jsprit/core/problem/CapacityTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/CapacityTest.java index 8a74788c..946e87ad 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/CapacityTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/CapacityTest.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/LocationTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/LocationTest.java similarity index 96% rename from jsprit-core/src/test/java/jsprit/core/problem/LocationTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/LocationTest.java index 29962b22..97092199 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/LocationTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/LocationTest.java @@ -15,9 +15,9 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Coordinate; import junit.framework.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/SkillsTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/SkillsTest.java similarity index 98% rename from jsprit-core/src/test/java/jsprit/core/problem/SkillsTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/SkillsTest.java index 263fce72..4629198f 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/SkillsTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/SkillsTest.java @@ -1,4 +1,4 @@ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/VehicleRoutingProblemTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblemTest.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/problem/VehicleRoutingProblemTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblemTest.java index 1da8985b..734e8ba7 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/VehicleRoutingProblemTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblemTest.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem; +package com.graphhopper.jsprit.core.problem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; -import jsprit.core.problem.cost.VehicleRoutingActivityCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.driver.DriverImpl; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; -import jsprit.core.util.TestUtils; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.TestUtils; import org.junit.Test; import java.util.ArrayList; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/constraint/LoadConstraintTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/LoadConstraintTest.java similarity index 98% rename from jsprit-core/src/test/java/jsprit/core/problem/constraint/LoadConstraintTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/LoadConstraintTest.java index 193e2186..98f3dc7d 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/constraint/LoadConstraintTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/LoadConstraintTest.java @@ -15,16 +15,16 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.*; -import jsprit.core.problem.job.*; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.*; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.*; +import com.graphhopper.jsprit.core.problem.job.*; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.*; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraintTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraintTest.java similarity index 94% rename from jsprit-core/src/test/java/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraintTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraintTest.java index 530045ae..0590e3ce 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraintTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/ServiceLoadRouteLevelConstraintTest.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/constraint/SkillConstraintTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/SkillConstraintTest.java similarity index 87% rename from jsprit-core/src/test/java/jsprit/core/problem/constraint/SkillConstraintTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/SkillConstraintTest.java index fa1cee12..83972528 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/constraint/SkillConstraintTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/SkillConstraintTest.java @@ -15,17 +15,17 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/constraint/SoftActivityConstraintManagerTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/SoftActivityConstraintManagerTest.java similarity index 93% rename from jsprit-core/src/test/java/jsprit/core/problem/constraint/SoftActivityConstraintManagerTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/SoftActivityConstraintManagerTest.java index c3dbd3f2..560b9887 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/constraint/SoftActivityConstraintManagerTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/SoftActivityConstraintManagerTest.java @@ -16,10 +16,10 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/constraint/SoftRouteConstraintManagerTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/SoftRouteConstraintManagerTest.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/problem/constraint/SoftRouteConstraintManagerTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/SoftRouteConstraintManagerTest.java index f571eb39..445e12c6 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/constraint/SoftRouteConstraintManagerTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/SoftRouteConstraintManagerTest.java @@ -16,9 +16,9 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/constraint/TestConstraintManager.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/TestConstraintManager.java similarity index 94% rename from jsprit-core/src/test/java/jsprit/core/problem/constraint/TestConstraintManager.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/TestConstraintManager.java index 5cad2d4c..7e65ed95 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/constraint/TestConstraintManager.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/TestConstraintManager.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; import org.junit.Test; import java.util.ArrayList; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowTest.java similarity index 94% rename from jsprit-core/src/test/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowTest.java index a9e4a694..610d61e2 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowTest.java @@ -15,21 +15,21 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.UpdateActivityTimes; -import jsprit.core.algorithm.state.UpdateVehicleDependentPracticalTimeWindows; -import jsprit.core.problem.*; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.PickupService; -import jsprit.core.problem.vehicle.*; -import jsprit.core.util.CostFactory; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.UpdateActivityTimes; +import com.graphhopper.jsprit.core.algorithm.state.UpdateVehicleDependentPracticalTimeWindows; +import com.graphhopper.jsprit.core.problem.*; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupService; +import com.graphhopper.jsprit.core.problem.vehicle.*; +import com.graphhopper.jsprit.core.util.CostFactory; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest.java similarity index 94% rename from jsprit-core/src/test/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest.java index 652e55f4..a918edde 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest.java @@ -15,21 +15,21 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.constraint; +package com.graphhopper.jsprit.core.problem.constraint; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.UpdateActivityTimes; -import jsprit.core.algorithm.state.UpdateVehicleDependentPracticalTimeWindows; -import jsprit.core.problem.*; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.PickupService; -import jsprit.core.problem.vehicle.*; -import jsprit.core.util.CostFactory; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.UpdateActivityTimes; +import com.graphhopper.jsprit.core.algorithm.state.UpdateVehicleDependentPracticalTimeWindows; +import com.graphhopper.jsprit.core.problem.*; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupService; +import com.graphhopper.jsprit.core.problem.vehicle.*; +import com.graphhopper.jsprit.core.util.CostFactory; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/io/VrpXMLReaderTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/io/VrpXMLReaderTest.java similarity index 97% rename from jsprit-core/src/test/java/jsprit/core/problem/io/VrpXMLReaderTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/io/VrpXMLReaderTest.java index 73d5d3e3..7595677a 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/io/VrpXMLReaderTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/io/VrpXMLReaderTest.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.io; +package com.graphhopper.jsprit.core.problem.io; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.activity.DeliverShipment; -import jsprit.core.problem.solution.route.activity.PickupService; -import jsprit.core.problem.solution.route.activity.PickupShipment; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.activity.DeliverShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupService; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupShipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.Solutions; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/io/VrpXMLWriterTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/io/VrpXMLWriterTest.java similarity index 85% rename from jsprit-core/src/test/java/jsprit/core/problem/io/VrpXMLWriterTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/io/VrpXMLWriterTest.java index cfff0393..13aad736 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/io/VrpXMLWriterTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/io/VrpXMLWriterTest.java @@ -14,23 +14,22 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.io; +package com.graphhopper.jsprit.core.problem.io; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.Builder; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; -import jsprit.core.util.TestUtils; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.util.TestUtils; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -52,7 +51,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingInfiniteVrp_itWritesCorrectly() { VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); - builder.setFleetSize(FleetSize.INFINITE); + builder.setFleetSize(VehicleRoutingProblem.FleetSize.INFINITE); VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleImpl vehicle = VehicleImpl.Builder.newInstance("myVehicle").setStartLocation(TestUtils.loc("loc")).setType(type).build(); builder.addVehicle(vehicle); @@ -63,7 +62,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingFiniteVrp_itWritesCorrectly() { VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); - builder.setFleetSize(FleetSize.FINITE); + builder.setFleetSize(VehicleRoutingProblem.FleetSize.FINITE); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); VehicleImpl v1 = VehicleImpl.Builder.newInstance("v1").setStartLocation(TestUtils.loc("loc")).setType(type1).build(); @@ -77,7 +76,7 @@ public class VrpXMLWriterTest { @Test public void t() { VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); - builder.setFleetSize(FleetSize.FINITE); + builder.setFleetSize(VehicleRoutingProblem.FleetSize.FINITE); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); VehicleImpl v1 = VehicleImpl.Builder.newInstance("v1").setStartLocation(TestUtils.loc("loc")).setType(type1).build(); @@ -93,7 +92,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingServices_itWritesThemCorrectly() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -117,14 +116,14 @@ public class VrpXMLWriterTest { Service s1_read = (Service) vrp.getJobs().get("1"); assertEquals("1", s1_read.getId()); - assertEquals("loc", s1_read.getLocation().getId()); + Assert.assertEquals("loc", s1_read.getLocation().getId()); assertEquals("service", s1_read.getType()); assertEquals(2.0, s1_read.getServiceDuration(), 0.01); } @Test public void shouldWriteNameOfService() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); Service s1 = Service.Builder.newInstance("1").setName("cleaning").addSizeDimension(0, 1).setLocation(TestUtils.loc("loc")).setServiceTime(2.0).build(); VehicleRoutingProblem vrp = builder.addJob(s1).build(); @@ -139,7 +138,7 @@ public class VrpXMLWriterTest { @Test public void shouldWriteNameOfShipment() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); Location pickLocation = Location.Builder.newInstance().setId("pick").setIndex(1).build(); Shipment s1 = Shipment.Builder.newInstance("1").setName("cleaning") .setPickupLocation(pickLocation) @@ -153,12 +152,12 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); Shipment s1_read = (Shipment) readVrp.getJobs().get("1"); assertTrue(s1_read.getName().equals("cleaning")); - assertEquals(1, s1_read.getPickupLocation().getIndex()); + Assert.assertEquals(1, s1_read.getPickupLocation().getIndex()); } @Test public void whenWritingServicesWithSeveralCapacityDimensions_itWritesThemCorrectly() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); Service s1 = Service.Builder.newInstance("1") .addSizeDimension(0, 20) @@ -176,15 +175,15 @@ public class VrpXMLWriterTest { Service s1_read = (Service) vrp.getJobs().get("1"); - assertEquals(2, s1_read.getSize().getNuOfDimensions()); - assertEquals(20, s1_read.getSize().get(0)); - assertEquals(200, s1_read.getSize().get(1)); + Assert.assertEquals(2, s1_read.getSize().getNuOfDimensions()); + Assert.assertEquals(20, s1_read.getSize().get(0)); + Assert.assertEquals(200, s1_read.getSize().get(1)); } @Test public void whenWritingShipments_readingThemAgainMustReturnTheWrittenLocationIdsOfS1() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -212,14 +211,14 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); assertEquals(2, readVrp.getJobs().size()); - assertEquals("pickLoc", ((Shipment) readVrp.getJobs().get("1")).getPickupLocation().getId()); - assertEquals("delLoc", ((Shipment) readVrp.getJobs().get("1")).getDeliveryLocation().getId()); + Assert.assertEquals("pickLoc", ((Shipment) readVrp.getJobs().get("1")).getPickupLocation().getId()); + Assert.assertEquals("delLoc", ((Shipment) readVrp.getJobs().get("1")).getDeliveryLocation().getId()); } @Test public void whenWritingShipments_readingThemAgainMustReturnTheWrittenPickupTimeWindowsOfS1() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -247,15 +246,15 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); assertEquals(2, readVrp.getJobs().size()); - assertEquals(1.0, ((Shipment) readVrp.getJobs().get("1")).getPickupTimeWindow().getStart(), 0.01); - assertEquals(2.0, ((Shipment) readVrp.getJobs().get("1")).getPickupTimeWindow().getEnd(), 0.01); + Assert.assertEquals(1.0, ((Shipment) readVrp.getJobs().get("1")).getPickupTimeWindow().getStart(), 0.01); + Assert.assertEquals(2.0, ((Shipment) readVrp.getJobs().get("1")).getPickupTimeWindow().getEnd(), 0.01); } @Test public void whenWritingShipments_readingThemAgainMustReturnTheWrittenDeliveryTimeWindowsOfS1() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -283,14 +282,14 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); assertEquals(2, readVrp.getJobs().size()); - assertEquals(3.0, ((Shipment) readVrp.getJobs().get("1")).getDeliveryTimeWindow().getStart(), 0.01); - assertEquals(4.0, ((Shipment) readVrp.getJobs().get("1")).getDeliveryTimeWindow().getEnd(), 0.01); + Assert.assertEquals(3.0, ((Shipment) readVrp.getJobs().get("1")).getDeliveryTimeWindow().getStart(), 0.01); + Assert.assertEquals(4.0, ((Shipment) readVrp.getJobs().get("1")).getDeliveryTimeWindow().getEnd(), 0.01); } @Test public void whenWritingShipments_readingThemAgainMustReturnTheWrittenDeliveryServiceTimeOfS1() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -325,7 +324,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingShipments_readingThemAgainMustReturnTheWrittenLocationIdOfS1() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -352,12 +351,12 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); assertEquals(2, readVrp.getJobs().size()); - assertEquals("[x=1.0][y=2.0]", ((Shipment) readVrp.getJobs().get("1")).getPickupLocation().getId()); + Assert.assertEquals("[x=1.0][y=2.0]", ((Shipment) readVrp.getJobs().get("1")).getPickupLocation().getId()); } @Test public void whenWritingVehicles_vehShouldHave2Skills() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleImpl v = VehicleImpl.Builder.newInstance("v1").addSkill("SKILL5").addSkill("skill1").addSkill("Skill2") .setStartLocation(TestUtils.loc("loc")).setType(type1).build(); @@ -371,12 +370,12 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); Vehicle veh1 = getVehicle("v1", readVrp); - assertEquals(3, veh1.getSkills().values().size()); + Assert.assertEquals(3, veh1.getSkills().values().size()); } @Test public void whenWritingVehicles_vehShouldContain_skill5() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleImpl v = VehicleImpl.Builder.newInstance("v1").addSkill("SKILL5").addSkill("skill1").addSkill("Skill2") .setStartLocation(TestUtils.loc("loc")).setType(type1).build(); @@ -395,7 +394,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingVehicles_vehShouldContain_skill1() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleImpl v = VehicleImpl.Builder.newInstance("v1").addSkill("SKILL5").addSkill("skill1").addSkill("Skill2") .setStartLocation(TestUtils.loc("loc")).setType(type1).build(); @@ -414,7 +413,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingVehicles_vehShouldContain_skill2() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleImpl v = VehicleImpl.Builder.newInstance("v1").addSkill("SKILL5").addSkill("skill1").addSkill("Skill2") .setStartLocation(TestUtils.loc("loc")).setType(type1).build(); @@ -433,7 +432,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingVehicles_vehShouldHave0Skills() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleImpl v = VehicleImpl.Builder.newInstance("v1").setStartLocation(TestUtils.loc("loc")).setType(type1).build(); builder.addVehicle(v); @@ -446,7 +445,7 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); Vehicle veh = getVehicle("v1", readVrp); - assertEquals(0, veh.getSkills().values().size()); + Assert.assertEquals(0, veh.getSkills().values().size()); } private Vehicle getVehicle(String v1, VehicleRoutingProblem readVrp) { @@ -458,7 +457,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingShipments_shipmentShouldHaveCorrectNuSkills() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); Shipment s = Shipment.Builder.newInstance("1").addRequiredSkill("skill1").addRequiredSkill("skill2").addRequiredSkill("skill3") .addSizeDimension(0, 10) @@ -474,12 +473,12 @@ public class VrpXMLWriterTest { new VrpXMLReader(vrpToReadBuilder, null).read(infileName); VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); - assertEquals(3, readVrp.getJobs().get("1").getRequiredSkills().values().size()); + Assert.assertEquals(3, readVrp.getJobs().get("1").getRequiredSkills().values().size()); } @Test public void whenWritingShipments_shipmentShouldContain_skill1() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); Shipment s = Shipment.Builder.newInstance("1").addRequiredSkill("skill1").addRequiredSkill("skill2").addRequiredSkill("skill3") .addSizeDimension(0, 10) @@ -500,7 +499,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingShipments_shipmentShouldContain_skill2() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); Shipment s = Shipment.Builder.newInstance("1").addRequiredSkill("skill1").addRequiredSkill("Skill2").addRequiredSkill("skill3") .addSizeDimension(0, 10) @@ -521,7 +520,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingShipments_shipmentShouldContain_skill3() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); Shipment s = Shipment.Builder.newInstance("1").addRequiredSkill("skill1").addRequiredSkill("Skill2").addRequiredSkill("skill3") .addSizeDimension(0, 10) @@ -542,7 +541,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingShipments_readingThemAgainMustReturnTheWrittenLocationCoordinateOfS1() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -571,16 +570,16 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); assertEquals(2, readVrp.getJobs().size()); - assertEquals(1.0, ((Shipment) readVrp.getJobs().get("1")).getPickupLocation().getCoordinate().getX(), 0.01); - assertEquals(2.0, ((Shipment) readVrp.getJobs().get("1")).getPickupLocation().getCoordinate().getY(), 0.01); + Assert.assertEquals(1.0, ((Shipment) readVrp.getJobs().get("1")).getPickupLocation().getCoordinate().getX(), 0.01); + Assert.assertEquals(2.0, ((Shipment) readVrp.getJobs().get("1")).getPickupLocation().getCoordinate().getY(), 0.01); - assertEquals(5.0, ((Shipment) readVrp.getJobs().get("1")).getDeliveryLocation().getCoordinate().getX(), 0.01); - assertEquals(6.0, ((Shipment) readVrp.getJobs().get("1")).getDeliveryLocation().getCoordinate().getY(), 0.01); + Assert.assertEquals(5.0, ((Shipment) readVrp.getJobs().get("1")).getDeliveryLocation().getCoordinate().getX(), 0.01); + Assert.assertEquals(6.0, ((Shipment) readVrp.getJobs().get("1")).getDeliveryLocation().getCoordinate().getY(), 0.01); } @Test public void whenWritingShipmentWithSeveralCapacityDimension_itShouldWriteAndReadItCorrectly() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); Shipment s1 = Shipment.Builder.newInstance("1") .setPickupLocation(TestUtils.loc(Coordinate.newInstance(1, 2))) @@ -603,18 +602,18 @@ public class VrpXMLWriterTest { new VrpXMLReader(vrpToReadBuilder, null).read(infileName); VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); - assertEquals(3, (readVrp.getJobs().get("1")).getSize().getNuOfDimensions()); - assertEquals(10, (readVrp.getJobs().get("1")).getSize().get(0)); - assertEquals(0, (readVrp.getJobs().get("1")).getSize().get(1)); - assertEquals(100, (readVrp.getJobs().get("1")).getSize().get(2)); + Assert.assertEquals(3, (readVrp.getJobs().get("1")).getSize().getNuOfDimensions()); + Assert.assertEquals(10, (readVrp.getJobs().get("1")).getSize().get(0)); + Assert.assertEquals(0, (readVrp.getJobs().get("1")).getSize().get(1)); + Assert.assertEquals(100, (readVrp.getJobs().get("1")).getSize().get(2)); - assertEquals(1, (readVrp.getJobs().get("2")).getSize().getNuOfDimensions()); - assertEquals(20, (readVrp.getJobs().get("2")).getSize().get(0)); + Assert.assertEquals(1, (readVrp.getJobs().get("2")).getSize().getNuOfDimensions()); + Assert.assertEquals(20, (readVrp.getJobs().get("2")).getSize().get(0)); } @Test public void whenWritingVehicleV1_itsStartLocationMustBeWrittenCorrectly() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -635,14 +634,14 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); Vehicle v = getVehicle("v1", readVrp.getVehicles()); - assertEquals("loc", v.getStartLocation().getId()); - assertEquals("loc", v.getEndLocation().getId()); + Assert.assertEquals("loc", v.getStartLocation().getId()); + Assert.assertEquals("loc", v.getEndLocation().getId()); } @Test public void whenWritingService_itShouldHaveTheCorrectNuSkills() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); Service s = Service.Builder.newInstance("1").addRequiredSkill("sKill1").addRequiredSkill("skill2").addSizeDimension(0, 1) .setLocation(TestUtils.loc("loc")).setServiceTime(2.0).build(); @@ -654,12 +653,12 @@ public class VrpXMLWriterTest { new VrpXMLReader(vrpToReadBuilder, null).read(infileName); VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); - assertEquals(2, readVrp.getJobs().get("1").getRequiredSkills().values().size()); + Assert.assertEquals(2, readVrp.getJobs().get("1").getRequiredSkills().values().size()); } @Test public void whenWritingService_itShouldContain_skill1() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); Service s = Service.Builder.newInstance("1").addRequiredSkill("sKill1").addRequiredSkill("skill2").addSizeDimension(0, 1) .setLocation(TestUtils.loc("loc")).setServiceTime(2.0).build(); @@ -676,7 +675,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingService_itShouldContain_skill2() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); Service s = Service.Builder.newInstance("1").addRequiredSkill("sKill1").addRequiredSkill("skill2").addSizeDimension(0, 1) .setLocation(TestUtils.loc("loc")).setServiceTime(2.0).build(); @@ -693,7 +692,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingVehicleV1_itDoesNotReturnToDepotMustBeWrittenCorrectly() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -720,7 +719,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingVehicleV1_readingAgainAssignsCorrectType() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -746,7 +745,7 @@ public class VrpXMLWriterTest { @Test public void whenWritingVehicleV2_readingAgainAssignsCorrectType() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -768,13 +767,13 @@ public class VrpXMLWriterTest { Vehicle v = getVehicle("v2", readVrp.getVehicles()); assertEquals("vehType2", v.getType().getTypeId()); - assertEquals(200, v.getType().getCapacityDimensions().get(0)); + Assert.assertEquals(200, v.getType().getCapacityDimensions().get(0)); } @Test public void whenWritingVehicleV2_readingItsLocationsAgainReturnsCorrectLocations() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -797,13 +796,13 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); Vehicle v = getVehicle("v2", readVrp.getVehicles()); - assertEquals("startLoc", v.getStartLocation().getId()); - assertEquals("endLoc", v.getEndLocation().getId()); + Assert.assertEquals("startLoc", v.getStartLocation().getId()); + Assert.assertEquals("endLoc", v.getEndLocation().getId()); } @Test public void whenWritingVehicleV2_readingItsLocationsCoordsAgainReturnsCorrectLocationsCoords() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("vehType2").addCapacityDimension(0, 200).build(); @@ -827,16 +826,16 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); Vehicle v = getVehicle("v2", readVrp.getVehicles()); - assertEquals(1.0, v.getStartLocation().getCoordinate().getX(), 0.01); - assertEquals(2.0, v.getStartLocation().getCoordinate().getY(), 0.01); + Assert.assertEquals(1.0, v.getStartLocation().getCoordinate().getX(), 0.01); + Assert.assertEquals(2.0, v.getStartLocation().getCoordinate().getY(), 0.01); - assertEquals(4.0, v.getEndLocation().getCoordinate().getX(), 0.01); - assertEquals(5.0, v.getEndLocation().getCoordinate().getY(), 0.01); + Assert.assertEquals(4.0, v.getEndLocation().getCoordinate().getX(), 0.01); + Assert.assertEquals(5.0, v.getEndLocation().getCoordinate().getY(), 0.01); } @Test public void whenWritingVehicleWithSeveralCapacityDimensions_itShouldBeWrittenAndRereadCorrectly() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("type") .addCapacityDimension(0, 100) @@ -857,15 +856,15 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); Vehicle v = getVehicle("v", readVrp.getVehicles()); - assertEquals(3, v.getType().getCapacityDimensions().getNuOfDimensions()); - assertEquals(100, v.getType().getCapacityDimensions().get(0)); - assertEquals(1000, v.getType().getCapacityDimensions().get(1)); - assertEquals(10000, v.getType().getCapacityDimensions().get(2)); + Assert.assertEquals(3, v.getType().getCapacityDimensions().getNuOfDimensions()); + Assert.assertEquals(100, v.getType().getCapacityDimensions().get(0)); + Assert.assertEquals(1000, v.getType().getCapacityDimensions().get(1)); + Assert.assertEquals(10000, v.getType().getCapacityDimensions().get(2)); } @Test public void whenWritingVehicleWithSeveralCapacityDimensions_itShouldBeWrittenAndRereadCorrectlyV2() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type2 = VehicleTypeImpl.Builder.newInstance("type") .addCapacityDimension(0, 100) @@ -886,9 +885,9 @@ public class VrpXMLWriterTest { VehicleRoutingProblem readVrp = vrpToReadBuilder.build(); Vehicle v = getVehicle("v", readVrp.getVehicles()); - assertEquals(11, v.getType().getCapacityDimensions().getNuOfDimensions()); - assertEquals(0, v.getType().getCapacityDimensions().get(9)); - assertEquals(10000, v.getType().getCapacityDimensions().get(10)); + Assert.assertEquals(11, v.getType().getCapacityDimensions().getNuOfDimensions()); + Assert.assertEquals(0, v.getType().getCapacityDimensions().get(9)); + Assert.assertEquals(10000, v.getType().getCapacityDimensions().get(10)); } private Vehicle getVehicle(String string, Collection vehicles) { @@ -923,7 +922,7 @@ public class VrpXMLWriterTest { new VrpXMLReader(newBuilder).read("src/test/resources/finiteVrpWithInitialSolutionForWriterTest.xml"); VehicleRoutingProblem newVrp = newBuilder.build(); - assertEquals(10., newVrp.getInitialVehicleRoutes().iterator().next().getDepartureTime(), 0.01); + Assert.assertEquals(10., newVrp.getInitialVehicleRoutes().iterator().next().getDepartureTime(), 0.01); } @Test @@ -955,12 +954,12 @@ public class VrpXMLWriterTest { VehicleRoutingProblem newVrp = newBuilder.build(); - assertEquals(2, newVrp.getInitialVehicleRoutes().iterator().next().getActivities().size()); + Assert.assertEquals(2, newVrp.getInitialVehicleRoutes().iterator().next().getActivities().size()); } @Test public void solutionWithoutUnassignedJobsShouldBeWrittenCorrectly() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleImpl v1 = VehicleImpl.Builder.newInstance("v1").setStartLocation(TestUtils.loc("loc")).setType(type1).build(); @@ -985,13 +984,13 @@ public class VrpXMLWriterTest { new VrpXMLReader(vrpToReadBuilder, solutionsToRead).read(infileName); assertEquals(1, solutionsToRead.size()); - assertEquals(10., Solutions.bestOf(solutionsToRead).getCost(), 0.01); + Assert.assertEquals(10., Solutions.bestOf(solutionsToRead).getCost(), 0.01); assertTrue(Solutions.bestOf(solutionsToRead).getUnassignedJobs().isEmpty()); } @Test public void solutionWithUnassignedJobsShouldBeWrittenCorrectly() { - Builder builder = VehicleRoutingProblem.Builder.newInstance(); + VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build(); VehicleImpl v1 = VehicleImpl.Builder.newInstance("v1").setStartLocation(TestUtils.loc("loc")).setType(type1).build(); @@ -1017,9 +1016,9 @@ public class VrpXMLWriterTest { new VrpXMLReader(vrpToReadBuilder, solutionsToRead).read(infileName); assertEquals(1, solutionsToRead.size()); - assertEquals(10., Solutions.bestOf(solutionsToRead).getCost(), 0.01); - assertEquals(1, Solutions.bestOf(solutionsToRead).getUnassignedJobs().size()); - assertEquals("2", Solutions.bestOf(solutionsToRead).getUnassignedJobs().iterator().next().getId()); + Assert.assertEquals(10., Solutions.bestOf(solutionsToRead).getCost(), 0.01); + Assert.assertEquals(1, Solutions.bestOf(solutionsToRead).getUnassignedJobs().size()); + Assert.assertEquals("2", Solutions.bestOf(solutionsToRead).getUnassignedJobs().iterator().next().getId()); } } diff --git a/jsprit-core/src/test/java/jsprit/core/problem/job/DeliveryTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/DeliveryTest.java similarity index 97% rename from jsprit-core/src/test/java/jsprit/core/problem/job/DeliveryTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/DeliveryTest.java index cf15491f..1628235e 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/job/DeliveryTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/DeliveryTest.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.job; +package com.graphhopper.jsprit.core.problem.job; -import jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.Location; import org.junit.Test; import static org.junit.Assert.*; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/job/PickupTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/PickupTest.java similarity index 97% rename from jsprit-core/src/test/java/jsprit/core/problem/job/PickupTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/PickupTest.java index ad8bfbb5..97211973 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/job/PickupTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/PickupTest.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.job; +package com.graphhopper.jsprit.core.problem.job; -import jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.Location; import org.junit.Test; import static org.junit.Assert.*; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/job/ServiceTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ServiceTest.java similarity index 98% rename from jsprit-core/src/test/java/jsprit/core/problem/job/ServiceTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ServiceTest.java index 6e6da3f0..da5ac763 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/job/ServiceTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ServiceTest.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.job; +package com.graphhopper.jsprit.core.problem.job; -import jsprit.core.problem.Location; -import jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; import org.junit.Test; import java.util.HashSet; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/job/ShipmentTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ShipmentTest.java similarity index 98% rename from jsprit-core/src/test/java/jsprit/core/problem/job/ShipmentTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ShipmentTest.java index 57b45b5d..205c6e7b 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/job/ShipmentTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ShipmentTest.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.job; +package com.graphhopper.jsprit.core.problem.job; -import jsprit.core.problem.Location; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.util.Coordinate; -import jsprit.core.util.TestUtils; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.TestUtils; import org.junit.Test; import static org.hamcrest.core.Is.is; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/misc/JobInsertionContextTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/misc/JobInsertionContextTest.java similarity index 87% rename from jsprit-core/src/test/java/jsprit/core/problem/misc/JobInsertionContextTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/misc/JobInsertionContextTest.java index dd859345..f24cb51b 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/misc/JobInsertionContextTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/misc/JobInsertionContextTest.java @@ -15,14 +15,14 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.misc; +package com.graphhopper.jsprit.core.problem.misc; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/VehicleRoutingProblemSolutionTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/VehicleRoutingProblemSolutionTest.java similarity index 90% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/VehicleRoutingProblemSolutionTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/VehicleRoutingProblemSolutionTest.java index a50ba5c5..8e0564ce 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/VehicleRoutingProblemSolutionTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/VehicleRoutingProblemSolutionTest.java @@ -16,10 +16,11 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.solution; +package com.graphhopper.jsprit.core.problem.solution; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import org.junit.Assert; import org.junit.Test; import java.util.ArrayList; @@ -79,7 +80,7 @@ public class VehicleRoutingProblemSolutionTest { List badJobs = new ArrayList(); badJobs.add(badJob); VehicleRoutingProblemSolution sol = new VehicleRoutingProblemSolution(Collections.emptyList(), badJobs, 10.0); - assertEquals(badJob, sol.getUnassignedJobs().iterator().next()); + Assert.assertEquals(badJob, sol.getUnassignedJobs().iterator().next()); } @Test @@ -89,7 +90,7 @@ public class VehicleRoutingProblemSolutionTest { badJobs.add(badJob); VehicleRoutingProblemSolution sol = new VehicleRoutingProblemSolution(Collections.emptyList(), 10.0); sol.getUnassignedJobs().addAll(badJobs); - assertEquals(badJob, sol.getUnassignedJobs().iterator().next()); + Assert.assertEquals(badJob, sol.getUnassignedJobs().iterator().next()); } } diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/TestVehicleRoute.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/TestVehicleRoute.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/TestVehicleRoute.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/TestVehicleRoute.java index 488bdba4..dadda048 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/TestVehicleRoute.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/TestVehicleRoute.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route; +package com.graphhopper.jsprit.core.problem.solution.route; -import jsprit.core.problem.Location; -import jsprit.core.problem.driver.DriverImpl; -import jsprit.core.problem.driver.DriverImpl.NoDriver; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.activity.DeliverService; -import jsprit.core.problem.solution.route.activity.PickupService; -import jsprit.core.problem.solution.route.activity.ServiceActivity; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl.NoDriver; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.activity.DeliverService; +import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupService; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ServiceActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/VehicleRouteBuilderTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/VehicleRouteBuilderTest.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/VehicleRouteBuilderTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/VehicleRouteBuilderTest.java index d06fc3c2..372e32cb 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/VehicleRouteBuilderTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/VehicleRouteBuilderTest.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route; +package com.graphhopper.jsprit.core.problem.solution.route; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/BreakActivityTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/BreakActivityTest.java similarity index 94% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/BreakActivityTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/BreakActivityTest.java index 9ffa63aa..61828a50 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/BreakActivityTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/BreakActivityTest.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Service; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactoryTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactoryTest.java similarity index 92% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactoryTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactoryTest.java index cbfdae55..04bae335 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactoryTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultShipmentActivityFactoryTest.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Shipment; import org.junit.Test; import static org.junit.Assert.assertNotNull; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactoryTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactoryTest.java similarity index 89% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactoryTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactoryTest.java index 452b005b..aa7e04c4 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactoryTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactoryTest.java @@ -16,12 +16,12 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.job.Service; import org.junit.Test; import static org.junit.Assert.assertNotNull; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DeliverServiceTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverServiceTest.java similarity index 94% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DeliverServiceTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverServiceTest.java index 685a699c..03c09c10 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DeliverServiceTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverServiceTest.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Delivery; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DeliverShipmentTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverShipmentTest.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DeliverShipmentTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverShipmentTest.java index bd94b2e5..3c803d0c 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DeliverShipmentTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/DeliverShipmentTest.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Shipment; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/EndTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/EndTest.java similarity index 97% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/EndTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/EndTest.java index e28d372c..26021cb1 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/EndTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/EndTest.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/PickupServiceTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupServiceTest.java similarity index 94% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/PickupServiceTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupServiceTest.java index c192c644..154639dd 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/PickupServiceTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupServiceTest.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Service; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/PickupShipmentTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupShipmentTest.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/PickupShipmentTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupShipmentTest.java index b7e3e07d..39a4419c 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/PickupShipmentTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/PickupShipmentTest.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Shipment; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/ServiceActivityTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ServiceActivityTest.java similarity index 90% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/ServiceActivityTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ServiceActivityTest.java index 5c4a672a..b73a67a6 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/ServiceActivityTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/ServiceActivityTest.java @@ -14,10 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Service; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -42,9 +43,9 @@ public class ServiceActivityTest { @Test public void whenCallingCapacity_itShouldReturnCorrectCapacity() { - assertEquals(10, serviceActivity.getSize().get(0)); - assertEquals(100, serviceActivity.getSize().get(1)); - assertEquals(1000, serviceActivity.getSize().get(2)); + Assert.assertEquals(10, serviceActivity.getSize().get(0)); + Assert.assertEquals(100, serviceActivity.getSize().get(1)); + Assert.assertEquals(1000, serviceActivity.getSize().get(2)); } diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/StartTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/StartTest.java similarity index 97% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/StartTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/StartTest.java index 89d5bb0b..23eecb2f 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/StartTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/StartTest.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TestRefs.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TestRefs.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TestRefs.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TestRefs.java index 30769249..cbb39ac8 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TestRefs.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TestRefs.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TestTourActivities.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TestTourActivities.java similarity index 97% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TestTourActivities.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TestTourActivities.java index 92c65325..447eb2a0 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TestTourActivities.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TestTourActivities.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.job.Shipment; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TimeWindowTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindowTest.java similarity index 93% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TimeWindowTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindowTest.java index df2b2eda..6ec99d06 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TimeWindowTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindowTest.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; public class TimeWindowTest { diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TimeWindowsImplTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindowsImplTest.java similarity index 92% rename from jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TimeWindowsImplTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindowsImplTest.java index 24b08b0d..1f28e94b 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/TimeWindowsImplTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TimeWindowsImplTest.java @@ -1,4 +1,4 @@ -package jsprit.core.problem.solution.route.activity; +package com.graphhopper.jsprit.core.problem.solution.route.activity; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/vehicle/FiniteVehicleFleetManagerFactoryTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/FiniteVehicleFleetManagerFactoryTest.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/problem/vehicle/FiniteVehicleFleetManagerFactoryTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/FiniteVehicleFleetManagerFactoryTest.java index e42cf0b8..4fef74f3 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/vehicle/FiniteVehicleFleetManagerFactoryTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/FiniteVehicleFleetManagerFactoryTest.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/vehicle/TestVehicleFleetManagerImpl.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/TestVehicleFleetManagerImpl.java similarity index 98% rename from jsprit-core/src/test/java/jsprit/core/problem/vehicle/TestVehicleFleetManagerImpl.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/TestVehicleFleetManagerImpl.java index 5ac8763d..fd48e11d 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/vehicle/TestVehicleFleetManagerImpl.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/TestVehicleFleetManagerImpl.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleImplTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImplTest.java similarity index 98% rename from jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleImplTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImplTest.java index cb62f36e..fba002ed 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleImplTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImplTest.java @@ -16,12 +16,12 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; -import jsprit.core.problem.Location; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; import org.junit.Test; import static org.junit.Assert.*; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleTypeImplTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeImplTest.java similarity index 99% rename from jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleTypeImplTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeImplTest.java index 622447bc..9fae1c1c 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleTypeImplTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeImplTest.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleTypeKeyTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeKeyTest.java similarity index 91% rename from jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleTypeKeyTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeKeyTest.java index 5b8bca8e..12945a89 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleTypeKeyTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeKeyTest.java @@ -1,7 +1,7 @@ -package jsprit.core.problem.vehicle; +package com.graphhopper.jsprit.core.problem.vehicle; -import jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.Location; import org.junit.Test; import static org.junit.Assert.assertFalse; diff --git a/jsprit-core/src/test/java/jsprit/core/util/CostFactory.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/CostFactory.java similarity index 95% rename from jsprit-core/src/test/java/jsprit/core/util/CostFactory.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/CostFactory.java index 5fc8c4e6..082cafb7 100644 --- a/jsprit-core/src/test/java/jsprit/core/util/CostFactory.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/CostFactory.java @@ -16,9 +16,9 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; public class CostFactory { diff --git a/jsprit-core/src/test/java/jsprit/core/util/FastVehicleRoutingTransportCostsMatrixTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/FastVehicleRoutingTransportCostsMatrixTest.java similarity index 94% rename from jsprit-core/src/test/java/jsprit/core/util/FastVehicleRoutingTransportCostsMatrixTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/FastVehicleRoutingTransportCostsMatrixTest.java index 0aa713bf..1faf7992 100644 --- a/jsprit-core/src/test/java/jsprit/core/util/FastVehicleRoutingTransportCostsMatrixTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/FastVehicleRoutingTransportCostsMatrixTest.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.Location; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/jsprit-core/src/test/java/jsprit/core/util/GreatCircleDistanceCalculatorTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/GreatCircleDistanceCalculatorTest.java similarity index 97% rename from jsprit-core/src/test/java/jsprit/core/util/GreatCircleDistanceCalculatorTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/GreatCircleDistanceCalculatorTest.java index f1d27144..0afe8f79 100644 --- a/jsprit-core/src/test/java/jsprit/core/util/GreatCircleDistanceCalculatorTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/GreatCircleDistanceCalculatorTest.java @@ -15,7 +15,7 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; import junit.framework.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/util/RandomUtilsTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/RandomUtilsTest.java similarity index 92% rename from jsprit-core/src/test/java/jsprit/core/util/RandomUtilsTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/RandomUtilsTest.java index 20e9a7df..c93ce7da 100644 --- a/jsprit-core/src/test/java/jsprit/core/util/RandomUtilsTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/RandomUtilsTest.java @@ -1,6 +1,6 @@ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Job; import junit.framework.Assert; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/util/TestUtils.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/TestUtils.java similarity index 84% rename from jsprit-core/src/test/java/jsprit/core/util/TestUtils.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/TestUtils.java index 5e579a2d..fad9f454 100644 --- a/jsprit-core/src/test/java/jsprit/core/util/TestUtils.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/TestUtils.java @@ -1,6 +1,6 @@ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.Location; /** * Created by schroeder on 19/12/14. diff --git a/jsprit-core/src/test/java/jsprit/core/util/TimeTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/TimeTest.java similarity index 99% rename from jsprit-core/src/test/java/jsprit/core/util/TimeTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/TimeTest.java index ec6f2879..9cc457dc 100644 --- a/jsprit-core/src/test/java/jsprit/core/util/TimeTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/TimeTest.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; import org.junit.Test; diff --git a/jsprit-core/src/test/java/jsprit/core/util/VehicleRoutingTransportCostsMatrixTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/VehicleRoutingTransportCostsMatrixTest.java similarity index 98% rename from jsprit-core/src/test/java/jsprit/core/util/VehicleRoutingTransportCostsMatrixTest.java rename to jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/VehicleRoutingTransportCostsMatrixTest.java index 14b134c5..d65cb1f4 100644 --- a/jsprit-core/src/test/java/jsprit/core/util/VehicleRoutingTransportCostsMatrixTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/util/VehicleRoutingTransportCostsMatrixTest.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.core.util; +package com.graphhopper.jsprit.core.util; -import jsprit.core.problem.Location; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/jsprit-core/src/test/resources/infiniteWriterV2Test.xml b/jsprit-core/src/test/resources/infiniteWriterV2Test.xml index 07c5406a..2d9058ab 100644 --- a/jsprit-core/src/test/resources/infiniteWriterV2Test.xml +++ b/jsprit-core/src/test/resources/infiniteWriterV2Test.xml @@ -2,24 +2,9 @@ - FINITE + INFINITE - - v2 - vehType2 - - loc - - - loc - - - 0.0 - 1.7976931348623157E308 - - true - v1 vehType @@ -48,16 +33,58 @@ - - vehType2 - - 200 - - - 0.0 - 1.0 - - - + + + + loc + + + 1 + + 2.0 + + + 0.0 + 1.7976931348623157E308 + + + + + + loc2 + + + 1 + + 4.0 + + + 0.0 + 1.7976931348623157E308 + + + + + + + 10.0 + + + noDriver + v1 + 0.0 + + 1 + 0.0 + 0.0 + + 0.0 + + + + + + + diff --git a/jsprit-examples/src/main/java/jsprit/examples/AdditionalDistanceConstraintExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/AdditionalDistanceConstraintExample.java similarity index 84% rename from jsprit-examples/src/main/java/jsprit/examples/AdditionalDistanceConstraintExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/AdditionalDistanceConstraintExample.java index 42cca63f..4e051262 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/AdditionalDistanceConstraintExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/AdditionalDistanceConstraintExample.java @@ -15,29 +15,29 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; -import jsprit.core.algorithm.state.StateId; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.StateUpdater; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.HardActivityConstraint; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.EuclideanDistanceCalculator; -import jsprit.core.util.Solutions; -import jsprit.core.util.VehicleRoutingTransportCostsMatrix; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; +import com.graphhopper.jsprit.core.algorithm.state.StateId; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.StateUpdater; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.EuclideanDistanceCalculator; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.util.VehicleRoutingTransportCostsMatrix; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/BicycleMessenger.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BicycleMessenger.java similarity index 88% rename from jsprit-examples/src/main/java/jsprit/examples/BicycleMessenger.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BicycleMessenger.java index 92bd6b0c..768d4d76 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/BicycleMessenger.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BicycleMessenger.java @@ -14,44 +14,44 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.GraphStreamViewer.Label; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; -import jsprit.core.algorithm.state.StateId; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.StateUpdater; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.Builder; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.HardActivityConstraint; -import jsprit.core.problem.constraint.HardRouteConstraint; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.DriverImpl; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; -import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.CrowFlyCosts; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer.Label; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; +import com.graphhopper.jsprit.core.algorithm.state.StateId; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.StateUpdater; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.Builder; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint; +import com.graphhopper.jsprit.core.problem.constraint.HardRouteConstraint; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.DriverImpl; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity.JobActivity; +import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.CrowFlyCosts; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.io.BufferedReader; import java.io.File; diff --git a/jsprit-examples/src/main/java/jsprit/examples/BreakExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BreakExample.java similarity index 80% rename from jsprit-examples/src/main/java/jsprit/examples/BreakExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BreakExample.java index f17afeaa..6449f810 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/BreakExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BreakExample.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Break; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Break; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/BuildAlgorithmFromScratch.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BuildAlgorithmFromScratch.java similarity index 81% rename from jsprit-examples/src/main/java/jsprit/examples/BuildAlgorithmFromScratch.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BuildAlgorithmFromScratch.java index 22d60d2d..a2f290f2 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/BuildAlgorithmFromScratch.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BuildAlgorithmFromScratch.java @@ -15,38 +15,38 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmEventsRecorder; -import jsprit.analysis.toolbox.AlgorithmEventsViewer; -import jsprit.core.algorithm.PrettyAlgorithmBuilder; -import jsprit.core.algorithm.SearchStrategy; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.acceptor.GreedyAcceptance; -import jsprit.core.algorithm.listener.IterationStartsListener; -import jsprit.core.algorithm.module.RuinAndRecreateModule; -import jsprit.core.algorithm.recreate.*; -import jsprit.core.algorithm.ruin.RadialRuinStrategyFactory; -import jsprit.core.algorithm.ruin.RandomRuinStrategyFactory; -import jsprit.core.algorithm.ruin.RuinStrategy; -import jsprit.core.algorithm.ruin.distance.AvgServiceAndShipmentDistance; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.analysis.SolutionAnalyser; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.solution.SolutionCostCalculator; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.FiniteFleetManagerFactory; -import jsprit.core.problem.vehicle.VehicleFleetManager; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; -import jsprit.instance.reader.CordeauReader; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmEventsRecorder; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmEventsViewer; +import com.graphhopper.jsprit.core.algorithm.PrettyAlgorithmBuilder; +import com.graphhopper.jsprit.core.algorithm.SearchStrategy; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.acceptor.GreedyAcceptance; +import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; +import com.graphhopper.jsprit.core.algorithm.module.RuinAndRecreateModule; +import com.graphhopper.jsprit.core.algorithm.recreate.*; +import com.graphhopper.jsprit.core.algorithm.ruin.RadialRuinStrategyFactory; +import com.graphhopper.jsprit.core.algorithm.ruin.RandomRuinStrategyFactory; +import com.graphhopper.jsprit.core.algorithm.ruin.RuinStrategy; +import com.graphhopper.jsprit.core.algorithm.ruin.distance.AvgServiceAndShipmentDistance; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.analysis.SolutionAnalyser; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.FiniteFleetManagerFactory; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.instance.reader.CordeauReader; +import com.graphhopper.jsprit.util.Examples; import java.util.ArrayList; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/CircleExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/CircleExample.java similarity index 80% rename from jsprit-examples/src/main/java/jsprit/examples/CircleExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/CircleExample.java index de3de0cb..bf50e79c 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/CircleExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/CircleExample.java @@ -15,21 +15,21 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmEventsRecorder; -import jsprit.analysis.toolbox.AlgorithmEventsViewer; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.GreedySchrimpfFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmEventsRecorder; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmEventsViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.GreedySchrimpfFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; import java.io.File; import java.util.ArrayList; diff --git a/jsprit-examples/src/main/java/jsprit/examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java similarity index 83% rename from jsprit-examples/src/main/java/jsprit/examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java index 17da1351..79526d18 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/ConfigureAlgorithmInCodeInsteadOfPerXml.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.AlgorithmConfig; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.AlgorithmConfig; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import org.apache.commons.configuration.XMLConfiguration; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/CostMatrixExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/CostMatrixExample.java similarity index 77% rename from jsprit-examples/src/main/java/jsprit/examples/CostMatrixExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/CostMatrixExample.java index 4f9d06ab..abab4685 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/CostMatrixExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/CostMatrixExample.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; -import jsprit.core.util.VehicleRoutingTransportCostsMatrix; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.util.VehicleRoutingTransportCostsMatrix; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java similarity index 87% rename from jsprit-examples/src/main/java/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java index c473b322..c82e098e 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsAndOpenRoutesExample.java @@ -14,27 +14,27 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.GraphStreamViewer.Label; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer.Label; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.util.Arrays; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/HVRPExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/HVRPExample.java similarity index 87% rename from jsprit-examples/src/main/java/jsprit/examples/HVRPExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/HVRPExample.java index 922f2b5e..96f31039 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/HVRPExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/HVRPExample.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/JobAndActivityDependenciesExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/JobAndActivityDependenciesExample.java similarity index 88% rename from jsprit-examples/src/main/java/jsprit/examples/JobAndActivityDependenciesExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/JobAndActivityDependenciesExample.java index 9a7dab58..93cce9d5 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/JobAndActivityDependenciesExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/JobAndActivityDependenciesExample.java @@ -15,29 +15,29 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; -import jsprit.core.algorithm.state.StateId; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.state.StateUpdater; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.HardActivityConstraint; -import jsprit.core.problem.constraint.HardRouteConstraint; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.ActivityVisitor; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; +import com.graphhopper.jsprit.core.algorithm.state.StateId; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.state.StateUpdater; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint; +import com.graphhopper.jsprit.core.problem.constraint.HardRouteConstraint; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.ActivityVisitor; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotExample.java similarity index 74% rename from jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotExample.java index 88cffa3c..09edbce6 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotExample.java @@ -14,26 +14,26 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.Plotter; -import jsprit.analysis.toolbox.StopWatch; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.Priority; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.analysis.toolbox.StopWatch; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.Priority; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.util.Arrays; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample2.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotExample2.java similarity index 74% rename from jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample2.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotExample2.java index ea54d2f7..6f4ca95e 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExample2.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotExample2.java @@ -14,27 +14,27 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.Plotter; -import jsprit.analysis.toolbox.StopWatch; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.Priority; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; -import jsprit.instance.reader.CordeauReader; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.analysis.toolbox.StopWatch; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.listener.VehicleRoutingAlgorithmListeners.Priority; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.instance.reader.CordeauReader; +import com.graphhopper.jsprit.util.Examples; import java.util.Arrays; import java.util.Collection; @@ -112,7 +112,7 @@ public class MultipleDepotExample2 { vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/progress.png")); Collection solutions = vra.searchSolutions(); - SolutionPrinter.print(vrp, Solutions.bestOf(solutions), jsprit.core.reporting.SolutionPrinter.Print.VERBOSE); + SolutionPrinter.print(vrp, Solutions.bestOf(solutions), SolutionPrinter.Print.VERBOSE); new Plotter(vrp, Solutions.bestOf(solutions)).plot("output/p08_solution.png", "p08"); diff --git a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotWithInitialRoutesExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotWithInitialRoutesExample.java similarity index 77% rename from jsprit-examples/src/main/java/jsprit/examples/MultipleDepotWithInitialRoutesExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotWithInitialRoutesExample.java index c824a0ea..8c03b9e2 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotWithInitialRoutesExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotWithInitialRoutesExample.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.Plotter; -import jsprit.analysis.toolbox.Plotter.Label; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.Builder; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.analysis.toolbox.Plotter.Label; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.Builder; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/MultipleProductsWithLoadConstraintExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleProductsWithLoadConstraintExample.java similarity index 86% rename from jsprit-examples/src/main/java/jsprit/examples/MultipleProductsWithLoadConstraintExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleProductsWithLoadConstraintExample.java index 34c0d057..b18def39 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/MultipleProductsWithLoadConstraintExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleProductsWithLoadConstraintExample.java @@ -15,28 +15,28 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.state.InternalStates; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.HardActivityConstraint; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.state.InternalStates; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/MultipleTimeWindowExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleTimeWindowExample.java similarity index 83% rename from jsprit-examples/src/main/java/jsprit/examples/MultipleTimeWindowExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleTimeWindowExample.java index 9d8206d6..580f7980 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/MultipleTimeWindowExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleTimeWindowExample.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.ManhattanCosts; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.ManhattanCosts; +import com.graphhopper.jsprit.core.util.Solutions; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/MultipleTimeWindowExample2.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleTimeWindowExample2.java similarity index 83% rename from jsprit-examples/src/main/java/jsprit/examples/MultipleTimeWindowExample2.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleTimeWindowExample2.java index 8aff3890..05f870f1 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/MultipleTimeWindowExample2.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleTimeWindowExample2.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.analysis.SolutionAnalyser; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.cost.TransportDistance; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.RandomNumberGeneration; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.analysis.SolutionAnalyser; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.cost.TransportDistance; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.RandomNumberGeneration; +import com.graphhopper.jsprit.core.util.Solutions; import java.util.Collection; import java.util.Random; diff --git a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryExample.java similarity index 80% rename from jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryExample.java index 5362b692..73ff5485 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryExample.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; -import jsprit.analysis.toolbox.Plotter; -import jsprit.analysis.toolbox.Plotter.Label; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.analysis.SolutionAnalyser; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.analysis.toolbox.Plotter.Label; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.analysis.SolutionAnalyser; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample2.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryExample2.java similarity index 78% rename from jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample2.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryExample2.java index a86054fd..3a9bb8e7 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryExample2.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryExample2.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.Plotter; -import jsprit.analysis.toolbox.Plotter.Label; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.analysis.toolbox.Plotter.Label; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryOpenExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryOpenExample.java similarity index 79% rename from jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryOpenExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryOpenExample.java index aa0c8328..63cd54d4 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/PickupAndDeliveryOpenExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryOpenExample.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; -import jsprit.analysis.toolbox.Plotter; -import jsprit.analysis.toolbox.Plotter.Label; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.analysis.toolbox.Plotter.Label; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/RefuseCollectionExample.java similarity index 79% rename from jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/RefuseCollectionExample.java index 8784f252..8e2ca098 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/RefuseCollectionExample.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.GreedySchrimpfFactory; -import jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; -import jsprit.core.util.VehicleRoutingTransportCostsMatrix; -import jsprit.core.util.VehicleRoutingTransportCostsMatrix.Builder; -import jsprit.util.Examples; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.GreedySchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.util.VehicleRoutingTransportCostsMatrix; +import com.graphhopper.jsprit.core.util.VehicleRoutingTransportCostsMatrix.Builder; +import com.graphhopper.jsprit.util.Examples; import java.io.BufferedReader; import java.io.File; diff --git a/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionWithFastMatrixExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/RefuseCollectionWithFastMatrixExample.java similarity index 81% rename from jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionWithFastMatrixExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/RefuseCollectionWithFastMatrixExample.java index 9eb7a50c..8a52a1b4 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/RefuseCollectionWithFastMatrixExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/RefuseCollectionWithFastMatrixExample.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.GreedySchrimpfFactory; -import jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.GreedySchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.io.BufferedReader; import java.io.File; diff --git a/jsprit-examples/src/main/java/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java similarity index 82% rename from jsprit-examples/src/main/java/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java index 8faa4c77..08ee3900 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.GraphStreamViewer.Label; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer.Label; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.util.Arrays; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleDepotBoundedPickupAndDeliveryExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleDepotBoundedPickupAndDeliveryExample.java similarity index 75% rename from jsprit-examples/src/main/java/jsprit/examples/SimpleDepotBoundedPickupAndDeliveryExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleDepotBoundedPickupAndDeliveryExample.java index 18e5bc66..e6622113 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleDepotBoundedPickupAndDeliveryExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleDepotBoundedPickupAndDeliveryExample.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.Plotter; -import jsprit.analysis.toolbox.Plotter.Label; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.SchrimpfFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.analysis.toolbox.Plotter.Label; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.SchrimpfFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleEnRoutePickupAndDeliveryExample.java similarity index 80% rename from jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleEnRoutePickupAndDeliveryExample.java index 4a12c0af..1d73f293 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleEnRoutePickupAndDeliveryExample.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.SchrimpfFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.SchrimpfFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.util.Arrays; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java similarity index 81% rename from jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java index f878a8b2..b03c0c6e 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleEnRoutePickupAndDeliveryOpenRoutesExample.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.SchrimpfFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.SchrimpfFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample.java similarity index 81% rename from jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample.java index 6c6a3739..20a0a6ae 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleEnRoutePickupAndDeliveryWithDepotBoundedDeliveriesExample.java @@ -14,28 +14,28 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.ServiceDeliveriesFirstConstraint; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.ServiceDeliveriesFirstConstraint; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleExample.java similarity index 79% rename from jsprit-examples/src/main/java/jsprit/examples/SimpleExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleExample.java index e03f1eec..adeeef29 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleExample.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.GraphStreamViewer.Label; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.SchrimpfFactory; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer.Label; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.SchrimpfFactory; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; import java.io.File; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleOpenRoutes.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleExampleOpenRoutes.java similarity index 77% rename from jsprit-examples/src/main/java/jsprit/examples/SimpleExampleOpenRoutes.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleExampleOpenRoutes.java index b56b01e9..96f0ee7c 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleOpenRoutes.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleExampleOpenRoutes.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleWithSkills.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleExampleWithSkills.java similarity index 80% rename from jsprit-examples/src/main/java/jsprit/examples/SimpleExampleWithSkills.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleExampleWithSkills.java index b6b72b54..950c2587 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleExampleWithSkills.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleExampleWithSkills.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.GraphStreamViewer.Label; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer.Label; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; import java.io.File; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SimpleVRPWithBackhaulsExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleVRPWithBackhaulsExample.java similarity index 74% rename from jsprit-examples/src/main/java/jsprit/examples/SimpleVRPWithBackhaulsExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleVRPWithBackhaulsExample.java index a831be8b..623ee36b 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SimpleVRPWithBackhaulsExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SimpleVRPWithBackhaulsExample.java @@ -14,28 +14,28 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.Plotter; -import jsprit.analysis.toolbox.Plotter.Label; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.ServiceDeliveriesFirstConstraint; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Delivery; -import jsprit.core.problem.job.Pickup; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.analysis.toolbox.Plotter.Label; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.ServiceDeliveriesFirstConstraint; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Delivery; +import com.graphhopper.jsprit.core.problem.job.Pickup; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonExample.java similarity index 78% rename from jsprit-examples/src/main/java/jsprit/examples/SolomonExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonExample.java index 9f88e199..4b7e8d9c 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonExample.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.GraphStreamViewer.Label; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.SchrimpfFactory; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.instance.reader.SolomonReader; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer.Label; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.SchrimpfFactory; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.instance.reader.SolomonReader; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocations.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocations.java similarity index 81% rename from jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocations.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocations.java index a6dfe33c..5c94a758 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocations.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocations.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.GraphStreamViewer.Label; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer.Label; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; import java.io.File; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java similarity index 83% rename from jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java index 72a6323b..855324ea 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonExampleWithSpecifiedVehicleEndLocationsWithoutTWs.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.GraphStreamViewer.Label; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer.Label; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; import java.io.File; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonOpenExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonOpenExample.java similarity index 79% rename from jsprit-examples/src/main/java/jsprit/examples/SolomonOpenExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonOpenExample.java index e32c5296..65ba2143 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonOpenExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonOpenExample.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.GraphStreamViewer.Label; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer.Label; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonR101Example.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonR101Example.java similarity index 80% rename from jsprit-examples/src/main/java/jsprit/examples/SolomonR101Example.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonR101Example.java index 91658d11..cd621582 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonR101Example.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonR101Example.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonWithRegretInsertionExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonWithRegretInsertionExample.java similarity index 77% rename from jsprit-examples/src/main/java/jsprit/examples/SolomonWithRegretInsertionExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonWithRegretInsertionExample.java index a9b92a7a..e327b62c 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonWithRegretInsertionExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonWithRegretInsertionExample.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmEventsRecorder; -import jsprit.analysis.toolbox.AlgorithmEventsViewer; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.GraphStreamViewer.Label; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.io.VehicleRoutingAlgorithms; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.instance.reader.SolomonReader; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmEventsRecorder; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmEventsViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer.Label; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.io.VehicleRoutingAlgorithms; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.instance.reader.SolomonReader; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/SolomonWithSkillsExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonWithSkillsExample.java similarity index 81% rename from jsprit-examples/src/main/java/jsprit/examples/SolomonWithSkillsExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonWithSkillsExample.java index 5208e45a..af8f8dc1 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/SolomonWithSkillsExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/SolomonWithSkillsExample.java @@ -15,27 +15,27 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; -import jsprit.instance.reader.SolomonReader; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.instance.reader.SolomonReader; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/TransportOfDisabledPeople.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/TransportOfDisabledPeople.java similarity index 88% rename from jsprit-examples/src/main/java/jsprit/examples/TransportOfDisabledPeople.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/TransportOfDisabledPeople.java index 70ac4df0..ce61744d 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/TransportOfDisabledPeople.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/TransportOfDisabledPeople.java @@ -14,31 +14,31 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.analysis.toolbox.GraphStreamViewer.Label; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.HardRouteConstraint; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.misc.JobInsertionContext; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleType; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Solutions; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer.Label; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.algorithm.termination.IterationWithoutImprovementTermination; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.HardRouteConstraint; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Solutions; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; @@ -210,12 +210,12 @@ public class TransportOfDisabledPeople { */ Plotter problemPlotter = new Plotter(problem); problemPlotter.plotShipments(true); - problemPlotter.setLabel(jsprit.analysis.toolbox.Plotter.Label.SIZE); + problemPlotter.setLabel(Plotter.Label.SIZE); problemPlotter.plot("output/transportOfDisabledPeopleExample_problem.png", "disabled people tp"); Plotter solutionPlotter = new Plotter(problem, Solutions.bestOf(solutions)); solutionPlotter.plotShipments(true); - solutionPlotter.setLabel(jsprit.analysis.toolbox.Plotter.Label.SIZE); + solutionPlotter.setLabel(Plotter.Label.SIZE); solutionPlotter.plot("output/transportOfDisabledPeopleExample_solution.png", "disabled people tp"); new GraphStreamViewer(problem).labelWith(Label.ID).setRenderDelay(100).setRenderShipments(true).display(); diff --git a/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/VRPWithBackhaulsExample.java similarity index 78% rename from jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/VRPWithBackhaulsExample.java index a41b11b7..25da8fe7 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/VRPWithBackhaulsExample.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; -import jsprit.analysis.toolbox.GraphStreamViewer; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.ServiceDeliveriesFirstConstraint; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; +import com.graphhopper.jsprit.analysis.toolbox.GraphStreamViewer; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithmBuilder; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.ServiceDeliveriesFirstConstraint; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/VRPWithBackhaulsExample2.java similarity index 88% rename from jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/VRPWithBackhaulsExample2.java index bda361f6..c2adf04b 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/VRPWithBackhaulsExample2.java @@ -14,26 +14,26 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.examples; +package com.graphhopper.jsprit.examples; -import jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; -import jsprit.analysis.toolbox.Plotter; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.algorithm.selector.SelectBest; -import jsprit.core.algorithm.state.StateManager; -import jsprit.core.analysis.SolutionAnalyser; -import jsprit.core.problem.Capacity; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.constraint.ConstraintManager; -import jsprit.core.problem.constraint.ServiceDeliveriesFirstConstraint; -import jsprit.core.problem.io.VrpXMLReader; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.VehicleRoute; -import jsprit.core.problem.solution.route.activity.TourActivity; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.util.Examples; +import com.graphhopper.jsprit.analysis.toolbox.AlgorithmSearchProgressChartListener; +import com.graphhopper.jsprit.analysis.toolbox.Plotter; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.algorithm.selector.SelectBest; +import com.graphhopper.jsprit.core.algorithm.state.StateManager; +import com.graphhopper.jsprit.core.analysis.SolutionAnalyser; +import com.graphhopper.jsprit.core.problem.Capacity; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; +import com.graphhopper.jsprit.core.problem.constraint.ServiceDeliveriesFirstConstraint; +import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.util.Examples; import java.util.Collection; diff --git a/jsprit-examples/src/main/java/jsprit/util/Examples.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/util/Examples.java similarity index 97% rename from jsprit-examples/src/main/java/jsprit/util/Examples.java rename to jsprit-examples/src/main/java/com/graphhopper/jsprit/util/Examples.java index 845f5264..327fd163 100644 --- a/jsprit-examples/src/main/java/jsprit/util/Examples.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/util/Examples.java @@ -16,7 +16,7 @@ * Contributors: * Stefan Schroeder - initial API and implementation ******************************************************************************/ -package jsprit.util; +package com.graphhopper.jsprit.util; import java.io.File; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/BelhaizaReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java similarity index 92% rename from jsprit-instances/src/main/java/jsprit/instance/reader/BelhaizaReader.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java index 2707e75f..2895e0c0 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/BelhaizaReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/ChristofidesReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/ChristofidesReader.java similarity index 91% rename from jsprit-instances/src/main/java/jsprit/instance/reader/ChristofidesReader.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/ChristofidesReader.java index f532f14e..1a5b17d5 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/ChristofidesReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/ChristofidesReader.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/CordeauReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/CordeauReader.java similarity index 92% rename from jsprit-instances/src/main/java/jsprit/instance/reader/CordeauReader.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/CordeauReader.java index 2b5fd9ad..2beb2b7a 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/CordeauReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/CordeauReader.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleImpl.Builder; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/Figliozzi.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/Figliozzi.java similarity index 95% rename from jsprit-instances/src/main/java/jsprit/instance/reader/Figliozzi.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/Figliozzi.java index 1f151078..3c8bfabe 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/Figliozzi.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/Figliozzi.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.Location; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.driver.Driver; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.EuclideanDistanceCalculator; -import jsprit.core.util.Locations; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.driver.Driver; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.EuclideanDistanceCalculator; +import com.graphhopper.jsprit.core.util.Locations; import java.util.ArrayList; import java.util.Arrays; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/LiLimReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LiLimReader.java similarity index 92% rename from jsprit-instances/src/main/java/jsprit/instance/reader/LiLimReader.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LiLimReader.java index 092c5dfd..0f73f791 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/LiLimReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LiLimReader.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.Builder; -import jsprit.core.problem.job.Shipment; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.Builder; +import com.graphhopper.jsprit.core.problem.job.Shipment; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/LopezIbanezBlumReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LopezIbanezBlumReader.java similarity index 91% rename from jsprit-instances/src/main/java/jsprit/instance/reader/LopezIbanezBlumReader.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LopezIbanezBlumReader.java index e84a1034..77bf309b 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/LopezIbanezBlumReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LopezIbanezBlumReader.java @@ -1,11 +1,11 @@ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/LuiShenReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java similarity index 92% rename from jsprit-instances/src/main/java/jsprit/instance/reader/LuiShenReader.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java index a22526d7..b5e80fe3 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/LuiShenReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/SolomonReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/SolomonReader.java similarity index 91% rename from jsprit-instances/src/main/java/jsprit/instance/reader/SolomonReader.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/SolomonReader.java index 07cf7140..79afe8d6 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/SolomonReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/SolomonReader.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95CostMatrixReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/TSPLIB95CostMatrixReader.java similarity index 96% rename from jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95CostMatrixReader.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/TSPLIB95CostMatrixReader.java index fbdbd572..93efe22b 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95CostMatrixReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/TSPLIB95CostMatrixReader.java @@ -15,10 +15,10 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.util.VehicleRoutingTransportCostsMatrix; +import com.graphhopper.jsprit.core.util.VehicleRoutingTransportCostsMatrix; import java.io.*; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/TSPLIB95Reader.java similarity index 95% rename from jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/TSPLIB95Reader.java index 20f97d08..a3b3d93b 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/TSPLIB95Reader.java @@ -15,18 +15,18 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; -import jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; import java.io.*; import java.util.ArrayList; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/Taillard.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/Taillard.java similarity index 99% rename from jsprit-instances/src/main/java/jsprit/instance/reader/Taillard.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/Taillard.java index 842583bd..d2fd0c5b 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/Taillard.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/Taillard.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; //package instances; // //import java.io.BufferedReader; diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/VrphGoldenReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/VrphGoldenReader.java similarity index 92% rename from jsprit-instances/src/main/java/jsprit/instance/reader/VrphGoldenReader.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/VrphGoldenReader.java index 707de375..1c0f2f82 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/VrphGoldenReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/VrphGoldenReader.java @@ -15,17 +15,17 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.Location; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.Builder; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.io.VrpXMLWriter; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.problem.vehicle.VehicleTypeImpl; -import jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.Builder; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.io.VrpXMLWriter; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; +import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; +import com.graphhopper.jsprit.core.util.Coordinate; import java.io.*; diff --git a/jsprit-instances/src/main/java/jsprit/instance/util/Instances.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/util/Instances.java similarity index 97% rename from jsprit-instances/src/main/java/jsprit/instance/util/Instances.java rename to jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/util/Instances.java index f29d8dd6..3634fff9 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/util/Instances.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/util/Instances.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.util; +package com.graphhopper.jsprit.instance.util; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.util.BenchmarkInstance; -import jsprit.instance.reader.ChristofidesReader; -import jsprit.instance.reader.CordeauReader; -import jsprit.instance.reader.SolomonReader; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.util.BenchmarkInstance; +import com.graphhopper.jsprit.instance.reader.ChristofidesReader; +import com.graphhopper.jsprit.instance.reader.CordeauReader; +import com.graphhopper.jsprit.instance.reader.SolomonReader; import java.io.*; import java.util.ArrayList; diff --git a/jsprit-instances/src/test/java/jsprit/instance/reader/BelhaizaReaderTest.java b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/BelhaizaReaderTest.java similarity index 91% rename from jsprit-instances/src/test/java/jsprit/instance/reader/BelhaizaReaderTest.java rename to jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/BelhaizaReaderTest.java index edca9b01..435716cb 100644 --- a/jsprit-instances/src/test/java/jsprit/instance/reader/BelhaizaReaderTest.java +++ b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/BelhaizaReaderTest.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.algorithm.VehicleRoutingAlgorithm; -import jsprit.core.algorithm.box.Jsprit; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import jsprit.core.problem.solution.route.activity.TimeWindow; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.reporting.SolutionPrinter; -import jsprit.core.util.Solutions; +import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; +import com.graphhopper.jsprit.core.algorithm.box.Jsprit; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.reporting.SolutionPrinter; +import com.graphhopper.jsprit.core.util.Solutions; import org.junit.Test; import java.net.URL; diff --git a/jsprit-instances/src/test/java/jsprit/instance/reader/ChristophidesReaderTest.java b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/ChristophidesReaderTest.java similarity index 93% rename from jsprit-instances/src/test/java/jsprit/instance/reader/ChristophidesReaderTest.java rename to jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/ChristophidesReaderTest.java index 8333310b..a3348eda 100644 --- a/jsprit-instances/src/test/java/jsprit/instance/reader/ChristophidesReaderTest.java +++ b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/ChristophidesReaderTest.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import org.junit.Test; import java.net.URL; diff --git a/jsprit-instances/src/test/java/jsprit/instance/reader/CordeauReaderTest.java b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/CordeauReaderTest.java similarity index 95% rename from jsprit-instances/src/test/java/jsprit/instance/reader/CordeauReaderTest.java rename to jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/CordeauReaderTest.java index d48f401b..85e25277 100644 --- a/jsprit-instances/src/test/java/jsprit/instance/reader/CordeauReaderTest.java +++ b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/CordeauReaderTest.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import org.junit.Test; import java.net.URL; diff --git a/jsprit-instances/src/test/java/jsprit/instance/reader/FigliozziTest.java b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/FigliozziTest.java similarity index 99% rename from jsprit-instances/src/test/java/jsprit/instance/reader/FigliozziTest.java rename to jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/FigliozziTest.java index b9dcb8c5..52aa4222 100644 --- a/jsprit-instances/src/test/java/jsprit/instance/reader/FigliozziTest.java +++ b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/FigliozziTest.java @@ -15,12 +15,12 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.Location; -import jsprit.core.util.Coordinate; -import jsprit.core.util.Locations; +import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.core.util.Locations; import junit.framework.Assert; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-instances/src/test/java/jsprit/instance/reader/GoldenReaderTest.java b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/GoldenReaderTest.java similarity index 96% rename from jsprit-instances/src/test/java/jsprit/instance/reader/GoldenReaderTest.java rename to jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/GoldenReaderTest.java index 15f85f88..b477a7b0 100644 --- a/jsprit-instances/src/test/java/jsprit/instance/reader/GoldenReaderTest.java +++ b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/GoldenReaderTest.java @@ -15,14 +15,14 @@ * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.job.Job; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.vehicle.Vehicle; -import jsprit.core.util.Coordinate; -import jsprit.instance.reader.VrphGoldenReader.VrphType; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.job.Job; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.util.Coordinate; +import com.graphhopper.jsprit.instance.reader.VrphGoldenReader.VrphType; import org.junit.Test; import java.net.URL; diff --git a/jsprit-instances/src/test/java/jsprit/instance/reader/LuiShenReaderTest.java b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/LuiShenReaderTest.java similarity index 90% rename from jsprit-instances/src/test/java/jsprit/instance/reader/LuiShenReaderTest.java rename to jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/LuiShenReaderTest.java index 8304dc04..fd3f5f3d 100644 --- a/jsprit-instances/src/test/java/jsprit/instance/reader/LuiShenReaderTest.java +++ b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/LuiShenReaderTest.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; import org.junit.Before; import org.junit.Test; diff --git a/jsprit-instances/src/test/java/jsprit/instance/reader/SolomonReaderTest.java b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/SolomonReaderTest.java similarity index 93% rename from jsprit-instances/src/test/java/jsprit/instance/reader/SolomonReaderTest.java rename to jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/SolomonReaderTest.java index ee409de4..b9c4e5c5 100644 --- a/jsprit-instances/src/test/java/jsprit/instance/reader/SolomonReaderTest.java +++ b/jsprit-instances/src/test/java/com/graphhopper/jsprit/instance/reader/SolomonReaderTest.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ -package jsprit.instance.reader; +package com.graphhopper.jsprit.instance.reader; -import jsprit.core.problem.VehicleRoutingProblem; -import jsprit.core.problem.VehicleRoutingProblem.FleetSize; -import jsprit.core.problem.job.Service; -import jsprit.core.problem.vehicle.Vehicle; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem.FleetSize; +import com.graphhopper.jsprit.core.problem.job.Service; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import org.junit.Test; import java.net.URL;