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

97 commits

Author SHA1 Message Date
oblonski
36a3eab299 add javadoc to Vehicle and VehicleImpl 2013-12-30 21:45:51 +01:00
oblonski
b6d97d6688 add javadoc and tests 2013-12-29 23:53:06 +01:00
oblonski
5842bd73a4 add tests to VehicleRoutingProblem 2013-12-29 23:36:57 +01:00
Stefan Schroeder
5ff6d40d63 inspect and remove warnings 2013-12-18 17:05:19 +01:00
Stefan Schroeder
aff324fb3f issue #62 2013-12-05 18:19:01 +01:00
Stefan Schroeder
3bf977784e add test for ConstraintManager 2013-12-03 15:18:21 +01:00
oblonski
4e38586b50 test ConstraintManager 2013-12-03 07:55:44 +01:00
oblonski
8f23104fbe test constraints 2013-12-03 07:51:30 +01:00
Stefan Schroeder
b52a103ae5 finalize test with open-routes 2013-12-02 17:42:51 +01:00
oblonski
cf9d3c0779 add tests verifying open-routes 2013-12-02 09:01:31 +01:00
Stefan Schroeder
2291bd23c2 add Examples and testTemplate for open-routes 2013-11-29 11:59:02 +01:00
Stefan Schroeder
4e25d894b6 modify insertion to incorporate open-routes 2013-11-27 17:22:42 +01:00
Stefan Schroeder
a85b0fc395 prepare for release v0.1.0 2013-11-22 16:54:15 +01:00
Stefan Schroeder
77d38de461 refine ServiceDeliveriesFirst constraint and add examples 2013-11-21 14:51:12 +01:00
Stefan Schroeder
a9da587f6a 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
2013-11-21 12:20:59 +01:00
Stefan Schroeder
d96efe3478 Merge branch 'PickupAndDelivery' of https://github.com/jsprit/jsprit.git
into pickupAndDelivery

Conflicts:
	jsprit-core/src/test/java/algorithms/BuildPDVRPWithShipmentsAlgoFromScratchTest.java
	jsprit-core/src/test/resources/pdp_sol.xml
2013-11-21 12:13:58 +01:00
Stefan Schroeder
d1dac2d622 Merge branch 'prepareV010' into PickupMergeRelaxAPI
Conflicts:
	jsprit-core/src/main/java/algorithms/BestInsertionBuilder.java
	jsprit-core/src/main/java/algorithms/BestInsertionConcurrent.java
2013-11-21 11:39:28 +01:00
Stefan Schroeder
97ff935abb Merge branch 'master' into prepareV010
Conflicts:
	jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionOnRouteLevel.java
	jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionWithTimeScheduling.java
	jsprit-core/src/main/java/algorithms/RuinRadial.java
2013-11-21 11:19:38 +01:00
oblonski
8f4f4b6c48 make RuinRadial more memory efficient and make NeighborhoodCreation
independent from RuinRadial
2013-11-18 22:33:10 +01:00
oblonski
9ecdde00e6 internals 2013-11-17 18:00:10 +01:00
oblonski
787ad50298 some internals 2013-11-17 17:47:59 +01:00
oblonski
42abaea24e test vrp with shipments and services 2013-11-17 17:45:04 +01:00
oblonski
a853ad5672 pd-contraints stuff and tests 2013-11-14 10:01:32 +01:00
Stefan Schroeder
a7f2131cab refine test 2013-11-12 17:42:17 +01:00
Stefan Schroeder
0cd8101e89 Merge remote-tracking branch 'choose_remote_name/relaxAPI' into relaxAPI 2013-11-12 16:23:18 +01:00
Stefan Schroeder
0586b9664c refine Gendreau 2013-11-12 16:23:05 +01:00
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
oblonski
f1fb442151 mostly renaming and some refactoring, i.e. move constraint issues to
constraintManager
2013-11-11 20:34:13 +01:00
oblonski
e912979bbb pdp 2013-11-11 07:51:46 +01:00
oblonski
d63abea764 Merge remote-tracking branch 'choose_remote_name/relaxAPI' into
PickupAndDelivery

Conflicts:
	jsprit-core/src/main/java/algorithms/CalculatorBuilder.java
	jsprit-core/src/main/java/algorithms/HardConstraints.java
	jsprit-core/src/main/java/algorithms/ServiceInsertionCalculator.java
	jsprit-core/src/main/java/basics/route/TourActivities.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-07 08:26:46 +01:00
oblonski
0936d461f5 constraints and example 2013-11-07 06:39:24 +01:00
oblonski
690bcb532a add service/shipmentInsertionCalcSwitcher, some renaming and first tests 2013-10-31 09:34:16 +01:00
oblonski
3740225058 modify io to read and write shipments, add tests to test reader/writer 2013-10-30 08:43:01 +01:00
oblonski
8283a416c1 create and test VehicleRouteBuilder to easily build routes 2013-10-25 22:18:36 +02:00
Stefan Schroeder
b991aac12e relax API 2013-10-23 18:08:35 +02:00
Stefan Schroeder
fb78d60a36 modify/extend HardActivityLevelConstraint 2013-10-23 14:06:37 +02:00
Stefan Schroeder
1e520f3269 relax api 2013-10-22 15:31:02 +02:00
Stefan Schroeder
06ab1c3247 relax api 2013-10-21 18:34:00 +02:00
oblonski
2835d15dd3 add shipment based activities, modify inserter and implement
insertionAlgo for shipments
2013-10-21 07:53:09 +02:00
Stefan Schroeder
202c22ecd2 relax api - move constraints of serviceCalc 2013-10-18 15:25:41 +02:00
oblonski
c31e61a797 test tour and implement shipment-insertion 2013-10-18 07:17:38 +02:00
oblonski
c55d67e3c2 modeling the problem 2013-10-16 21:22:46 +02:00
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
oblonski
6b8e4c8a79 modeling shipment 2013-10-16 09:24:23 +02:00
oblonski
a97a99497b Merge branch 'ImproveRouteLevelSearch'
Conflicts:
	jsprit-core/src/main/java/algorithms/MarginalsCalculus.java
	jsprit-core/src/main/java/algorithms/MarginalsCalculusTriangleInequality.java
2013-10-16 06:31:27 +02:00
oblonski
b290521e77 merge master 2013-10-15 07:04:00 +02:00
oblonski
d2b896c104 improve route level insertion 2013-10-15 06:58:15 +02:00
Stefan Schroeder
464f294593 change license from GPLv2 to LGPLv3 2013-10-14 16:41:10 +02:00
oblonski
4e99daeebf improve route-level search 2013-10-14 08:30:21 +02:00
Stefan Schroeder
b0d0736c22 Merge branch 'master' into relaxAPI
Conflicts:
	jsprit-core/src/main/java/algorithms/StateUpdates.java
	jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java
	jsprit-core/src/test/java/algorithms/GendreauPostOptTest.java
2013-10-10 15:03:58 +02:00