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 |
|
oblonski
|
4e99daeebf
|
improve route-level search
|
2013-10-14 08:30:21 +02:00 |
|
Stefan Schroeder
|
e355614a4f
|
relax api
|
2013-10-11 14:14:07 +02:00 |
|
Stefan Schroeder
|
2c26e0041f
|
relax api
|
2013-10-10 17:47: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 |
|
Stefan Schroeder
|
fe0e0f54b0
|
modify solutionCostCalculation internally
|
2013-10-10 14:56:28 +02:00 |
|
Stefan Schroeder
|
0e35f3914b
|
Merge branch 'master' into relaxAPI
Conflicts:
jsprit-core/src/main/java/algorithms/CreateInitialSolution.java
jsprit-core/src/main/java/algorithms/RuinAndRecreateModule.java
jsprit-core/src/main/java/algorithms/StateManager.java
jsprit-core/src/main/java/algorithms/StateTypes.java
jsprit-core/src/main/java/algorithms/StateUpdates.java
jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java
jsprit-core/src/test/java/algorithms/BuildCVRPAlgoFromScratchTest.java
jsprit-core/src/test/java/algorithms/BuildPDVRPAlgoFromScratchTest.java
|
2013-10-10 14:43:28 +02:00 |
|
Stefan Schroeder
|
b37064ec17
|
introduce SolutionCostCalculator
|
2013-10-10 13:59:22 +02:00 |
|
Stefan Schroeder
|
2ac272ba79
|
mod solutionCalcCosts
|
2013-10-09 15:53:32 +02:00 |
|
Stefan Schroeder
|
5530bc648a
|
relax API
|
2013-10-09 15:32:25 +02:00 |
|
Stefan Schroeder
|
0730c465dc
|
relax api
|
2013-10-09 15:17:55 +02:00 |
|
Stefan Schroeder
|
fb365036af
|
internals
|
2013-10-09 14:12:47 +02:00 |
|
Stefan Schroeder
|
e68df7a874
|
Merge branch 'master' into relaxAPI
|
2013-10-08 17:04:15 +02:00 |
|
Stefan Schroeder
|
05b883c034
|
handle empty routes - i.e. no activity has to be visit
|
2013-10-08 17:01:06 +02:00 |
|
Stefan Schroeder
|
289b7a0f77
|
relax API
|
2013-10-08 15:34:33 +02:00 |
|
Stefan Schroeder
|
a51abf6302
|
relax api
|
2013-10-07 16:21:09 +02:00 |
|
Stefan Schroeder
|
cba6a759e0
|
Merge branch 'master' into relaxAPI
|
2013-10-07 15:52:11 +02:00 |
|
Stefan Schroeder
|
781bacb2d1
|
Merge branch 'master' into relaxAPI
|
2013-10-07 15:49:35 +02:00 |
|
oblonski
|
a32d8c1c6a
|
Switch to Activity- and RouteVisitor
|
2013-10-07 11:02:39 +02:00 |
|
Stefan Schroeder
|
08bb31c4f5
|
relax API
|
2013-10-02 15:37:37 +02:00 |
|
Stefan Schroeder
|
8c8f041933
|
add javadoc to RuinRadial
|
2013-09-27 10:57:02 +02:00 |
|
Stefan Schroeder
|
7fd1f90164
|
remove unnecessary exception in costUpdater
|
2013-09-10 10:49:28 +02:00 |
|
Stefan Schroeder
|
6cacfcddb1
|
remove unnecessary exception in costUpdater
|
2013-09-10 10:48:44 +02:00 |
|
Stefan Schroeder
|
6664fa03a4
|
internal fix: no need to update empty route
|
2013-09-09 17:21:54 +02:00 |
|
Stefan Schroeder
|
f1bb6c7bd0
|
Merge remote-tracking branch 'choose_remote_name/vrpWithBackhauls'
Conflicts:
jsprit-core/src/main/java/algorithms/CalculatesServiceInsertion.java
|
2013-09-02 19:01:32 +02:00 |
|
Stefan Schroeder
|
98d0de0711
|
add header
|
2013-09-02 18:29:30 +02:00 |
|
Stefan Schroeder
|
c7bbc1995f
|
refine buildFromScratchTest
|
2013-09-02 18:06:28 +02:00 |
|
Stefan Schroeder
|
4a3e0cc6a1
|
add test resource
|
2013-09-02 18:05:42 +02:00 |
|
Stefan Schroeder
|
26219aa3a1
|
modify classes such than they can cope with pickup and deliveries
|
2013-09-02 17:21:51 +02:00 |
|
Stefan Schroeder
|
0806d524e6
|
add problemConstraints
|
2013-09-02 17:21:09 +02:00 |
|
Stefan Schroeder
|
4b8876b1c6
|
add precondition to service: capacity-demand must be greater than or
equal to zero
|
2013-09-02 17:20:49 +02:00 |
|
Stefan Schroeder
|
0a2a0a64ff
|
improve updates/updaters at act- and routeLevel
|
2013-08-30 16:19:59 +02:00 |
|
Stefan Schroeder
|
b46c410d15
|
bugfix in CalculatesServiceInsertion
|
2013-08-30 11:01:04 +02:00 |
|
Stefan Schroeder
|
6cf67f7ba0
|
refinements to incorporate pickup and deliveries
|
2013-08-30 10:52:31 +02:00 |
|
Stefan Schroeder
|
07ecdc2f28
|
fix bug in CalculatesServiceInsertion
|
2013-08-30 10:51:50 +02:00 |
|