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

Merge branch 'pickupAndDelivery' into PickupMergeRelaxAPI

Conflicts:
	jsprit-core/src/main/java/algorithms/BestInsertionBuilder.java
	jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithmFactoryImpl.java
	jsprit-core/src/test/java/algorithms/BuildPDVRPWithShipmentsAlgoFromScratchTest.java
	jsprit-core/src/test/resources/pdp_sol.xml
This commit is contained in:
Stefan Schroeder 2013-11-21 12:20:59 +01:00
commit a9da587f6a
35 changed files with 609 additions and 36828 deletions

View file

@ -19,6 +19,9 @@ package examples;
import java.io.File;
import java.util.Collection;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import algorithms.VehicleRoutingAlgorithms;
import algorithms.selectors.SelectBest;
import analysis.AlgorithmSearchProgressChartListener;
@ -37,6 +40,8 @@ public class PickupAndDeliveryExample2 {
public static void main(String[] args) {
Logger.getRootLogger().setLevel(Level.INFO);
/*
* some preparation - create output folder
*/