oblonski
|
3a76dab52b
|
switch to meter
|
2017-02-20 16:20:19 +01:00 |
|
oblonski
|
424e0a582b
|
rm empty classes
|
2017-02-20 16:18:07 +01:00 |
|
oblonski
|
a4ae4549aa
|
add legacy classes and deprecate
|
2017-02-20 16:17:42 +01:00 |
|
oblonski
|
b89149e8d6
|
switch to meter
|
2017-02-20 16:16:59 +01:00 |
|
oblonski
|
f02e0dec40
|
add unassigned job feature
|
2017-02-20 15:28:13 +01:00 |
|
oblonski
|
1356387432
|
Merge branch 'master' into job-activity-refactoring
# Conflicts:
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionData.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionDataUpdater.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionFast.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SolutionCompletenessRatio.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/Service.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ConfigureFixCostCalculatorTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculatorTest.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/ServiceTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ShipmentTest.java
# jsprit-io/pom.xml
|
2017-02-17 19:53:37 +01:00 |
|
oblonski
|
c46b6f7868
|
Merge remote-tracking branch 'origin/job-activity-refactoring' into job-activity-refactoring
# Conflicts:
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/MaxDistanceConstraint.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTraveledDistanceTest.java
|
2017-02-17 19:48:49 +01:00 |
|
oblonski
|
9fe0b3315e
|
Merge branch 'master' into job-activity-refactoring
# Conflicts:
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionData.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionDataUpdater.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionFast.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SolutionCompletenessRatio.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/Service.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ConfigureFixCostCalculatorTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculatorTest.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/ServiceTest.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ShipmentTest.java
# jsprit-io/pom.xml
|
2017-02-17 19:41:47 +01:00 |
|
oblonski
|
f9e000c3ff
|
rename current dev to 1.7.1-SNAPSHOT
|
2017-02-13 12:51:27 +01:00 |
|
oblonski
|
ab8741a335
|
get rid of google guava dep
|
2017-02-07 09:53:46 +01:00 |
|
oblonski
|
6dbc35e350
|
test reason tracker - related to #180
|
2017-02-06 22:15:53 +01:00 |
|
oblonski
|
9e9436e1ab
|
doc codes - related to #180
|
2017-02-06 21:54:59 +01:00 |
|
oblonski
|
0a8061845d
|
use job id instead of job - related to #180
|
2017-02-06 21:48:47 +01:00 |
|
oblonski
|
79ac22f7f4
|
memorize reasons and translates constraint names into code and reason - related to #180
|
2017-02-06 21:31:56 +01:00 |
|
oblonski
|
8da37cf4b3
|
memorize failed constraint names - related to #180
|
2017-02-06 21:30:16 +01:00 |
|
oblonski
|
ba6dbfae45
|
add unassigned job listener - related to #180
|
2017-02-06 21:29:22 +01:00 |
|
oblonski
|
a2787ca390
|
add google guava - related to #180
|
2017-02-06 21:28:44 +01:00 |
|
oblonski
|
46c8d09385
|
Merge remote-tracking branch 'origin/master'
|
2017-01-30 20:13:13 +01:00 |
|
oblonski
|
d7b4122e10
|
account for more prio levels in scorer and obj function
|
2017-01-30 20:05:49 +01:00 |
|
oblonski
|
7d2881f4c1
|
allow more priority levels - up to 10
|
2017-01-30 20:02:34 +01:00 |
|
Stefan Schröder
|
802a20a90c
|
Update Getting-Started.md
|
2017-01-14 11:37:57 +01:00 |
|
Stefan Schröder
|
9c85f67492
|
Update Getting-Started.md
|
2017-01-14 11:37:36 +01:00 |
|
Stefan Schröder
|
0e4b8ed5d7
|
Update Getting-Started.md
|
2017-01-13 09:24:03 +01:00 |
|
Stefan Schröder
|
6d4f26c5ae
|
Update Getting-Started.md
|
2017-01-13 09:22:03 +01:00 |
|
Stefan Schröder
|
332009e3bc
|
Update Getting-Started.md
|
2017-01-13 00:31:32 +01:00 |
|
Stefan Schröder
|
bbde9f4751
|
Update CHANGELOG.md
|
2017-01-12 11:32:16 +01:00 |
|
Stefan Schröder
|
f7088b8ba2
|
v1.7
|
2017-01-12 11:28:43 +01:00 |
|
oblonski
|
142c3beff6
|
v1.7
|
2017-01-12 11:19:16 +01:00 |
|
oblonski
|
0f38d5ed78
|
align toString
|
2017-01-11 20:30:07 +01:00 |
|
oblonski
|
b4225f65f8
|
Merge remote-tracking branch 'origin/master'
|
2017-01-11 20:20:43 +01:00 |
|
oblonski
|
e624900e68
|
Merge branch 'bug-286'
|
2017-01-11 20:09:18 +01:00 |
|
oblonski
|
0becec2ce8
|
split fix cost calculation - related to #286
|
2017-01-11 20:08:31 +01:00 |
|
Stefan Schröder
|
f4a91fc067
|
Merge pull request #318 from balage1551/master
Modular objective function (SolutionCostCalculator)
|
2016-12-14 12:16:02 +01:00 |
|
Stefan Schröder
|
f027dea810
|
add he
|
2016-12-14 09:25:46 +01:00 |
|
Stefan Schröder
|
d3df091ece
|
add @balage1551
|
2016-12-14 09:23:40 +01:00 |
|
balage
|
8507242216
|
minor bugfixes and unit tests for ModularSolutionCostCalculator
|
2016-12-13 16:04:49 +01:00 |
|
balage
|
10dedf7e59
|
Commented.
|
2016-12-13 15:16:55 +01:00 |
|
balage
|
7184772b76
|
Added component management functions and changed structure for easier manipulation.
|
2016-12-09 17:14:29 +01:00 |
|
balage
|
0f708ea12d
|
rolled back job column abstraction (server uses a stricter compiler setting and build fails)
|
2016-12-09 16:21:02 +01:00 |
|
balage
|
57f38c9eaf
|
fixed unit test (and feel ashamed of not running the tests before commit)
|
2016-12-09 16:08:09 +01:00 |
|
balage
|
cba0329026
|
Weights fixed
|
2016-12-09 15:56:09 +01:00 |
|
balage
|
7efc00d944
|
Integrated to the main code (except the beforeXXX methods), added Solution printer support
|
2016-12-09 15:04:42 +01:00 |
|
balage
|
879b279a38
|
toString added to ComponentValues
|
2016-12-09 12:37:37 +01:00 |
|
balage
|
c8882a56e4
|
ModularSolutionCostCalculator added. (Basic functionality, does the same as the old one.)
|
2016-12-09 12:30:38 +01:00 |
|
balage
|
940da0e9ba
|
Same as before (forgotten files)
|
2016-12-09 10:36:06 +01:00 |
|
balage
|
91928740bb
|
Job related columns abstracted and separated (for future use in printing Unassigned jobs)
|
2016-12-09 10:35:38 +01:00 |
|
balage
|
937e2b950d
|
Correct merging.
|
2016-12-06 15:27:11 +01:00 |
|
balage
|
e6af5310fd
|
Merge branch 'job-activity-refactoring' of https://github.com/graphhopper/jsprit
|
2016-12-06 15:20:38 +01:00 |
|
balage
|
193d4ec85c
|
Merge branch 'master' of https://github.com/graphhopper/jsprit
# Conflicts:
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java
# jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/MaxDistanceConstraint.java
# jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTraveledDistanceTest.java
|
2016-12-06 15:15:22 +01:00 |
|
oblonski
|
5dcbdeeefc
|
Merge remote-tracking branch 'origin/master'
|
2016-12-05 19:31:59 +01:00 |
|