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

misc

Browse source
This commit is contained in:
Stefan Schroeder 2014-06-27 15:12:30 +02:00
parent 36ece637f5
commit f30634addf
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
jsprit-core/src/main/java/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java
View file

@ -20,6 +20,7 @@ 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;
@ -92,6 +93,9 @@ private static Logger log = Logger.getLogger(CalculatesServiceInsertionWithTimeS
System.out.println("hu");
}
InsertionData insertionData = jic.getInsertionData(currentRoute, jobToInsert, newVehicle, departureTime, newDriver, bestKnownScore);
if(!(insertionData instanceof NoInsertionFound) && insertionData.getVehicleDepartureTime() < 28000){
System.out.println("hmm");
}
return insertionData;
}

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

@ -24,6 +24,7 @@ import java.util.Map;
import java.util.PriorityQueue;
import jsprit.core.algorithm.recreate.ActivityInsertionCostsCalculator.ActivityInsertionCosts;
import jsprit.core.algorithm.recreate.InsertionData.NoInsertionFound;
import jsprit.core.problem.constraint.HardActivityStateLevelConstraint;
import jsprit.core.problem.constraint.HardActivityStateLevelConstraint.ConstraintsStatus;
import jsprit.core.problem.constraint.HardRouteStateLevelConstraint;
@ -305,6 +306,10 @@ final class ServiceInsertionOnRouteLevelCalculator implements JobInsertionCostsC
if(best_insertion_index == InsertionData.NO_INDEX) return InsertionData.createEmptyInsertionData();
InsertionData insertionData = new InsertionData(best_insertion_costs, InsertionData.NO_INDEX, best_insertion_index, newVehicle, newDriver);
insertionData.setVehicleDepartureTime(start.getEndTime());
if(!(insertionData instanceof NoInsertionFound) && insertionData.getVehicleDepartureTime() < 28000){
System.out.println("hmm");
}
return insertionData;
}

9
jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java
View file

@ -115,10 +115,10 @@ final class VehicleTypeDependentJobInsertionCalculator implements JobInsertionCo
depTime = v.getEarliestDeparture();
}
InsertionData iData = insertionCalculator.getInsertionData(currentRoute, jobToInsert, v, depTime, selectedDriver, bestKnownCost_);
if(!(iData instanceof NoInsertionFound) && iData.getVehicleDepartureTime() < 28000){
System.out.println("hmm");
}
if(iData instanceof NoInsertionFound) {
// if(bestIData instanceof NoInsertionFound) {
// bestIData = iData;
// }
continue;
}
else if(iData.getInsertionCost() < bestKnownCost_){
@ -126,6 +126,9 @@ final class VehicleTypeDependentJobInsertionCalculator implements JobInsertionCo
bestKnownCost_ = iData.getInsertionCost();
}
}
if(!(bestIData instanceof NoInsertionFound) && bestIData.getVehicleDepartureTime() < 28000){
System.out.println("hmm");
}
return bestIData;
}