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

186 commits

Author SHA1 Message Date
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
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
7aa8189cab misc 2014-01-31 14:36:13 +01:00
Stefan Schroeder
78ec852f86 add test to reproduce bug #80 2014-01-31 14:35:39 +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
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
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
cb76779699 add test 2014-01-23 11:21:48 +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
7b1a2bd9b0 add javadoc and tests 2014-01-16 16:55:05 -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
oblonski
937702e136 test VehicleFleetManagers 2014-01-15 21:18:00 -05:00
oblonski
d41ad158cd adds value boundaries for vehicleType as well as vehicleTypeTests 2014-01-15 21:06:33 -05:00
oblonski
623e89fb23 add vehicle test 2014-01-15 11:35:46 -05:00
oblonski
cc93458c6a add .addPenaltyVehicle(penaltyFactor,absFixedPenalty) to assign an abs.
value for penaltyVehicle's fixed costs and test it
2014-01-14 17:58:00 -05:00
oblonski
11639fe088 add helper to easily add penalty-vehicles 2014-01-14 10:39:02 -05:00
oblonski
8272554e8e add and test .getAddedVehicleTypes() 2014-01-14 09:44:38 -05:00
oblonski
b0e2637bea add copyOf and copyConstructor to Capacity 2014-01-11 17:06:48 +01:00
oblonski
c2377252ea adding multiple capacity obj to jobs and vehicleType 2014-01-11 16:53:40 +01:00
oblonski
6647f7f649 inspect and remove warnings 2014-01-06 12:46:42 +01:00
oblonski
36a3eab299 add javadoc to Vehicle and VehicleImpl 2013-12-30 21:45:51 +01:00
oblonski
b6d97d6688 add javadoc and tests 2013-12-29 23:53:06 +01:00
oblonski
5842bd73a4 add tests to VehicleRoutingProblem 2013-12-29 23:36:57 +01:00
Stefan Schroeder
5ff6d40d63 inspect and remove warnings 2013-12-18 17:05:19 +01:00
Stefan Schroeder
aff324fb3f issue #62 2013-12-05 18:19:01 +01:00
Stefan Schroeder
3bf977784e add test for ConstraintManager 2013-12-03 15:18:21 +01:00
oblonski
4e38586b50 test ConstraintManager 2013-12-03 07:55:44 +01:00
oblonski
8f23104fbe test constraints 2013-12-03 07:51:30 +01:00
Stefan Schroeder
b52a103ae5 finalize test with open-routes 2013-12-02 17:42:51 +01:00
oblonski
cf9d3c0779 add tests verifying open-routes 2013-12-02 09:01:31 +01:00
Stefan Schroeder
2291bd23c2 add Examples and testTemplate for open-routes 2013-11-29 11:59:02 +01:00