Stefan Schroeder
|
7a5f1052df
|
Merge branch 'PickupAndDelivery' of https://github.com/jsprit/jsprit.git into pickupAndDelivery
|
2013-11-13 11:18:58 +01:00 |
|
oblonski
|
71a3cbe9a8
|
fix defaultState
|
2013-11-13 06:13:52 +01:00 |
|
oblonski
|
c528b6d430
|
add lilim instances plus lilim-instance-reader
|
2013-11-13 06:13:26 +01:00 |
|
Stefan Schroeder
|
a7f2131cab
|
refine test
|
2013-11-12 17:42:17 +01:00 |
|
Stefan Schroeder
|
96ed6a70cd
|
Merge BestInsertionBuilder and BestInsertionConcurrent from
PickupAndDelivery-Branch into RelaxAPI-Branch
|
2013-11-12 17:15:28 +01:00 |
|
Stefan Schroeder
|
463d87b30b
|
clean redundant files
|
2013-11-12 16:28:36 +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
|
91e49681e1
|
add concurrent best insertion, remove bestinsertionbuilder
|
2013-11-11 22:19:49 +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 |
|
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 |
|
Stefan Schroeder
|
2ea579d6f6
|
improve Benchmarker - adds new constructor with algoFactory
|
2013-11-07 16:45:42 +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
|
db888e5c1e
|
add example 'ConfigureAlgorithInCodeInsteadOfPerXml' - issue #52
|
2013-11-03 04:26:59 +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 |
|
oblonski
|
401afad447
|
make Plotter plot shipments optionally
|
2013-10-25 22:16:05 +02:00 |
|
Stefan Schroeder
|
730426ecca
|
Merge branch 'master' into relaxAPI
|
2013-10-23 18:16:56 +02:00 |
|
Stefan Schroeder
|
84df5bf5b6
|
relax api
|
2013-10-23 18:13:46 +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
|
b1bb3d9e26
|
Merge branch 'master' of https://github.com/jsprit/jsprit.git
|
2013-10-21 08:13:20 +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 |
|