optimize imports

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

@@ -16,14 +16,14 @@
  ******************************************************************************/
 package jsprit.core.algorithm;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 import jsprit.core.algorithm.recreate.listener.InsertionEndsListener;
 import jsprit.core.problem.solution.route.VehicleRoute;
 import jsprit.core.problem.vehicle.VehicleFleetManager;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 
 public class RemoveEmptyVehicles implements InsertionEndsListener{
 

jsprit-core/src/main/java/jsprit/core/algorithm/ResetAndIniFleetManager.java

@@ -16,14 +16,14 @@
  ******************************************************************************/
 package jsprit.core.algorithm;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 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 java.util.ArrayList;
+import java.util.Collection;
+
 
 public class ResetAndIniFleetManager implements InsertionStartsListener{
 

jsprit-core/src/main/java/jsprit/core/algorithm/box/GreedySchrimpfFactory.java

@@ -16,8 +16,6 @@
  ******************************************************************************/
 package jsprit.core.algorithm.box;
 
-import java.net.URL;
-
 import jsprit.core.algorithm.VehicleRoutingAlgorithm;
 import jsprit.core.algorithm.io.AlgorithmConfig;
 import jsprit.core.algorithm.io.AlgorithmConfigXmlReader;
@@ -25,6 +23,8 @@ import jsprit.core.algorithm.io.VehicleRoutingAlgorithms;
 import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.util.Resource;
 
+import java.net.URL;
+
 
 
 /**

jsprit-core/src/main/java/jsprit/core/algorithm/listener/AlgorithmEndsListener.java

@@ -16,11 +16,11 @@
  ******************************************************************************/
 package jsprit.core.algorithm.listener;
 
-import java.util.Collection;
-
 import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
 
+import java.util.Collection;
+
 
 
 

jsprit-core/src/main/java/jsprit/core/algorithm/listener/AlgorithmStartsListener.java

@@ -16,12 +16,12 @@
  ******************************************************************************/
 package jsprit.core.algorithm.listener;
 
-import java.util.Collection;
-
 import jsprit.core.algorithm.VehicleRoutingAlgorithm;
 import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
 
+import java.util.Collection;
+
 
 
 

jsprit-core/src/main/java/jsprit/core/algorithm/listener/IterationEndsListener.java

@@ -16,11 +16,11 @@
  ******************************************************************************/
 package jsprit.core.algorithm.listener;
 
-import java.util.Collection;
-
 import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
 
+import java.util.Collection;
+
 
 
 

jsprit-core/src/main/java/jsprit/core/algorithm/listener/IterationStartsListener.java

@@ -16,11 +16,11 @@
  ******************************************************************************/
 package jsprit.core.algorithm.listener;
 
-import java.util.Collection;
-
 import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
 
+import java.util.Collection;
+
 
 
 

jsprit-core/src/main/java/jsprit/core/algorithm/listener/StrategySelectedListener.java

@@ -16,12 +16,12 @@
  ******************************************************************************/
 package jsprit.core.algorithm.listener;
 
-import java.util.Collection;
-
 import jsprit.core.algorithm.SearchStrategyManager;
 import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
 
+import java.util.Collection;
+
 
 
 

jsprit-core/src/main/java/jsprit/core/algorithm/listener/VehicleRoutingAlgorithmListeners.java

@@ -16,18 +16,13 @@
  ******************************************************************************/
 package jsprit.core.algorithm.listener;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.TreeSet;
-
 import jsprit.core.algorithm.SearchStrategyManager;
 import jsprit.core.algorithm.VehicleRoutingAlgorithm;
 import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
 
+import java.util.*;
+
 
 
 

jsprit-core/src/main/java/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java

@@ -1,9 +1,5 @@
 package jsprit.core.algorithm.recreate;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import jsprit.core.algorithm.recreate.InsertionData.NoInsertionFound;
 import jsprit.core.algorithm.recreate.listener.InsertionStartsListener;
 import jsprit.core.problem.driver.Driver;
 import jsprit.core.problem.job.Job;
@@ -13,6 +9,10 @@ import jsprit.core.util.RandomNumberGeneration;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 
 class CalculatesServiceInsertionWithTimeScheduling implements JobInsertionCostsCalculator{
 

jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ConfigureFixCostCalculator.java

@@ -17,14 +17,14 @@
 package jsprit.core.algorithm.recreate;
 
 
-import java.util.Collection;
-
 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 java.util.Collection;
+
 
 final class ConfigureFixCostCalculator implements InsertionStartsListener, JobInsertedListener{
 

jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java

@@ -18,8 +18,6 @@
  ******************************************************************************/
 package jsprit.core.algorithm.recreate;
 
-import java.util.Collection;
-
 import jsprit.core.algorithm.recreate.listener.InsertionStartsListener;
 import jsprit.core.algorithm.recreate.listener.JobInsertedListener;
 import jsprit.core.problem.constraint.SoftRouteConstraint;
@@ -28,6 +26,8 @@ import jsprit.core.problem.misc.JobInsertionContext;
 import jsprit.core.problem.solution.route.VehicleRoute;
 import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter;
 
+import java.util.Collection;
+
 public class DellAmicoFixCostCalculator implements SoftRouteConstraint, InsertionStartsListener, JobInsertedListener{
 
 	private int nuOfJobsToRecreate;

jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobCalculatorSwitcher.java

@@ -18,14 +18,14 @@
  ******************************************************************************/
 package jsprit.core.algorithm.recreate;
 
-import java.util.HashMap;
-import java.util.Map;
-
 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 java.util.HashMap;
+import java.util.Map;
+
 
 class JobCalculatorSwitcher implements JobInsertionCostsCalculator{
 

jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionEndsListener.java

@@ -16,10 +16,10 @@
  ******************************************************************************/
 package jsprit.core.algorithm.recreate.listener;
 
-import java.util.Collection;
-
 import jsprit.core.problem.solution.route.VehicleRoute;
 
+import java.util.Collection;
+
 
 
 public interface InsertionEndsListener extends InsertionListener {

jsprit-core/src/main/java/jsprit/core/algorithm/recreate/listener/InsertionStartsListener.java

@@ -16,11 +16,11 @@
  ******************************************************************************/
 package jsprit.core.algorithm.recreate.listener;
 
-import java.util.Collection;
-
 import jsprit.core.problem.job.Job;
 import jsprit.core.problem.solution.route.VehicleRoute;
 
+import java.util.Collection;
+
 
 
 public interface InsertionStartsListener extends InsertionListener {

jsprit-core/src/main/java/jsprit/core/algorithm/selector/SelectBest.java

@@ -16,10 +16,10 @@
  ******************************************************************************/
 package jsprit.core.algorithm.selector;
 
-import java.util.Collection;
-
 import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
 
+import java.util.Collection;
+
 
 
 

jsprit-core/src/main/java/jsprit/core/algorithm/selector/SelectRandomly.java

@@ -16,14 +16,14 @@
  ******************************************************************************/
 package jsprit.core.algorithm.selector;
 
+import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
+import jsprit.core.util.RandomNumberGeneration;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Random;
 
-import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
-import jsprit.core.util.RandomNumberGeneration;
-
 
 
 

jsprit-core/src/main/java/jsprit/core/algorithm/selector/SolutionSelector.java

@@ -16,10 +16,10 @@
  ******************************************************************************/
 package jsprit.core.algorithm.selector;
 
-import java.util.Collection;
-
 import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
 
+import java.util.Collection;
+
 
 
 public interface SolutionSelector {

jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftActivityConstraintManager.java

@@ -18,13 +18,13 @@
  ******************************************************************************/
 package jsprit.core.problem.constraint;
 
+import jsprit.core.problem.misc.JobInsertionContext;
+import jsprit.core.problem.solution.route.activity.TourActivity;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
-import jsprit.core.problem.misc.JobInsertionContext;
-import jsprit.core.problem.solution.route.activity.TourActivity;
-
 class SoftActivityConstraintManager implements SoftActivityConstraint{
 
 	private Collection<SoftActivityConstraint> softConstraints = new ArrayList<SoftActivityConstraint>();

jsprit-core/src/main/java/jsprit/core/problem/constraint/SoftRouteConstraintManager.java

@@ -18,12 +18,12 @@
  ******************************************************************************/
 package jsprit.core.problem.constraint;
 
+import jsprit.core.problem.misc.JobInsertionContext;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
-import jsprit.core.problem.misc.JobInsertionContext;
-
 class SoftRouteConstraintManager implements SoftRouteConstraint{
 
 	private Collection<SoftRouteConstraint> softConstraints = new ArrayList<SoftRouteConstraint>();

jsprit-core/src/main/java/jsprit/core/problem/solution/route/ReverseRouteActivityVisitor.java

@@ -16,13 +16,13 @@
  ******************************************************************************/
 package jsprit.core.problem.solution.route;
 
+import jsprit.core.problem.solution.route.activity.ReverseActivityVisitor;
+import jsprit.core.problem.solution.route.activity.TourActivity;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
-import jsprit.core.problem.solution.route.activity.ReverseActivityVisitor;
-import jsprit.core.problem.solution.route.activity.TourActivity;
-
 
 public class ReverseRouteActivityVisitor implements RouteVisitor{
 

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

@@ -16,16 +16,16 @@
  ******************************************************************************/
 package jsprit.core.util;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
 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 java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
 
 public class SolutionVerifier implements AlgorithmEndsListener{
 

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

@@ -16,10 +16,10 @@
  ******************************************************************************/
 package jsprit.core.util;
 
-import java.util.Collection;
-
 import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
 
+import java.util.Collection;
+
 
 public class Solutions {
 	

jsprit-core/src/test/java/jsprit/core/algorithm/BuildCVRPAlgoFromScratch_IT.java

@@ -27,7 +27,6 @@ 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.state.UpdateVariableCosts;
 import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.problem.constraint.ConstraintManager;
 import jsprit.core.problem.io.VrpXMLReader;

jsprit-core/src/test/java/jsprit/core/algorithm/FiniteVehicleFleetManagerIdentifiesDistinctVehicle_IT.java

@@ -18,20 +18,19 @@
  ******************************************************************************/
 package jsprit.core.algorithm;
 
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 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 org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
 public class FiniteVehicleFleetManagerIdentifiesDistinctVehicle_IT {
 	
 	@Test

jsprit-core/src/test/java/jsprit/core/algorithm/MeetTimeWindowConstraint_IT.java

@@ -18,13 +18,6 @@
  ******************************************************************************/
 package jsprit.core.algorithm;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 import jsprit.core.algorithm.box.SchrimpfFactory;
 import jsprit.core.algorithm.io.VehicleRoutingAlgorithms;
 import jsprit.core.algorithm.recreate.listener.JobInsertedListener;
@@ -36,9 +29,15 @@ import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
 import jsprit.core.problem.solution.route.VehicleRoute;
 import jsprit.core.problem.vehicle.Vehicle;
 import jsprit.core.util.Solutions;
-
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 public class MeetTimeWindowConstraint_IT {
 	
 	@Test

jsprit-core/src/test/java/jsprit/core/algorithm/OpenRoutesTest.java

@@ -18,10 +18,6 @@
  ******************************************************************************/
 package jsprit.core.algorithm;
 
-import static org.junit.Assert.*;
-
-import java.util.Collection;
-
 import jsprit.core.algorithm.box.SchrimpfFactory;
 import jsprit.core.algorithm.recreate.NoSolutionFoundException;
 import jsprit.core.problem.Location;
@@ -29,17 +25,19 @@ 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.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.GreatCircleCosts;
 import jsprit.core.util.Solutions;
-
 import jsprit.core.util.TestUtils;
 import org.junit.Test;
 
+import java.util.Collection;
+
+import static org.junit.Assert.*;
+
 public class OpenRoutesTest {
 	
 	@Test

jsprit-core/src/test/java/jsprit/core/algorithm/PickupsAndDeliveries_IT.java

@@ -18,18 +18,17 @@
  ******************************************************************************/
 package jsprit.core.algorithm;
 
-import static org.junit.Assert.*;
-
-import java.util.Collection;
-
 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 org.junit.Test;
 
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+
 public class PickupsAndDeliveries_IT {
 	
 	@Test

jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java

@@ -16,15 +16,6 @@
  ******************************************************************************/
 package jsprit.core.algorithm;
 
-import static org.junit.Assert.assertEquals;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Collection;
-
 import jsprit.core.algorithm.box.GreedySchrimpfFactory;
 import jsprit.core.algorithm.termination.IterationWithoutImprovementTermination;
 import jsprit.core.problem.VehicleRoutingProblem;
@@ -39,9 +30,13 @@ import jsprit.core.reporting.SolutionPrinter.Print;
 import jsprit.core.util.Solutions;
 import jsprit.core.util.VehicleRoutingTransportCostsMatrix;
 import jsprit.core.util.VehicleRoutingTransportCostsMatrix.Builder;
-
 import org.junit.Test;
 
+import java.io.*;
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+
 
 
 public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT {

jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java

@@ -16,15 +16,6 @@
  ******************************************************************************/
 package jsprit.core.algorithm;
 
-import static org.junit.Assert.assertEquals;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Collection;
-
 import jsprit.core.algorithm.box.GreedySchrimpfFactory;
 import jsprit.core.algorithm.termination.IterationWithoutImprovementTermination;
 import jsprit.core.problem.VehicleRoutingProblem;
@@ -39,9 +30,13 @@ import jsprit.core.reporting.SolutionPrinter.Print;
 import jsprit.core.util.Solutions;
 import jsprit.core.util.VehicleRoutingTransportCostsMatrix;
 import jsprit.core.util.VehicleRoutingTransportCostsMatrix.Builder;
-
 import org.junit.Test;
 
+import java.io.*;
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+
 
 
 public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT {

jsprit-core/src/test/java/jsprit/core/algorithm/acceptor/AcceptNewRemoveWorstTest.java

@@ -16,19 +16,18 @@
  ******************************************************************************/
 package jsprit.core.algorithm.acceptor;
 
+import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
-
-import org.junit.Test;
-
 
 
 

jsprit-core/src/test/java/jsprit/core/algorithm/recreate/CalcVehicleTypeDependentServiceInsertionTest.java

@@ -16,28 +16,23 @@
  ******************************************************************************/
 package jsprit.core.algorithm.recreate;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.Collections;
-
 import jsprit.core.problem.Capacity;
 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.Vehicle;
+import jsprit.core.problem.vehicle.*;
-import jsprit.core.problem.vehicle.VehicleFleetManager;
-import jsprit.core.problem.vehicle.VehicleImpl;
-import jsprit.core.problem.vehicle.VehicleType;
-import jsprit.core.problem.vehicle.VehicleTypeImpl;
-
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 
 public class CalcVehicleTypeDependentServiceInsertionTest {
 	

jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestDepartureTimeOpt.java

@@ -16,11 +16,6 @@
  ******************************************************************************/
 package jsprit.core.algorithm.recreate;
 
-import static org.junit.Assert.assertEquals;
-
-import java.util.Collection;
-
-
 import jsprit.core.algorithm.VehicleRoutingAlgorithm;
 import jsprit.core.algorithm.io.VehicleRoutingAlgorithms;
 import jsprit.core.problem.VehicleRoutingProblem;
@@ -36,10 +31,13 @@ import jsprit.core.problem.vehicle.VehicleImpl;
 import jsprit.core.problem.vehicle.VehicleTypeImpl;
 import jsprit.core.util.Coordinate;
 import jsprit.core.util.Solutions;
-
 import org.junit.Ignore;
 import org.junit.Test;
 
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+
 @Ignore
 public class TestDepartureTimeOpt {
 	

jsprit-core/src/test/java/jsprit/core/algorithm/ruin/JobNeighborhoodsImplTest.java

@@ -18,24 +18,22 @@
  ******************************************************************************/
 package jsprit.core.algorithm.ruin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import jsprit.core.algorithm.ruin.RuinRadial.JobNeighborhoodsImpl;
 import jsprit.core.algorithm.ruin.distance.EuclideanServiceDistance;
 import jsprit.core.algorithm.ruin.distance.JobDistance;
 import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.problem.job.Job;
 import jsprit.core.problem.job.Service;
 import jsprit.core.util.Coordinate;
-
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 
 public class JobNeighborhoodsImplTest {
 

jsprit-core/src/test/java/jsprit/core/algorithm/ruin/JobNeighborhoodsWithCapRestrictionImplTest.java

@@ -18,24 +18,22 @@
  ******************************************************************************/
 package jsprit.core.algorithm.ruin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import jsprit.core.algorithm.ruin.RuinRadial.JobNeighborhoodsImplWithCapRestriction;
 import jsprit.core.algorithm.ruin.distance.EuclideanServiceDistance;
 import jsprit.core.algorithm.ruin.distance.JobDistance;
 import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.problem.job.Job;
 import jsprit.core.problem.job.Service;
 import jsprit.core.util.Coordinate;
-
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 
 public class JobNeighborhoodsWithCapRestrictionImplTest {
 

jsprit-core/src/test/java/jsprit/core/algorithm/selector/SelectBestTest.java

@@ -16,20 +16,18 @@
  ******************************************************************************/
 package jsprit.core.algorithm.selector;
 
+import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.Arrays;
-import java.util.Collections;
-
-import jsprit.core.algorithm.selector.SelectBest;
-import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
-
-import org.junit.Test;
-
 
 
 

jsprit-core/src/test/java/jsprit/core/algorithm/selector/SelectRandomlyTest.java

@@ -16,20 +16,18 @@
  ******************************************************************************/
 package jsprit.core.algorithm.selector;
 
-import static org.hamcrest.CoreMatchers.is;
+import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
-import static org.junit.Assert.assertNull;
+import org.junit.Test;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Random;
 
-import jsprit.core.algorithm.selector.SelectRandomly;
+import static org.hamcrest.CoreMatchers.is;
-import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
+import static org.junit.Assert.assertNull;
-
+import static org.junit.Assert.assertThat;
-import org.junit.Test;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 
 

jsprit-core/src/test/java/jsprit/core/problem/CapacityTest.java

@@ -18,13 +18,11 @@
  ******************************************************************************/
 package jsprit.core.problem;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 import java.util.Random;
 
-import org.junit.Test;
+import static org.junit.Assert.*;
 
 public class CapacityTest {
 	

jsprit-core/src/test/java/jsprit/core/problem/constraint/SoftActivityConstraintManagerTest.java

@@ -18,13 +18,13 @@
  ******************************************************************************/
 package jsprit.core.problem.constraint;
 
+import jsprit.core.problem.misc.JobInsertionContext;
+import jsprit.core.problem.solution.route.activity.TourActivity;
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import jsprit.core.problem.misc.JobInsertionContext;
-import jsprit.core.problem.solution.route.activity.TourActivity;
-
-import org.junit.Test;
 
 public class SoftActivityConstraintManagerTest {
 

jsprit-core/src/test/java/jsprit/core/problem/constraint/SoftRouteConstraintManagerTest.java

@@ -19,10 +19,9 @@
 package jsprit.core.problem.constraint;
 
 import jsprit.core.problem.misc.JobInsertionContext;
-
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

jsprit-core/src/test/java/jsprit/core/problem/solution/route/activity/DefaultTourActivityFactoryTest.java

@@ -18,14 +18,14 @@
  ******************************************************************************/
 package jsprit.core.problem.solution.route.activity;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import jsprit.core.problem.job.Delivery;
 import jsprit.core.problem.job.Pickup;
 import jsprit.core.problem.job.Service;
-
 import org.junit.Test;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 public class DefaultTourActivityFactoryTest {
 	
 	@Test

jsprit-core/src/test/java/jsprit/core/problem/vehicle/TestVehicleFleetManagerImpl.java

@@ -16,15 +16,15 @@
  ******************************************************************************/
 package jsprit.core.problem.vehicle;
 
-import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.junit.Before;
+import static org.junit.Assert.*;
-import org.junit.Test;
 
 public class TestVehicleFleetManagerImpl {
 	

jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleTypeImplTest.java

@@ -18,10 +18,10 @@
  ******************************************************************************/
 package jsprit.core.problem.vehicle;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 public class VehicleTypeImplTest {
 
 	@Test(expected=IllegalArgumentException.class)

jsprit-core/src/test/resources/infiniteWriterV2Test.xml

@@ -2,9 +2,24 @@
 <problem xmlns="http://www.w3schools.com"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3schools.com vrp_xml_schema.xsd">
      <problemType>
-          <fleetSize>INFINITE</fleetSize>
+          <fleetSize>FINITE</fleetSize>
      </problemType>
      <vehicles>
+          <vehicle>
+               <id>v2</id>
+               <typeId>vehType2</typeId>
+               <startLocation>
+                    <id>loc</id>
+               </startLocation>
+               <endLocation>
+                    <id>loc</id>
+               </endLocation>
+               <timeSchedule>
+                    <start>0.0</start>
+                    <end>1.7976931348623157E308</end>
+               </timeSchedule>
+               <returnToDepot>true</returnToDepot>
+          </vehicle>
           <vehicle>
                <id>v1</id>
                <typeId>vehType</typeId>
@@ -33,58 +48,16 @@
                     <time>0.0</time>
                </costs>
           </type>
+          <type>
+               <id>vehType2</id>
+               <capacity-dimensions>
+                    <dimension index="0">200</dimension>
+               </capacity-dimensions>
+               <costs>
+                    <fixed>0.0</fixed>
+                    <distance>1.0</distance>
+                    <time>0.0</time>
+               </costs>
+          </type>
      </vehicleTypes>
-     <services>
-          <service id="1" type="service">
-               <location>
-                    <id>loc</id>
-               </location>
-               <capacity-dimensions>
-                    <dimension index="0">1</dimension>
-               </capacity-dimensions>
-               <duration>2.0</duration>
-               <timeWindows>
-                    <timeWindow>
-                         <start>0.0</start>
-                         <end>1.7976931348623157E308</end>
-                    </timeWindow>
-               </timeWindows>
-          </service>
-          <service id="2" type="service">
-               <location>
-                    <id>loc2</id>
-               </location>
-               <capacity-dimensions>
-                    <dimension index="0">1</dimension>
-               </capacity-dimensions>
-               <duration>4.0</duration>
-               <timeWindows>
-                    <timeWindow>
-                         <start>0.0</start>
-                         <end>1.7976931348623157E308</end>
-                    </timeWindow>
-               </timeWindows>
-          </service>
-     </services>
-     <solutions>
-          <solution>
-               <cost>10.0</cost>
-               <routes>
-                    <route>
-                         <driverId>noDriver</driverId>
-                         <vehicleId>v1</vehicleId>
-                         <start>0.0</start>
-                         <act type="service">
-                              <serviceId>1</serviceId>
-                              <arrTime>0.0</arrTime>
-                              <endTime>0.0</endTime>
-                         </act>
-                         <end>0.0</end>
-                    </route>
-               </routes>
-               <unassignedJobs>
-                    <job id="2"/>
-               </unassignedJobs>
-          </solution>
-     </solutions>
 </problem>