merge master

jsprit-core/src/main/java/algorithms/ActivityTimeTracker.java

@@ -1,9 +1,7 @@
 package algorithms;
 
 import basics.costs.ForwardTransportTime;
-import basics.route.Driver;
 import basics.route.TourActivity;
-import basics.route.Vehicle;
 import basics.route.VehicleRoute;
 
 class ActivityTimeTracker implements ActivityVisitor{

jsprit-core/src/main/java/algorithms/BestInsertionConcurrent.java

@@ -12,26 +12,6 @@
  ******************************************************************************/
 package algorithms;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-
-import org.apache.log4j.Logger;
-
-import util.RandomNumberGeneration;
-import algorithms.InsertionData.NoInsertionFound;
-import basics.Job;
-import basics.algo.InsertionListener;
-import basics.route.VehicleRoute;
 
 //
 //

jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionConsideringFixCost.java

@@ -23,8 +23,6 @@ package algorithms;
 import org.apache.log4j.Logger;
 
 import algorithms.InsertionData.NoInsertionFound;
-import algorithms.StateManager.State;
-import algorithms.StateManager.States;
 import basics.Job;
 import basics.route.Driver;
 import basics.route.Vehicle;

jsprit-core/src/main/java/algorithms/CalculatesVehTypeDepServiceInsertion.java

@@ -26,7 +26,6 @@ import java.util.Collection;
 import org.apache.log4j.Logger;
 
 import algorithms.InsertionData.NoInsertionFound;
-import algorithms.VehicleFleetManager.TypeKey;
 import basics.Job;
 import basics.route.Driver;
 import basics.route.Vehicle;

jsprit-core/src/main/java/algorithms/GreedySchrimpfFactory.java

@@ -20,14 +20,9 @@
  ******************************************************************************/
 package algorithms;
 
-import java.io.File;
-import java.net.MalformedURLException;
 import java.net.URL;
 
 import util.Resource;
-
-
-
 import basics.VehicleRoutingAlgorithm;
 import basics.VehicleRoutingProblem;
 import basics.io.AlgorithmConfig;

jsprit-core/src/main/java/algorithms/Inserter.java

@@ -23,9 +23,8 @@ package algorithms;
 import algorithms.InsertionData.NoInsertionFound;
 import basics.Job;
 import basics.Service;
-import basics.route.ServiceActivity;
-import basics.route.TourActivityFactory;
 import basics.route.DefaultTourActivityFactory;
+import basics.route.TourActivityFactory;
 import basics.route.VehicleRoute;
 
 class Inserter {

jsprit-core/src/main/java/algorithms/InsertionFactory.java

@@ -28,7 +28,6 @@ import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.log4j.Logger;
 
 import algorithms.HardConstraints.ConstraintManager;
-import algorithms.StateUpdates.UpdateStates;
 import basics.VehicleRoutingProblem;
 import basics.algo.InsertionListener;
 import basics.algo.VehicleRoutingAlgorithmListeners.PrioritizedVRAListener;

jsprit-core/src/main/java/algorithms/NeighborhoodThresholdInitialiser.java

@@ -31,7 +31,6 @@ import util.EuclideanDistanceCalculator;
 import util.Locations;
 import util.NeighborhoodImpl;
 import util.Solutions;
-import algorithms.selectors.SelectBest;
 import basics.VehicleRoutingAlgorithm;
 import basics.VehicleRoutingProblem;
 import basics.VehicleRoutingProblemSolution;

jsprit-core/src/main/java/algorithms/RemoveEmptyVehicles.java

@@ -23,12 +23,10 @@ package algorithms;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.log4j.Logger;
 
-
-import basics.Job;
 import basics.algo.InsertionEndsListener;
-import basics.algo.InsertionStartsListener;
 import basics.route.VehicleRoute;
 
 class RemoveEmptyVehicles implements InsertionEndsListener{

jsprit-core/src/main/java/algorithms/RuinAndRecreateModule.java

@@ -22,7 +22,6 @@ package algorithms;
 
 import java.util.Collection;
 
-import util.RouteUtils;
 import algorithms.RuinStrategy.RuinListener;
 import basics.Job;
 import basics.VehicleRoutingProblemSolution;

jsprit-core/src/main/java/algorithms/SchrimpfFactory.java

@@ -20,14 +20,9 @@
  ******************************************************************************/
 package algorithms;
 
-import java.io.File;
-import java.net.MalformedURLException;
 import java.net.URL;
 
 import util.Resource;
-
-
-
 import basics.VehicleRoutingAlgorithm;
 import basics.VehicleRoutingProblem;
 import basics.io.AlgorithmConfig;

jsprit-core/src/main/java/algorithms/StateUpdates.java

@@ -22,13 +22,9 @@ package algorithms;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.apache.log4j.Logger;
 
-import algorithms.BackwardInTimeListeners.BackwardInTimeListener;
-import algorithms.ForwardInTimeListeners.ForwardInTimeListener;
 import algorithms.RuinStrategy.RuinListener;
 import algorithms.StateManager.StateImpl;
 import basics.Delivery;
@@ -39,20 +35,15 @@ import basics.VehicleRoutingProblem;
 import basics.VehicleRoutingProblemSolution;
 import basics.algo.InsertionEndsListener;
 import basics.algo.InsertionStartsListener;
-import basics.algo.IterationEndsListener;
 import basics.algo.IterationStartsListener;
 import basics.algo.JobInsertedListener;
-import basics.algo.VehicleRoutingAlgorithmListener;
 import basics.costs.ForwardTransportCost;
 import basics.costs.ForwardTransportTime;
 import basics.costs.VehicleRoutingActivityCosts;
 import basics.costs.VehicleRoutingTransportCosts;
 import basics.route.DeliveryActivity;
-import basics.route.Driver;
-import basics.route.End;
 import basics.route.PickupActivity;
 import basics.route.ServiceActivity;
-import basics.route.Start;
 import basics.route.TourActivity;
 import basics.route.Vehicle;
 import basics.route.VehicleRoute;

jsprit-core/src/main/java/algorithms/selectors/SelectRandomly.java

@@ -25,9 +25,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Random;
 
-import basics.VehicleRoutingProblemSolution;
-
 import util.RandomNumberGeneration;
+import basics.VehicleRoutingProblemSolution;
 
 
 

jsprit-core/src/main/java/basics/Service.java

@@ -20,8 +20,8 @@
  ******************************************************************************/
 package basics;
 
-import basics.route.TimeWindow;
 import util.Coordinate;
+import basics.route.TimeWindow;
 
 
 public class Service implements Job {

jsprit-core/src/main/java/basics/VehicleRoutingProblem.java

@@ -28,7 +28,6 @@ import basics.costs.DefaultVehicleRoutingActivityCosts;
 import basics.costs.VehicleRoutingActivityCosts;
 import basics.costs.VehicleRoutingTransportCosts;
 import basics.route.Vehicle;
-import basics.route.VehicleImpl;
 import basics.route.VehicleType;
 import basics.route.VehicleTypeImpl;
 

jsprit-core/src/main/java/basics/algo/TimeBreaker.java

@@ -23,9 +23,6 @@ package basics.algo;
 
 import java.util.Collection;
 
-import org.apache.commons.math.stat.StatUtils;
-import org.apache.commons.math.stat.descriptive.moment.Mean;
-import org.apache.commons.math.stat.descriptive.moment.StandardDeviation;
 import org.apache.log4j.Logger;
 
 import basics.VehicleRoutingAlgorithm;

jsprit-core/src/main/java/basics/algo/VariationCoefficientBreaker.java

@@ -24,12 +24,10 @@ package basics.algo;
 import java.util.Collection;
 
 import org.apache.commons.math.stat.StatUtils;
-import org.apache.commons.math.stat.descriptive.moment.Mean;
 import org.apache.commons.math.stat.descriptive.moment.StandardDeviation;
 import org.apache.log4j.Logger;
 
 import util.Solutions;
-
 import basics.VehicleRoutingAlgorithm;
 import basics.VehicleRoutingProblem;
 import basics.VehicleRoutingProblemSolution;

jsprit-core/src/main/java/basics/algo/VehicleRoutingAlgorithmListeners.java

@@ -25,7 +25,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.PriorityQueue;
 import java.util.TreeSet;
 
 import basics.VehicleRoutingAlgorithm;

jsprit-core/src/main/java/basics/io/VrpXMLReader.java

@@ -46,12 +46,9 @@ import basics.VehicleRoutingProblem.FleetComposition;
 import basics.VehicleRoutingProblem.FleetSize;
 import basics.VehicleRoutingProblemSolution;
 import basics.route.DefaultTourActivityFactory;
-import basics.route.DeliveryActivity;
 import basics.route.Driver;
 import basics.route.DriverImpl;
 import basics.route.End;
-import basics.route.PickupActivity;
-import basics.route.ServiceActivity;
 import basics.route.Start;
 import basics.route.TimeWindow;
 import basics.route.TourActivity;

jsprit-core/src/main/java/basics/io/VrpXMLWriter.java

@@ -37,7 +37,6 @@ import basics.Job;
 import basics.Service;
 import basics.VehicleRoutingProblem;
 import basics.VehicleRoutingProblemSolution;
-import basics.route.ServiceActivity;
 import basics.route.TourActivity;
 import basics.route.TourActivity.JobActivity;
 import basics.route.Vehicle;

jsprit-core/src/main/java/util/VehicleRoutingTransportCostsMatrix.java

@@ -25,6 +25,7 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 
+import basics.VehicleRoutingProblem;
 import basics.costs.VehicleRoutingTransportCosts;
 import basics.route.Driver;
 import basics.route.Vehicle;

jsprit-core/src/main/java/util/VrpVerifier.java

@@ -21,8 +21,6 @@
 package util;
 
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
 
 import org.apache.log4j.Logger;
 

jsprit-core/src/test/java/algorithms/BuildPDVRPAlgoFromScratchTest.java

@@ -26,9 +26,6 @@ import org.apache.log4j.Logger;
 import org.junit.Before;
 import org.junit.Test;
 
-import util.Solutions;
-import algorithms.BackwardInTimeListeners.BackwardInTimeListener;
-import algorithms.ForwardInTimeListeners.ForwardInTimeListener;
 import algorithms.HardConstraints.HardActivityLevelConstraintManager;
 import algorithms.StateManager.StateImpl;
 import algorithms.StateUpdates.UpdateActivityTimes;
@@ -44,18 +41,11 @@ import basics.VehicleRoutingAlgorithm;
 import basics.VehicleRoutingProblem;
 import basics.VehicleRoutingProblemSolution;
 import basics.algo.InsertionStartsListener;
-import basics.algo.IterationStartsListener;
 import basics.algo.JobInsertedListener;
 import basics.algo.SearchStrategy;
 import basics.algo.SearchStrategyManager;
 import basics.algo.SolutionCostCalculator;
 import basics.io.VrpXMLReader;
-import basics.io.VrpXMLWriter;
-import basics.route.DeliveryActivity;
-import basics.route.End;
-import basics.route.PickupActivity;
-import basics.route.Start;
-import basics.route.TourActivity;
 import basics.route.VehicleRoute;
 
 public class BuildPDVRPAlgoFromScratchTest {

jsprit-core/src/test/java/algorithms/ExampleActivityCostFunction.java

@@ -21,11 +21,10 @@
 package algorithms;
 
 import basics.costs.VehicleRoutingActivityCosts;
-import basics.costs.VehicleRoutingActivityCosts.Time;
 import basics.route.Driver;
 import basics.route.TourActivity;
-import basics.route.Vehicle;
 import basics.route.TourActivity.JobActivity;
+import basics.route.Vehicle;
 
 
 public class ExampleActivityCostFunction implements VehicleRoutingActivityCosts{

jsprit-core/src/test/java/algorithms/RefuseCollectionTest.java

@@ -20,7 +20,7 @@
  ******************************************************************************/
 package algorithms;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.io.BufferedReader;
 import java.io.File;

jsprit-core/src/test/java/algorithms/TestAlgorithmReader.java

@@ -25,8 +25,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.XMLConfiguration;

jsprit-core/src/test/java/algorithms/TestRefs.java

@@ -20,7 +20,7 @@
  ******************************************************************************/
 package algorithms;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;

jsprit-core/src/test/java/algorithms/selectors/SelectRandomlyTest.java

@@ -32,8 +32,6 @@ import java.util.Random;
 
 import org.junit.Test;
 
-import algorithms.selectors.SelectRandomly;
-import basics.VehicleRoutingProblem;
 import basics.VehicleRoutingProblemSolution;
 
 

jsprit-core/src/test/java/basics/algo/SearchStrategyManagerTest.java

@@ -31,9 +31,6 @@ import java.util.Random;
 
 import org.junit.Test;
 
-import basics.algo.SearchStrategy;
-import basics.algo.SearchStrategyManager;
-
 
 
 public class SearchStrategyManagerTest {

jsprit-core/src/test/java/basics/algo/SearchStrategyTest.java

@@ -34,9 +34,6 @@ import algorithms.acceptors.SolutionAcceptor;
 import algorithms.selectors.SolutionSelector;
 import basics.VehicleRoutingProblem;
 import basics.VehicleRoutingProblemSolution;
-import basics.algo.SearchStrategy;
-import basics.algo.SearchStrategyModule;
-import basics.algo.SearchStrategyModuleListener;
 
 
 

jsprit-core/src/test/java/basics/io/VrpReaderV2Test.java

@@ -34,10 +34,8 @@ import org.junit.Test;
 
 import basics.Service;
 import basics.VehicleRoutingProblem;
-import basics.VehicleRoutingProblem.Builder;
 import basics.VehicleRoutingProblem.FleetComposition;
 import basics.VehicleRoutingProblem.FleetSize;
-import basics.io.VrpXMLReader;
 import basics.route.Vehicle;
 
 public class VrpReaderV2Test {

jsprit-core/src/test/java/basics/io/VrpWriterV2Test.java

@@ -31,19 +31,16 @@ import org.junit.Test;
 
 import basics.Service;
 import basics.VehicleRoutingProblem;
-import basics.VehicleRoutingProblemSolution;
 import basics.VehicleRoutingProblem.Builder;
 import basics.VehicleRoutingProblem.FleetComposition;
 import basics.VehicleRoutingProblem.FleetSize;
-import basics.io.VrpXMLReader;
+import basics.VehicleRoutingProblemSolution;
-import basics.io.VrpXMLWriter;
 import basics.route.End;
 import basics.route.ServiceActivity;
 import basics.route.Start;
 import basics.route.Vehicle;
 import basics.route.VehicleImpl;
 import basics.route.VehicleRoute;
-import basics.route.VehicleType;
 import basics.route.VehicleTypeImpl;
 
 public class VrpWriterV2Test {

jsprit-core/src/test/java/basics/route/ServiceActTest.java

@@ -20,13 +20,12 @@
  ******************************************************************************/
 package basics.route;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
 import basics.Service;
-import basics.Service.Builder;
-import basics.route.ServiceActivity;
 
 public class ServiceActTest {
 

jsprit-core/src/test/java/basics/route/TestTour.java

@@ -20,15 +20,14 @@
  ******************************************************************************/
 package basics.route;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
 
 import basics.Service;
-import basics.Service.Builder;
-import basics.route.ServiceActivity;
-import basics.route.TourActivities;
 
 
 public class TestTour {