trans/graphhopper-jsprit
1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
Code Issues Releases Wiki Activity

improve logging - #159

Browse source
This commit is contained in:
oblonski 2015-05-19 00:04:24 +02:00
parent 56243f924e
commit a4dd1d9ac5
4 changed files with 66 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
jsprit-core/src/main/java/jsprit/core/algorithm/recreate/AbstractInsertionStrategy.java
View file

@ -26,6 +26,8 @@ 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 org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Collection;
import java.util.Collections;
@ -55,6 +57,8 @@ public abstract class AbstractInsertionStrategy implements InsertionStrategy{
}
private final static Logger logger = LogManager.getLogger();
protected Random random = RandomNumberGeneration.getRandom();
protected final static double NO_NEW_DEPARTURE_TIME_YET = -12345.12345;
@ -106,6 +110,7 @@ public abstract class AbstractInsertionStrategy implements InsertionStrategy{
}
protected void insertJob(Job unassignedJob, InsertionData iData, VehicleRoute inRoute){
logger.trace("insert: [jobId=" + unassignedJob.getId() + "]" + iData );
inserter.insertJob(unassignedJob, iData, inRoute);
}

2
jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionData.java
View file

@ -90,7 +90,7 @@ public class InsertionData {
@Override
public String toString() {
return "[iCost="+insertionCost+"][iIndex="+deliveryInsertionIndex+"][depTime="+departureTime+"][vehicle="+selectedVehicle+"][driver="+selectedDriver+"]";
return "[iCost="+insertionCost+"][pickupIndex="+pickupInsertionIndex+"][deliveryIndex="+deliveryInsertionIndex+"][depTime="+departureTime+"][vehicle="+selectedVehicle+"][driver="+selectedDriver+"]";
}
/**

6
jsprit-core/src/main/java/jsprit/core/algorithm/ruin/AbstractRuinStrategy.java
View file

@ -24,12 +24,16 @@ import jsprit.core.problem.VehicleRoutingProblem;
import jsprit.core.problem.job.Job;
import jsprit.core.problem.solution.route.VehicleRoute;
import jsprit.core.util.RandomNumberGeneration;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Collection;
import java.util.Random;
public abstract class AbstractRuinStrategy implements RuinStrategy{
private final static Logger logger = LogManager.getLogger();
private RuinListeners ruinListeners;
protected Random random = RandomNumberGeneration.getRandom();
@ -59,6 +63,7 @@ public abstract class AbstractRuinStrategy implements RuinStrategy{
public Collection<Job> ruin(Collection<VehicleRoute> vehicleRoutes){
ruinListeners.ruinStarts(vehicleRoutes);
Collection<Job> unassigned = ruinRoutes(vehicleRoutes);
logger.trace("ruin: " + "[ruined=" + unassigned.size() + "]");
ruinListeners.ruinEnds(vehicleRoutes,unassigned);
return unassigned;
}
@ -111,6 +116,7 @@ public abstract class AbstractRuinStrategy implements RuinStrategy{
if(jobIsInitial(job)) return false;
boolean removed = route.getTourActivities().removeJob(job);
if (removed) {
logger.trace("ruin: " + job.getId());
ruinListeners.removed(job,route);
return true;
}