362 commits

Author	SHA1	Message	Date
Stefan Schroeder	56067dc590	Merge branch 'multiple-capacities'	2014-03-06 19:55:43 +01:00
oblonski	d74831b38c	renamed generic methods	2014-03-04 11:49:03 +01:00
oblonski	0e42ac31b8	adjusted algorithm.recreate.JobInsertionConsideringFixCostsCalculator to ... deal with multiple capacities	2014-03-03 20:12:27 +01:00
oblonski	09486fadec	tested and modified according to multiple capacities	2014-03-02 15:14:45 +01:00
oblonski	217c824506	adjusted load updater to cope with multiple capacity dimensions	2014-03-01 17:59:18 +01:00
oblonski	f6bf46ca9a	tested and redesigned StateManager and UpdateLoads	2014-03-01 12:17:00 +01:00
oblonski	19172f5084	tested	2014-02-25 22:10:58 +01:00
oblonski	286617f827	added javadoc	2014-02-25 20:15:34 +01:00
oblonski	97819de9f2	added javadoc	2014-02-25 08:12:40 +01:00
oblonski	6f533d8f20	refined StateManager to deal with generic states	2014-02-23 22:02:29 +01:00
oblonski	3101ea253a	added misc	2014-02-21 16:25:35 +01:00
oblonski	d14da72f64	added toString	2014-02-21 16:25:12 +01:00
oblonski	08a51c6a76	added tests	2014-02-20 08:19:51 +01:00
oblonski	ed9db39fa0	renamed job.getCapacity() in job.getSize()	2014-02-20 06:49:27 +01:00
oblonski	237075c463	added multiple cap-dims to activity and corresponding tests	2014-02-19 17:18:46 +01:00
oblonski	21e4bb09f5	added non-negative restriction	2014-02-19 09:08:15 +01:00
oblonski	bcfe9a401d	modified and tested start and end to deal with multiple cap-dims	2014-02-19 08:40:47 +01:00
oblonski	b6a235bf92	added tests	2014-02-18 17:06:54 +01:00
oblonski	1423c90407	added method to invert capacity	2014-02-18 09:49:54 +01:00
oblonski	1b3af07e45	modified activities to deal with multiple cap-dims	2014-02-18 09:49:24 +01:00
oblonski	fe4b4ae4ca	modified Pickup and Delivery to deal with multiple cap-dims	2014-02-17 22:34:23 +01:00
oblonski	7ca1665dfb	modified builder to build multiple cap-dims	2014-02-17 17:55:49 +01:00
oblonski	6e6deef577	tested multiple cap-dims for VrpXMLReader	2014-02-17 15:22:22 +01:00
oblonski	4d46d433d2	formatted	2014-02-15 13:25:57 +01:00
oblonski	ad8c168835	added log of resetting nuOfIterations	2014-02-15 13:25:28 +01:00
oblonski	1645641ab6	added tests	2014-02-15 13:19:29 +01:00
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	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	7cff3c58ec	add SolutionPrinter to core	2014-01-31 14:36:01 +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	03cbbcae78	add javadoc	2014-01-23 14:32:08 +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