Michal Maciejewski
|
26f2d5c1b2
|
Merge remote-tracking branch 'michalmac/master'
|
2017-10-24 22:08:53 +02:00 |
|
Michal Maciejewski
|
cea251b942
|
Shipment.toString() added
|
2017-10-24 22:08:24 +02:00 |
|
Michal Maciejewski
|
d4b22a30db
|
Shipment.toString() added
|
2017-10-24 22:01:25 +02:00 |
|
Stefan Schröder
|
fac5db530e
|
Merge pull request #382 from michalmac/master
small refinements
|
2017-10-24 15:48:33 +02:00 |
|
Michal Maciejewski
|
49c6d36945
|
EuclideanCosts.calculateDistance(Location,Location) is a one-liner now
|
2017-10-24 14:31:36 +02:00 |
|
Michal Maciejewski
|
23fbd17d6a
|
Merge remote-tracking branch 'origin/master' into michalmac_master
|
2017-10-24 14:23:23 +02:00 |
|
Michal Maciejewski
|
dc6b9aa94c
|
reverted change in jsprit-examples/.gitignore
|
2017-10-24 14:19:19 +02:00 |
|
Michal Maciejewski
|
cfd60f5eec
|
Merge remote-tracking branch 'michalmac/dvrp' into michalmac_master
|
2017-10-24 11:52:09 +02:00 |
|
oblonski
|
6166c0ea10
|
add helper methods - related to #380
|
2017-10-24 11:40:29 +02:00 |
|
oblonski
|
0dfffdd9dd
|
add helper methods - related to #380
|
2017-10-24 11:40:29 +02:00 |
|
oblonski
|
d573146e35
|
add helper methods - related to #380
|
2017-10-23 22:16:10 +02:00 |
|
oblonski
|
26a7ce5422
|
add helper methods - related to #380
|
2017-10-23 21:57:17 +02:00 |
|
Michal Maciejewski
|
ab17e93a63
|
small refinements
|
2017-10-19 20:31:01 +02:00 |
|
oblonski
|
c465cf16da
|
rm oraclejdk7 (https://github.com/travis-ci/travis-ci/issues/7884#issuecomment-308451879)
|
2017-09-29 09:25:27 +02:00 |
|
oblonski
|
5fb4fd03a9
|
new travis
|
2017-09-29 09:17:01 +02:00 |
|
oblonski
|
cb7aea9baa
|
new travis
|
2017-09-29 09:08:37 +02:00 |
|
oblonski
|
e660cf9a41
|
new travis
|
2017-09-29 09:05:27 +02:00 |
|
oblonski
|
4450c4c073
|
rm oraclejdk
|
2017-09-29 08:29:11 +02:00 |
|
oblonski
|
661aa9aa27
|
Merge branch 'master' into job-activity-refactoring
# Conflicts:
# jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ComputationalLaboratory.java
# jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/util/HtmlBenchmarkTableWriter.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithm.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AccordingToPriorities.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertion.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/AbstractJob.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/MaxDistanceConstraint.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Job.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Service.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/VehicleRoute.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeImpl.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/UnassignedJobListTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/LocationTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblemTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTraveledDistanceTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/legacy/LegacyDeliveryTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/legacy/LegacyPickupTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/legacy/LegacyServiceTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/legacy/LegacyShipmentTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImplTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeImplTest.java
# jsprit-io/src/main/java/com/graphhopper/jsprit/io/problem/VrpXMLWriter.java
# jsprit-io/src/test/java/com/graphhopper/jsprit/io/problem/VrpXMLWriterTest.java
|
2017-09-29 08:15:38 +02:00 |
|
Stefan Schröder
|
0712e4599c
|
Merge pull request #366 from jie31best/feature/tp-costs-get-dist
make VehicleRoutingTransportCosts implement TransportDistance
|
2017-09-28 20:59:52 +02:00 |
|
Stefan Schröder
|
dec11f646a
|
Merge pull request #371 from albertjimenez/master
Modified signature for returning the file instance
|
2017-08-11 09:46:36 +02:00 |
|
Beruto
|
6e13ce07f0
|
Modified signature for returning the file instance (Heroku read-only needs this)
|
2017-08-09 22:07:24 +02:00 |
|
He Huang
|
75e9b6f9dd
|
make VehicleRoutingTransportCosts implement TransportDistance
|
2017-08-03 18:04:45 +08:00 |
|
Stefan Schröder
|
d95b1d2f14
|
Merge pull request #361 from jsroyal/patch-1
One more get disconnected.
|
2017-07-11 15:49:22 +02:00 |
|
Stefan Schröder
|
949f230e32
|
Merge pull request #362 from jie31best/bugfix/duplicate-break-id
disallow duplicate break id
|
2017-07-11 15:48:32 +02:00 |
|
He Huang
|
fd476d6aff
|
disallow duplicate break id
|
2017-07-11 14:34:33 +08:00 |
|
Jitendra Singh
|
77fe628c00
|
One more get disconnected.
|
2017-07-10 19:53:52 +05:30 |
|
oblonski
|
118240ea88
|
further tests of max-time-in-vehicle feature
|
2017-07-06 09:53:20 +02:00 |
|
oblonski
|
db0c39e1c2
|
refine max-time-in-vehicle constraint
|
2017-07-05 10:41:23 +02:00 |
|
oblonski
|
b5998e1d93
|
Merge branch 'master' into max-time-feature
# Conflicts:
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Service.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/PickupTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ServiceTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ShipmentTest.java
|
2017-07-05 10:40:18 +02:00 |
|
oblonski
|
0dd74b5bf9
|
get rid of file writing/reading
|
2017-06-30 11:35:15 +02:00 |
|
oblonski
|
d8f7af7fb5
|
add helper
|
2017-06-30 10:44:39 +02:00 |
|
oblonski
|
dfc8068eef
|
rm file
|
2017-06-30 10:43:34 +02:00 |
|
oblonski
|
c1a936a1e2
|
Merge remote-tracking branch 'origin/master'
|
2017-06-30 08:54:58 +02:00 |
|
Stefan Schröder
|
4ce3a86168
|
Merge pull request #360 from HeinrichFilter/vrpxmlwrite-update
Add VrpXMLWriter method that returns OutputStream
|
2017-06-30 08:53:49 +02:00 |
|
oblonski
|
1ef29a268c
|
sort jobs acc to priorities
|
2017-06-30 08:47:55 +02:00 |
|
oblonski
|
5fa1cea6af
|
Merge branch 'master' into prio-improvement
|
2017-06-29 12:34:20 +02:00 |
|
oblonski
|
ecea356c54
|
improve unassigned reason tracker
|
2017-06-29 12:31:54 +02:00 |
|
oblonski
|
f647884184
|
make getMostLikely a static method
|
2017-06-29 09:58:38 +02:00 |
|
oblonski
|
49c8ade5c4
|
continuous delivery of snapshots
|
2017-06-28 23:30:14 +02:00 |
|
oblonski
|
f54241144c
|
prio improvement
|
2017-06-28 23:19:15 +02:00 |
|
Heinrich Filter
|
bab1f7d6a8
|
Add VrpXMLWrite method that returns OutputStream
Add test to check that two outputs are the same
|
2017-06-28 01:00:07 +02:00 |
|
Heinrich Filter
|
bf40087b22
|
Consolidate skills assertions for vehicles into one test
|
2017-06-28 00:59:19 +02:00 |
|
Heinrich Filter
|
4f09365267
|
Consolidate skills assertions for shipments into one test
|
2017-06-28 00:59:18 +02:00 |
|
Heinrich Filter
|
b5b4b67400
|
Extract method to create common builder for 2 Vechicle type and impls
|
2017-06-28 00:59:17 +02:00 |
|
Heinrich Filter
|
06afdb6e15
|
Combine test for writing and then reading finite Vrp
|
2017-06-28 00:59:17 +02:00 |
|
Heinrich Filter
|
69aee1660a
|
Make static Assert accessors uniform
|
2017-06-28 00:59:16 +02:00 |
|
Heinrich Filter
|
6d0f0c38b3
|
Extract method to write and re-read the XML
Also combine skill check tests into one with multiple assertions
|
2017-06-28 00:59:15 +02:00 |
|
Heinrich Filter
|
dc52d9b2d8
|
Add createTwoVehicleTypeAndInstancesBuilder method
|
2017-06-28 00:59:08 +02:00 |
|
Stefan Schröder
|
c47dae32d3
|
Merge pull request #355 from balage1541/master
#354 - Initial solution with new jobs added
|
2017-06-14 14:51:15 +02:00 |
|