Stefan Schroeder e21d1ff7c5 Merge branch 'master' into relaxAPI ... Conflicts: jsprit-core/src/main/java/algorithms/CalcUtils.java jsprit-core/src/main/java/algorithms/CalculatesServiceInsertion.java jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionOnRouteLevel.java jsprit-core/src/main/java/algorithms/CalculatorBuilder.java jsprit-core/src/main/java/algorithms/InsertionFactory.java jsprit-core/src/main/java/algorithms/MarginalsCalculusTriangleInequality.java jsprit-core/src/main/java/algorithms/RuinAndRecreateModule.java jsprit-core/src/main/java/algorithms/RuinListeners.java jsprit-core/src/main/java/algorithms/StateTypes.java jsprit-core/src/main/java/algorithms/StateUpdates.java jsprit-core/src/test/java/algorithms/BuildCVRPAlgoFromScratchTest.java jsprit-core/src/test/java/algorithms/BuildPDVRPAlgoFromScratchTest.java jsprit-core/src/test/java/algorithms/GendreauPostOptTest.java jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertion.java		2013-10-16 15:12:24 +02:00
..
.settings	ini	2013-06-04 10:25:47 +02:00
src	Merge branch 'master' into relaxAPI	2013-10-16 15:12:24 +02:00
.classpath	ini	2013-06-04 10:25:47 +02:00
.gitignore	rm .DS_Store files and add them to .gitignore	2013-06-06 11:00:07 +02:00
.project	ini	2013-06-04 10:25:47 +02:00
license.txt	change license from GPLv2 to LGPLv3	2013-10-14 16:41:10 +02:00
pom.xml	introduce SolutionCostCalculator	2013-10-10 13:59:22 +02:00