1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
Commit graph

2032 commits

Author SHA1 Message Date
kandelirina
8b75937ca8 InsertBreaksToNewRoutes (#42)
* InsertBreaksToNewRoutes

* fixes
2018-03-25 09:53:52 +03:00
kobyb
e94a76fd1c
Merge pull request #43 from bringg/less_logs
less logs
2018-03-18 12:04:59 +02:00
kobyb
3ff52b3555 less logs 2018-03-18 11:50:25 +02:00
kobyb
fd5664bf70
Merge pull request #38 from bringg/MaxTimeInVehicleConstarint-added-to-Unassigned-jobs-tracker
MaxTimeInVehicleConstarint added to Unassigned jobs tracker
2018-03-14 08:32:50 +02:00
kobyb
0c5ae5dd7e Merge branch 'MaxTimeInVehicleConstarint-added-to-Unassigned-jobs-tracker' of github.com:bringg/jsprit into MaxTimeInVehicleConstarint-added-to-Unassigned-jobs-tracker 2018-03-14 08:31:59 +02:00
Kandel Irina
957fb54b37 MaxTimeInVehicleConstarint added to Unassigned jobs tracker 2018-03-14 08:31:28 +02:00
kobyb
1fa6ffda50
Merge pull request #41 from bringg/remove-logs
remove logs
2018-03-14 08:25:32 +02:00
Kandel Irina
426ec89b82 remove logs 2018-03-13 16:04:22 +02:00
kandelirina
4da11a6c80 Pass executor service (#39)
* pass executor service

* fixes

* fix back
2018-03-13 13:50:18 +02:00
Kandel Irina
ba08cbab35 MaxTimeInVehicleConstarint added to Unassigned jobs tracker 2018-03-13 11:31:57 +02:00
irisshainsky
ac14f2850c
Merge pull request #37 from bringg/pass_all_vehicles
Pass all vehicles
2018-03-13 08:58:01 +02:00
Kandel Irina
7018115c17 Merge branch 'master' into pass_all_vehicles 2018-03-12 16:44:29 +02:00
Kandel Irina
e1e002131e ?! 2018-03-12 09:17:38 +02:00
Kandel Irina
dc8adca385 fixes 2018-03-12 08:35:04 +02:00
kobyb
4398bb6311
Addprohibitedtasksupport (#36)
* add prohibited task option

* add to builder

* add to constructor

* array to set

* cr

* remove unsused import
2018-03-11 16:41:27 +02:00
Kandel Irina
aaef511b75 pass vehicle types 2018-03-11 16:21:39 +02:00
Iris
b8894c3276 final changes 2018-03-08 10:49:19 +02:00
Iris
4e8ed3a9c0 max time in vehicle fix 2018-03-06 16:20:30 +02:00
Iris
afead68243 Update max time in vehicle use vehicle index 2018-03-06 13:40:35 +02:00
Iris
614b8b5e01 state manager use vehicle index 2018-03-06 12:03:21 +02:00
kobyb
dd5b326e52 Merge branch 'master' of https://github.com/graphhopper/jsprit 2018-03-05 16:58:51 +02:00
oblonski
994b97b48b
fixed issue #411 2018-02-23 09:56:11 +01:00
kobyb
3c568835e9
Merge pull request #33 from bringg/protected-variation-coefficient
protected variation coefficient
2018-02-14 17:38:17 +02:00
Kandel Irina
36c7925ffa protected variation coefficient 2018-02-14 10:41:03 +02:00
kobyb
77e7b89d49
Merge pull request #30 from bringg/remove-unrelated-breaks-from-unassigned-jobs
remove unrelated breaks from unassigned jobs
2018-02-11 10:45:25 +02:00
Kandel Irina
82a1a1117d remove unrelated breaks from unassigned jobs 2018-02-08 14:15:20 +02:00
kobyb
92afffcf1e
Merge pull request #29 from bringg/pass-prev-activity
pass prev activity
2018-02-04 14:00:38 +02:00
Kandel Irina
af7d13fc0b remove changes 2018-02-04 11:55:54 +02:00
kobyb
501588d417 CR 2018-02-04 11:53:33 +02:00
Kandel Irina
efbf3c0362 tests added 2018-02-04 10:27:21 +02:00
Kandel Irina
e64e4d2041 fixes 2018-02-04 09:06:34 +02:00
Kandel Irina
f129829f93 min added 2018-02-02 08:25:34 +02:00
Kandel Irina
b47547afdb test full flow 2018-02-01 19:21:04 +02:00
Kandel Irina
5635cd572b fix 2018-02-01 18:50:41 +02:00
Kandel Irina
b530a7c85d pass prev activity 2018-02-01 18:03:59 +02:00
kobyb
5f9b9e1929
Merge pull request #26 from bringg/add-vehicle-fixed-cost-to-new-routes
add vehicle fixed cost to new routes
2018-01-31 10:03:28 +02:00
Kandel Irina
ec13abcf4b add vehicle fixed cost to new routes 2018-01-31 08:13:26 +02:00
kobyb
8d4de24ff7
Merge pull request #24 from bringg/remove-fixed-cost-back
Remove fixed cost back
2018-01-29 13:11:05 +02:00
Kandel Irina
e1e231ce92 remove fixed cost back 2018-01-29 12:36:05 +02:00
Kandel Irina
a77517d4f5 Merge branch 'master' into pass-constraintmanager-as-parameter 2018-01-29 12:27:49 +02:00
kobyb
5f84caecca
Merge pull request #23 from bringg/pass-constraintmanager-as-parameter
pass constraintmanager as parameter
2018-01-29 10:12:39 +02:00
kandelirina
af625fcc47
Merge pull request #22 from bringg/add-fixed-cost-to-insertion-cost
test added
2018-01-29 09:24:27 +02:00
Kandel Irina
c0debb2a4b pass constraintmanager as parameter 2018-01-28 17:41:01 +02:00
Kandel Irina
e38deb8cad test added 2018-01-25 11:18:23 +02:00
kobyb
d4df1723ca
Merge pull request #21 from bringg/add-fixed-cost-to-insertion-cost
add fixed cost to insertion cost
2018-01-25 10:55:07 +02:00
Kandel Irina
25c123bc61 add fixed cost to insertion cost 2018-01-25 10:13:57 +02:00
kobyb
6750969700
Merge pull request #16 from bringg/merge_gh1
Merge gh1
2018-01-21 10:12:48 +02:00
kobyb
21a1d43834 Bug fix 2018-01-16 13:34:31 +02:00
kobyb
92524d53b3 Merge remote-tracking branch 'graphhopper/master' into merge_from_gh_master
# Conflicts:
#
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/Up
dateMaxTimeInVehicle.java
2018-01-16 11:53:33 +02:00
kobyb
01e4139a6b
Merge pull request #9 from bringg/log_added_to_count_of_vehicles_by_vehicle_types
log_added_to_count_of_vehicles_by_vehicle_types
2018-01-09 10:05:58 +02:00