internal refactoring of insertionStrategy

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

@@ -45,6 +45,8 @@ final class BestInsertion extends AbstractInsertionStrategy{
 
 	private Random random = RandomNumberGeneration.getRandom();
 	
+	private InsertionListeners insertionsListeners;
+	
 	private RouteAlgorithm routeAlgorithm;
 	
 	public void setExperimentalPreferredRoute(Map<String, VehicleRoute> experimentalPreferredRoute) {
@@ -67,6 +69,7 @@ final class BestInsertion extends AbstractInsertionStrategy{
 	public BestInsertion(RouteAlgorithm routeAlgorithm) {
 		super();
 		this.routeAlgorithm = routeAlgorithm;
+		this.insertionsListeners = new InsertionListeners();
 		logger.info("initialise " + this);
 	}
 	
@@ -86,8 +89,7 @@ final class BestInsertion extends AbstractInsertionStrategy{
 		informInsertionStarts(vehicleRoutes,unassignedJobs.size());
 		int inserted = 0;
 		List<String> reasons = new ArrayList<String>();
-		for(Job unassignedJob : unassignedJobList){
+		for(Job unassignedJob : unassignedJobList){			
-			
 			VehicleRoute insertIn = null;
 			Insertion bestInsertion = null;
 			double bestInsertionCost = Double.MAX_VALUE;

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

@@ -51,7 +51,7 @@ final class CreateInitialSolution implements InitialSolutionFactory {
 
 	private static final Logger logger = Logger.getLogger(CreateInitialSolution.class);
 
-	private final AbstractInsertionStrategy insertion;
+	private final InsertionStrategy insertion;
 	
 	private boolean generateAsMuchAsRoutesAsVehiclesExist = false;
 	
@@ -59,9 +59,9 @@ final class CreateInitialSolution implements InitialSolutionFactory {
 		this.generateAsMuchAsRoutesAsVehiclesExist = generateAsMuchAsRoutesAsVehiclesExist;
 	}
 
-	public CreateInitialSolution(AbstractInsertionStrategy insertion) {
+	public CreateInitialSolution(InsertionStrategy insertionStrategy) {
 		super();
-		this.insertion = insertion;
+		this.insertion = insertionStrategy;
 	}
 
 	@Override

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

@@ -51,7 +51,7 @@ final class Gendreau implements SearchStrategyModule{
 	
 	private final VehicleRoutingProblem vrp;
 	
-	private final AbstractInsertionStrategy insertionStrategy;
+	private final InsertionStrategy insertionStrategy;
 	
 	private final RouteAlgorithm routeAlgorithm;
 	
@@ -67,7 +67,7 @@ final class Gendreau implements SearchStrategyModule{
 		this.shareOfJobsToRuin = shareOfJobsToRuin;
 	}
 
-	public Gendreau(VehicleRoutingProblem vrp, RuinStrategy ruin, AbstractInsertionStrategy insertionStrategy) {
+	public Gendreau(VehicleRoutingProblem vrp, RuinStrategy ruin, InsertionStrategy insertionStrategy) {
 		super();
 		this.routeAlgorithm = insertionStrategy.getRouteAlgorithm();
 		this.ruin = ruin;

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

@@ -0,0 +1,57 @@
+package algorithms;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import basics.Job;
+import basics.algo.InsertionEndsListener;
+import basics.algo.InsertionListener;
+import basics.algo.InsertionStartsListener;
+import basics.algo.JobInsertedListener;
+import basics.route.VehicleRoute;
+
+class InsertionListeners {
+	
+	private Collection<InsertionListener> listeners = new ArrayList<InsertionListener>();
+	
+	public void informJobInserted(int nOfJobs2Recreate, Job insertedJob, VehicleRoute insertedIn){
+		for(InsertionListener l : listeners){
+			if(l instanceof JobInsertedListener){
+				((JobInsertedListener)l).informJobInserted(nOfJobs2Recreate, insertedJob, insertedIn);
+			}
+		}
+	}
+	
+	public void informBeforeJobInsertion(Job job, InsertionData data, VehicleRoute route){
+		for(InsertionListener l : listeners){
+			if(l instanceof BeforeJobInsertionListener){
+				((BeforeJobInsertionListener)l).informBeforeJobInsertion(job, data, route);
+			}
+		}
+	}
+	
+	public void informInsertionStarts(Collection<VehicleRoute> vehicleRoutes, int nOfJobs2Recreate){
+		for(InsertionListener l : listeners){
+			if(l instanceof InsertionStartsListener){
+				((InsertionStartsListener)l).informInsertionStarts(vehicleRoutes,nOfJobs2Recreate);
+			}
+		}
+	}
+	
+	public void informInsertionEndsListeners(Collection<VehicleRoute> vehicleRoutes) {
+		for(InsertionListener l : listeners){
+			if(l instanceof InsertionEndsListener){
+				((InsertionEndsListener)l).informInsertionEnds(vehicleRoutes);
+			}
+		}
+	}
+	
+	public void addListener(InsertionListener insertionListener){
+		listeners.add(insertionListener);
+	}
+	
+	public void removeListener(InsertionListener insertionListener){
+		listeners.remove(insertionListener);
+	}
+
+}

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

@@ -15,6 +15,7 @@ package algorithms;
 import java.util.Collection;
 
 import basics.Job;
+import basics.algo.InsertionListener;
 import basics.route.VehicleRoute;
 
 
@@ -62,5 +63,7 @@ interface InsertionStrategy {
 	 * @param result2beat
 	 */
 	public void run(Collection<VehicleRoute> vehicleRoutes, Collection<Job> unassignedJobs, double result2beat);
+	
+	public void addListener(InsertionListener insertionListener);
 
 }