Stefan Schroeder
1cf67a1255
[maven-release-plugin] prepare for next development iteration
2013-11-22 17:07:20 +01:00
Stefan Schroeder
87599c627f
[maven-release-plugin] prepare release v0.0.5
2013-11-22 17:06:39 +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
Stefan Schroeder
61406bc70e
modify license in pom
2013-11-19 14:56:27 +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
f455b4c9f2
remove updater
2013-11-17 17:46:59 +01:00
oblonski
b3e9ce84be
move constraintManager var setting to constructor
2013-11-17 17:46:19 +01:00
oblonski
7522b5b89d
modify toString
2013-11-17 17:45:44 +01:00
oblonski
42abaea24e
test vrp with shipments and services
2013-11-17 17:45:04 +01:00
oblonski
2c0366135c
add state-updaters and constraints
2013-11-17 17:44:14 +01:00
oblonski
491d7a9738
add CalcSwitcher for pickups and deliveries
2013-11-15 07:07:43 +01:00
oblonski
a853ad5672
pd-contraints stuff and tests
2013-11-14 10:01:32 +01:00
oblonski
8010e0f2c2
add priorities to constraints
2013-11-14 10:00:43 +01:00
oblonski
6099a315ee
make plotter plot shipments
2013-11-14 10:00:17 +01:00
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
