oblonski d2151f3e1f Merge remote-tracking branch 'choose_remote_name/relaxAPI' into ... PickupAndDelivery Conflicts: jsprit-core/src/main/java/algorithms/BestInsertionBuilder.java jsprit-core/src/main/java/algorithms/ServiceInsertionCalculator.java jsprit-core/src/main/java/algorithms/UpdateLoadAtActivityLevel.java jsprit-core/src/main/java/algorithms/UpdateLoadsAtStartAndEndOfRouteWhenJobHasBeenInserted.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-11-11 20:54:45 +01:00
..
java	Merge remote-tracking branch 'choose_remote_name/relaxAPI' into	2013-11-11 20:54:45 +01:00
resources	modify io to read and write shipments, add tests to test reader/writer	2013-10-30 08:43:01 +01:00