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
534 commits 15 branches 24 tags 19 MiB
Commit graph

207 commits

Author SHA1 Message Date
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
Stefan Schroeder
c31949f538 some internals 2013-11-07 16:47:27 +01:00
Stefan Schroeder
59f0f63e19 change para-name in constructor to specify time 2013-11-07 16:47:14 +01:00
Stefan Schroeder
96d7b6f9c3 premature loop break 2013-11-07 16:46:46 +01:00
Stefan Schroeder
87d23e8529 change visibility of GendreauStrat 2013-11-07 16:46:19 +01:00
oblonski
dfe25738bf refine contraint 2013-11-07 08:27:38 +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
Stefan Schroeder
05005d5a04 add deprecating doc to Solutions 2013-11-06 16:11:01 +01:00
Stefan Schroeder
ce4c3acc39 remove interface InsertionStrategyBuilder 2013-11-06 16:10:43 +01:00
Stefan Schroeder
1b1dea71e9 change visibility to public 2013-11-06 16:10:15 +01:00
oblonski
d9b5d8ee96 experimental timeScheduler 2013-11-02 07:47:03 +01:00
oblonski
917e4a732a bugfix: issue #51 2013-11-02 07:46:38 +01:00
Stefan Schroeder
695d7f3a07 clean actCosts 2013-10-31 14:31:53 +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
d06f6ddc4b work at io 2013-10-29 09:30:02 +01:00
oblonski
36e67f6ae6 modify reader to read shipments 2013-10-27 21:42:18 +01:00
oblonski
8283a416c1 create and test VehicleRouteBuilder to easily build routes 2013-10-25 22:18:36 +02:00
Stefan Schroeder
730426ecca Merge branch 'master' into relaxAPI 2013-10-23 18:16:56 +02:00
Stefan Schroeder
b641a3b22d Merge branch 'master' into relaxAPI 2013-10-23 18:12:30 +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
oblonski
5bd72e2bd9 start modifying plotter and problemReader to deal with shipments 2013-10-23 08:08:56 +02:00
oblonski
e6f2276eb0 add vehicleRouteBuilder to easily build routes 2013-10-23 08:08:24 +02:00
Stefan Schroeder
f37e599973 relax api 2013-10-22 17:01:41 +02:00
Stefan Schroeder
708354460c relax api 2013-10-22 17:00:37 +02:00
Stefan Schroeder
82bbd83598 relax api 2013-10-22 15:42:37 +02:00
Stefan Schroeder
1e520f3269 relax api 2013-10-22 15:31:02 +02:00
Stefan Schroeder
ee94ac2e21 Hide NeighborhoodTInitialiser in package (!Breaks API!) 2013-10-21 18:35:04 +02:00
Stefan Schroeder
06ab1c3247 relax api 2013-10-21 18:34:00 +02:00
oblonski
4dc51c7a42 bugfix: old activityCosts are evaluated with newVehicle -> set it to 
oldVehicle instead
 2013-10-21 08:11:27 +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
6eddbbbef7 Merge branch 'master' into PickupAndDelivery 2013-10-18 05:30:52 +02:00
oblonski
e9a3f98671 clean TourActivities - remove redundant code 2013-10-18 05:26:34 +02:00
oblonski
72d2e43d00 shipment insertion calculation 2013-10-18 05:21:37 +02:00
Stefan Schroeder
5437d384db relax api 2013-10-17 16:05:20 +02:00
oblonski
d321507645 define distances between shipments and services 2013-10-17 07:07:47 +02:00
oblonski
7d56aed4c5 modeling pickups and deliveries 2013-10-17 06:21:09 +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