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

1113 commits

Author SHA1 Message Date
oblonski
8da2d1e1c5 added multiple caps 2014-02-14 15:40:46 +01:00
oblonski
cec4e4235e io of multiple cap constraints 2014-02-13 16:36:21 +01:00
oblonski
a6726537e9 Merge branch 'master' into multiple-cap-constraints
Conflicts:
	jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleImplTest.java
2014-02-13 14:43:00 +01:00
oblonski
f3037aaed7 Merge branch 'access-egress-costs-merged-with-routes-with-spec-start-end' 2014-02-11 14:54:59 +01:00
oblonski
ea5fc1a3de added helper methods to deal with adding and subtracting of capacities
and multiple dimensions, and their corresponding tests
2014-02-11 07:53:01 +01:00
oblonski
9f1580927c Merge branch 'master' into multiple-cap-constraints 2014-02-11 05:40:37 +01:00
oblonski
6dbcd7431a Merge branch 'routes-with-specified-start-and-end' into
access-egress-costs-merged-with-routes-with-spec-start-end

Conflicts:
	jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java
	jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExampleWithPenaltyVehicles.java
	jsprit-examples/src/main/java/jsprit/examples/SolomonExample.java
	jsprit-examples/src/main/java/jsprit/examples/SolomonOpenExample.java
2014-02-11 05:39:06 +01:00
oblonski
5d80a4caf0 added another example 2014-02-10 21:39:45 +01:00
oblonski
db14ea481c modified access/egress calc to reflect open routes 2014-02-10 18:18:44 +01:00
oblonski
97fa2a7639 some mod 2014-02-10 18:01:23 +01:00
oblonski
330fa937a0 added soft constraints to shipment calc 2014-02-10 17:44:36 +01:00
oblonski
941e4ae29b added example 2014-02-10 16:28:02 +01:00
oblonski
dc24411802 added egress/access calc 2014-02-10 16:23:42 +01:00
oblonski
9a471a58be added soft constraints and tests 2014-02-10 10:22:02 +01:00
jsprit
a2552ba116 Update README.md 2014-02-10 10:19:24 +01:00
oblonski
86c168e428 added soft constraints 2014-02-10 09:02:50 +01:00
jsprit
50bbdcb525 Update README.md 2014-02-05 12:18:43 +01:00
oblonski
bb98df01f1 replace code for creating output folder with
Examples.createOutputFolder()
2014-02-04 21:58:30 +01:00
oblonski
ef2723d801 Merge branch 'master' into multiple-cap-constraints
Conflicts:
	jsprit-core/src/main/java/jsprit/core/problem/job/Job.java
	jsprit-core/src/main/java/jsprit/core/problem/job/Service.java
	jsprit-core/src/main/java/jsprit/core/problem/job/Shipment.java
	jsprit-core/src/test/java/jsprit/core/problem/job/ServiceTest.java
2014-02-04 21:47:15 +01:00
jsprit
3a160f85fe Update CHANGELOG.md 2014-01-31 14:57:05 +01:00
jsprit
8680c7ecaf update according v1.1.1 2014-01-31 14:55:49 +01:00
jsprit
ff1ad900bf Update CHANGELOG.md 2014-01-31 14:54:55 +01:00
Stefan Schroeder
24ec47ac45 [maven-release-plugin] prepare for next development iteration 2014-01-31 14:48:29 +01:00
Stefan Schroeder
fa8faa2cf7 [maven-release-plugin] prepare release v1.1.1 2014-01-31 14:46:35 +01:00
Stefan Schroeder
7aa8189cab misc 2014-01-31 14:36:13 +01:00
Stefan Schroeder
7cff3c58ec add SolutionPrinter to core 2014-01-31 14:36:01 +01:00
Stefan Schroeder
78ec852f86 add test to reproduce bug #80 2014-01-31 14:35:39 +01:00
Stefan Schroeder
0e0c83be25 bugfix issue #80 2014-01-31 14:34:53 +01:00
Stefan Schroeder
a34d9ab2c6 add examples 2014-01-29 19:10:32 +01:00
Stefan Schroeder
974021cf1b shift to start/endLocationId and start/endLocationCoordinate 2014-01-29 19:09:44 +01:00
Stefan Schroeder
a234bb54c9 shift from vehicle.getLocation() to vehicle.getStartLocation() and
vehicle.getCoord() to vehicle.getStartLocationCoordinate()
2014-01-28 17:40:13 +01:00
Stefan Schroeder
e5dabbdf64 mod 2014-01-28 14:45:11 +01:00
Stefan Schroeder
e51b0c96a8 add tests for VehicleRoute due to adding diff start- and end-locations
deprecate VehicleRoute.newInstance(...) and remove resulting warnings
2014-01-28 14:34:07 +01:00
jsprit
00f6580f9d Update CHANGELOG.md 2014-01-27 20:16:44 +01:00
Stefan Schroeder
6552632a70 modify to remove warnings 2014-01-27 17:57:35 +01:00
Stefan Schroeder
8c18d07447 modify VehicleRoute to deal with different vehicle start and end
locations
2014-01-27 17:52:04 +01:00
Stefan Schroeder
0fb602dc99 Merge branch 'master' into routes-with-specified-start-and-end 2014-01-27 17:30:46 +01:00
jsprit
7453fafc65 Update CHANGELOG.md 2014-01-27 16:13:21 +01:00
jsprit
28063feee4 Update CHANGELOG.md 2014-01-27 16:10:02 +01:00
jsprit
22c8b00e2f Update CHANGELOG.md 2014-01-27 15:56:29 +01:00
jsprit
abfc1880db Update CHANGELOG.md 2014-01-27 15:55:20 +01:00
jsprit
4d845a8417 Update CHANGELOG.md 2014-01-27 15:54:57 +01:00
jsprit
93ae652e6c Update CHANGELOG.md 2014-01-27 15:54:07 +01:00
Stefan Schroeder
57dc8b5220 [maven-release-plugin] prepare for next development iteration 2014-01-27 14:56:39 +01:00
Stefan Schroeder
c13a5a9c1a [maven-release-plugin] prepare release v1.1.0 2014-01-27 14:55:28 +01:00
Stefan Schroeder
ae264dd22f Merge branch 'master' of https://github.com/jsprit/jsprit.git 2014-01-27 13:21:34 +01:00
Stefan Schroeder
16171c0154 mod readme and changelog 2014-01-27 13:20:52 +01:00
Stefan Schroeder
8c8d798cc1 [maven-release-plugin] rollback the release of v1.1.0 2014-01-27 13:13:23 +01:00
Stefan Schroeder
fd907b05cb [maven-release-plugin] prepare release v1.1.0 2014-01-27 13:08:15 +01:00
jsprit
ab88c1bca2 Update CHANGELOG.md 2014-01-27 11:55:59 +01:00