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
|
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
|
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
|
db14ea481c
|
modified access/egress calc to reflect open routes
|
2014-02-10 18:18:44 +01:00 |
|
oblonski
|
330fa937a0
|
added soft constraints to shipment calc
|
2014-02-10 17:44:36 +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 |
|
oblonski
|
86c168e428
|
added soft constraints
|
2014-02-10 09:02:50 +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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
Stefan Schroeder
|
03cbbcae78
|
add javadoc
|
2014-01-23 14:32:08 +01:00 |
|
Stefan Schroeder
|
eb0126c7cc
|
add tests
|
2014-01-23 12:31:59 +01:00 |
|
Stefan Schroeder
|
0b038c6cfc
|
Merge branch 'master' into routes-with-specified-start-and-end
Conflicts:
jsprit-core/src/main/resources/vrp_xml_schema.xsd
jsprit-core/src/test/java/jsprit/core/problem/io/VrpReaderV2Test.java
|
2014-01-23 12:22:13 +01:00 |
|
Stefan Schroeder
|
d50ce05a76
|
bugfix issue #79
|
2014-01-23 12:13:57 +01:00 |
|
Stefan Schroeder
|
8f749c9fdf
|
bugfix issue #78
|
2014-01-23 12:07:19 +01:00 |
|
Stefan Schroeder
|
9e685ef128
|
Merge branch 'master' into routes-with-specified-start-and-end
|
2014-01-23 11:24:06 +01:00 |
|
Stefan Schroeder
|
cef0453c90
|
bugfix issue #77
|
2014-01-23 11:23:27 +01:00 |
|
Stefan Schroeder
|
cb76779699
|
add test
|
2014-01-23 11:21:48 +01:00 |
|
Stefan Schroeder
|
e332cf3c17
|
Merge branch 'master' into routes-with-specified-start-and-end
|
2014-01-23 11:15:23 +01:00 |
|
Stefan Schroeder
|
aacece58c5
|
does not allow reader to set null coord
|
2014-01-23 11:13:03 +01:00 |
|
Stefan Schroeder
|
5b556c461c
|
Merge branch 'master' into routes-with-specified-start-and-end
|
2014-01-23 11:10:43 +01:00 |
|
Stefan Schroeder
|
153899748b
|
does not allow VrpReader to set null coord
|
2014-01-23 11:10:06 +01:00 |
|
Stefan Schroeder
|
292867954c
|
add writerTests
|
2014-01-23 11:07:03 +01:00 |
|
Stefan Schroeder
|
63060f3b35
|
modify problem reader/writer to deal vehicles that can start AND end at
specified locations
|
2014-01-22 17:02:31 +01:00 |
|
Stefan Schroeder
|
6575b6d48e
|
add and test endLocationMethods to Vehicle and VehicleImpl
Breaks code if Vehicle is implemented by another class than VehicleImpl
|
2014-01-20 18:05:07 +01:00 |
|
oblonski
|
5976197167
|
add javadoc and tests
|
2014-01-16 19:28:40 -05:00 |
|
oblonski
|
6b4656afff
|
add javadocs and tests
|
2014-01-16 17:07:38 -05:00 |
|
oblonski
|
ca0caf450c
|
add boundaries
|
2014-01-16 16:55:26 -05:00 |
|
oblonski
|
7b1a2bd9b0
|
add javadoc and tests
|
2014-01-16 16:55:05 -05:00 |
|
oblonski
|
88b15fd448
|
add javadoc
|
2014-01-16 15:38:59 -05:00 |
|
oblonski
|
4ad5e5670c
|
mod test
|
2014-01-16 15:17:35 -05:00 |
|
oblonski
|
2993202d49
|
Merge branch 'master' into multiple-cap-constraints
Conflicts:
jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleType.java
jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeImpl.java
jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleImplTest.java
jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleTypeImplTest.java
|
2014-01-16 15:15:16 -05:00 |
|
oblonski
|
3f0be7a566
|
add factory test
|
2014-01-16 15:06:56 -05:00 |
|
oblonski
|
0eeb792ea4
|
test VehicleFleetManagers
|
2014-01-15 21:19:08 -05:00 |
|