diff --git a/README.md b/README.md index e9fe029..6f79e44 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,86 @@ -Garbage collection in montevideo +VRP Garbage Collection ============================================ -# A little Code Cleanup +The Capacitated, Multitrip with Time Windows Vehicle Routing Problem of Garbage Collection -The project started to be a bit of everything. -But there is a lot o unsued code. +Deposit: Starting and Ending sites from where a vehicle departs. +Containers: Object used to hold garbage. +Dump: Sites where the garbage is delivered. +Vehicle: Garbage collector. -First clean up Garbage collection code, And post the clean up in the public repository. -(Specially for the FOSS4G) +A vehicle's route: -Then a cmake. +Deposit -> Containers -> Dump -> [Containers -> Dump] -> Deposit +Restrictions: +* Vehicle: + * Time window: + * Driver shift start. + * Driver's shift end. + * One dimensional ``Capacity``. + * Capacity can be vary between vehicles. + * Goes to the ``Dump`` when reached the maximum capacity except the last trip. + * Even when a better route can be found with `not full` vehicle. + * Vehicles are empty at the ``Deposit`` and after departure of the ``Dump`` + * Has to return to the original ``Deposit`` + * Can not make `U turns` + * If a Driver has time -# Original comments: +Deposit: + * Has a (lat , lon) location. + * opens at 0 + * closes at infinity + * As a Starting Site + * can have a service time (currently is fixed to 0) + * As an Ending Site + * can have a service time (currently is fixed to 0) + +Dump: + * Has a (lat , lon) location. + * opens at 0 + * closes at infinity + * Has a service time. + +Container: + * Has a (lat , lon) location. + * Has an opening time + * Has an closing time + * Has a Capacity + * The units must match the vehicles Capacity units. + +Others: + * Visit Dump inmediately after Deposit is forbidden + * Visit Deposit inmediately after a Container is forbidden + +Implied restrictions: + * City topoogy + + +From the point of view of the driver: +Deposit and dump: + - Opens at Driver's shift time start. + - Closes at Driver's shift time end. + +Data from Montevideo City is used for this development. -## C++ Classes for solving various vehicle routing problems - * baseClasses - Classes shared betwen the various problems - * trash-collection - solve a trash collection problem. This has multiple depots with a single vehicle at each, they go to various containers and collect the trash and unloads at a dump before returning to its home depot. There is support for multiple dump sites, vehicle capacity and time windows. - * vrpdptw - A single depot multiple vehicle pick and delivery problem with time windows. - * more to come ... -# THIS IS A WORK IN PROGRESS # Dependencies -We current this have dependencies in our development environment for +Currently: + + * glog - For logging + * OSRM - Local shared server installed for coverage area. + + +# TODO - * libgd2 - used for generating plots of the routes - * libcurl - used via curlpp to access OSRM engine - * curlpp - a C++ wrapper around libcurl to talk to OSRM engine https://code.google.com/p/curlpp/ - * OSRM - we have a local server installed for our coverage area. This is used for comput drive times and routes https://github.com/Project-OSRM/osrm-backend +- Update To be used with OSRM v5 + - When the project started OSRM 0.3.3 was used. +- Clean Code + - Many trial & error were kept in the code. +- Update code to C++14 +- Documentation diff --git a/TODO.md b/TODO.md deleted file mode 100644 index 3986ba1..0000000 --- a/TODO.md +++ /dev/null @@ -1,64 +0,0 @@ -# TODO List - -This is just a running to do list based on planning discussions. Items -here are just based on current thinking and may change in the future or get -dropped off the list. - -Please post new items at the top of the list. - - -## 2014-11-11 - -1) integration of OSRM - - * we have various different levels of dealing with travel time - a) Euclidean time (compute distance and convert to time) - b) TraveTime matrix (uses Euclidean time for missing cells) - c) Osrm time for full paths (but not used for optimization) - d) Full osrm integration into Tweval (used with optimization) - - * probably should make this a compile time option - - * For d) style integration it needs to happen in TWC, Twnode, - and propagate up through Twpath and Vehicle - -The obvious issue with using Osrm is the hit to performance. The work I have done indicates that we can reduce the performance hit per request from 500 ms per http request down to around 11 ms using a shared memory connection. While this is impressive, we are already experiencing 2 hour run times on the larger problems so adding any additional time may not be acceptable. So integration should be based on compile time options to configure the code. - -### Comment/Question - -Currently we cache the travel time from the previous node on each node. When we implemented Osrm ttime we need to compute the route from the start to the current node. We current do this be caching all the previous nodes in the form of a URL string the gets appended to for each node in the path. - -The new code need to x,y or lon,lat for all the previous nodes in the path (the equivalent of the url). We can store this as a container of nodes preceding this node or a pointer to the previous node, which would allow us to iterate through the previous and assemble as needed. - -2) Other task list items - - * source tree reorg for cmake - - * cmake with options and dependency checking - - boost packages and versions - - osrm source and version - - libcurl and curlpp - - postgresql version and tools - - * code cleanup - - see postgresql - - eliminate unused code - - * postgresql integration and testing - - need to remove all output or redirect to log file - - need to convert all assert() into error checks - - need to define and implement an handling - - * osrm tools - - extract and prep data - - start and stop server - - documentation - - * validate input and return issues - - * documentation - - installation - - user commands - - code - - diff --git a/doc/BaseClasses.md b/doc/BaseClasses.md deleted file mode 100644 index 332e60f..0000000 --- a/doc/BaseClasses.md +++ /dev/null @@ -1,57 +0,0 @@ -# Base Classes - Vehicle Routing Problems - -overview of base clases - -## Node - -* overview of class -* class members -* class methods - - -## Twnode : Node - -* overview of class -* class members -* class methods - - -## Tweval : Twnode - -* overview of class -* class members -* class methods - - -## Twpath - -* overview of class -* class members -* class methods - - -## Plot - -* overview of class -* class members -* class methods - - -## Singleton - -* overview of class -* class members -* class methods - - -## MD5 - -* overview of class -* class members -* class methods - - - ---- - -[Up](./README.md) diff --git a/doc/PickDeliver/MixedInsertions1-Visual.gif b/doc/PickDeliver/MixedInsertions1-Visual.gif deleted file mode 100644 index 055e238..0000000 Binary files a/doc/PickDeliver/MixedInsertions1-Visual.gif and /dev/null differ diff --git a/doc/PickDeliver/MixedInsertions1-Visual.graphml b/doc/PickDeliver/MixedInsertions1-Visual.graphml deleted file mode 100644 index 38470f0..0000000 --- a/doc/PickDeliver/MixedInsertions1-Visual.graphml +++ /dev/null @@ -1,1036 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P3 - - - - - - - - - - - - - - - - - D3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P3 - - - - - - - - - - - - - - - - - D3 - - - - - - - - - - - - - - - - - P4 - - - - - - - - - - - - - - - - - D4 - - - - - - - - - - - - - - - - - Start - - - - - - - - - - - - - - - - PUSH_BACK(O1) - - - - - - - - - - - - - - - - FIFO(O1,O2) - - - - - - - - - - - - - - - - PUSHBACK(O2,O3) - - - - - - - - - - - - - - - - LIFO(O3,O4) - - - - - - - - - - - - - - - - end - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PRECONDITIONS - - - - - - - - - - - - - - - - FIFO(O1,O2) - - - - - - - - - - - - - - - - PUSHBACK(O1,O3) - - - - - - - - - - - - - - - - PUSHBACK(O2,O3) - - - - - - - - - - - - - - - - none - - - - - - - - - - - - - - - - LIFO(O3,O4) - - - - - - - - - - - - - - - - PUSHBACK(O2,O4) - - - - - - - - - - - - - - - - PUSHBACK(O1,O4) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/MixedInsertions1.graphml b/doc/PickDeliver/MixedInsertions1.graphml deleted file mode 100644 index a647e57..0000000 --- a/doc/PickDeliver/MixedInsertions1.graphml +++ /dev/null @@ -1,1022 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P3 - - - - - - - - - - - - - - - - - D3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P3 - - - - - - - - - - - - - - - - - D3 - - - - - - - - - - - - - - - - - P4 - - - - - - - - - - - - - - - - - D4 - - - - - - - - - - - - - - - - - - Start - - - - - - - - - - - - - - - - - PUSH_BACK(O1) - - - - - - - - - - - - - - - - - PICKS_FIRST(O1,O2) - - - - - - - - - - - - - - - - - DIRECT_PUSHBACK(O2,O3) - - - - - - - - - - - - - - - - - SECOND_IN_MIDDLE(O3,O4) - - - - - - - - - - - - - - - - - end - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/MixedInsertions2.graphml b/doc/PickDeliver/MixedInsertions2.graphml deleted file mode 100644 index 2bfa73d..0000000 --- a/doc/PickDeliver/MixedInsertions2.graphml +++ /dev/null @@ -1,943 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - P3 - - - - - - - - - - - - - - - - - D3 - - - - - - - - - - - - - - - - - - SECOND_IN_MIDDLE(O3,O4) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P3 - - - - - - - - - - - - - - - - - D3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P4 - - - - - - - - - - - - - - - - - D4 - - - - - - - - - - - - - - - - - P3 - - - - - - - - - - - - - - - - - D3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P4 - - - - - - - - - - - - - - - - - D4 - - - - - - - - - - - - - - - - - - SECOND_IN_MIDDLE(O3,O4) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/PreconditionsOfRoute.gif b/doc/PickDeliver/PreconditionsOfRoute.gif deleted file mode 100644 index a6ab2b0..0000000 Binary files a/doc/PickDeliver/PreconditionsOfRoute.gif and /dev/null differ diff --git a/doc/PickDeliver/PreconditionsOfRoute.graphml b/doc/PickDeliver/PreconditionsOfRoute.graphml deleted file mode 100644 index 989b338..0000000 --- a/doc/PickDeliver/PreconditionsOfRoute.graphml +++ /dev/null @@ -1,1296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - - - - 3 - - - - - - - - - - - - - - - - - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - - - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LIFO(O1,O2) - - - - - - - - - - - - - - - - FIFO(O1,O3) - - - - - - - - - - - - - - - - PUSHBACK(O2,O3) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - - - - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FIFO(O1,O4) - - - - - - - - - - - - - - - - PUSHBACK(O2,O4) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - - - - - - - - - - - - - - - - - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LIFO(O3,O4) - - - - - - - - - - - - - - - - PRECONDITIONS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/images/CompatOrder-1-2-visual.gif b/doc/PickDeliver/images/CompatOrder-1-2-visual.gif deleted file mode 100644 index 9b5d312..0000000 Binary files a/doc/PickDeliver/images/CompatOrder-1-2-visual.gif and /dev/null differ diff --git a/doc/PickDeliver/images/CompatOrder-1-2-visual.graphml b/doc/PickDeliver/images/CompatOrder-1-2-visual.graphml deleted file mode 100644 index 0c5e18c..0000000 --- a/doc/PickDeliver/images/CompatOrder-1-2-visual.graphml +++ /dev/null @@ -1,912 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - Visual representation INSERTIONS between Orders - - - - - - - - - - - - - - - - PRECONDITIONS - - - - - - - - - - - - - - - - PUSH_BACK(O1,O2) - - - - - - - - - - - - - - - - FIFO(O1,O2) - - - - - - - - - - - - - - - - LIFO(O1,O2) - - - - - - - - - - - - - - - - TYPE OF INSERTION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - O2 IS COMPATIBLE WITH 01 -= 02 CAN BE PLACED AFTER 01 -COMPATIBLE-IJ(O1,O2) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/images/FIFOinsertions-Visual.gif b/doc/PickDeliver/images/FIFOinsertions-Visual.gif deleted file mode 100644 index db62bb4..0000000 Binary files a/doc/PickDeliver/images/FIFOinsertions-Visual.gif and /dev/null differ diff --git a/doc/PickDeliver/images/FIFOinsertions-Visual.graphml b/doc/PickDeliver/images/FIFOinsertions-Visual.graphml deleted file mode 100644 index 7901fbc..0000000 --- a/doc/PickDeliver/images/FIFOinsertions-Visual.graphml +++ /dev/null @@ -1,691 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - PRECONDITIONS - - - - - - - - - - - - - - - - Ok is FIFO compatible with 01 up to On - - - - - - - - - - - - - - - - FIFO(On,Ok) - - - - - - - - - - - - - - - - Depot - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dn - - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pn - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/images/FIFOinsertions.gif b/doc/PickDeliver/images/FIFOinsertions.gif deleted file mode 100644 index 09e644a..0000000 Binary files a/doc/PickDeliver/images/FIFOinsertions.gif and /dev/null differ diff --git a/doc/PickDeliver/images/FIFOinsertions.graphml b/doc/PickDeliver/images/FIFOinsertions.graphml deleted file mode 100644 index 285aba5..0000000 --- a/doc/PickDeliver/images/FIFOinsertions.graphml +++ /dev/null @@ -1,554 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - PRECONDITIONS - - - - - - - - - - - - - - - - Ok is FIFO compatible with 01 up to On - - - - - - - - - - - - - - - - FIFO(On,Ok) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dn - - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pn - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/images/FullCompatBtwnOrders-1-2.gif b/doc/PickDeliver/images/FullCompatBtwnOrders-1-2.gif deleted file mode 100644 index 5ee507a..0000000 Binary files a/doc/PickDeliver/images/FullCompatBtwnOrders-1-2.gif and /dev/null differ diff --git a/doc/PickDeliver/images/FullCompatBtwnOrders-1-2.graphml b/doc/PickDeliver/images/FullCompatBtwnOrders-1-2.graphml deleted file mode 100644 index 2fc3751..0000000 --- a/doc/PickDeliver/images/FullCompatBtwnOrders-1-2.graphml +++ /dev/null @@ -1,1319 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - Depot - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - Depot - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - Depot - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - Depot - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - Depot - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - Depot - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - O2 IS FULLY COMPATIBLE WITH 01 -= 02 CAN BE PLACED AFTER 01 AND 01 CAN BE PLACED AFTER 02 -FULL-COMPATIBLE-IJ(O1,O2) AND FULL-COMPATIBLE-IJ(O2,O1) - - - - - - - - - - - - - - - - PRECONDITIONS - - - - - - - - - - - - - - - - PUSH_BACK(O1,O2) - - - - - - - - - - - - - - - - FIFO(O1,O2) - - - - - - - - - - - - - - - - LIFO(O1,O2) - - - - - - - - - - - - - - - - TYPE OF INSERTION - - - - - - - - - - - - - - - - PUSH_BACK(O2,O1) - - - - - - - - - - - - - - - - FIFO(O2,O1) - - - - - - - - - - - - - - - - LIFO(O2,O1) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/images/LIFOinsertions-Visual.gif b/doc/PickDeliver/images/LIFOinsertions-Visual.gif deleted file mode 100644 index 72d4151..0000000 Binary files a/doc/PickDeliver/images/LIFOinsertions-Visual.gif and /dev/null differ diff --git a/doc/PickDeliver/images/LIFOinsertions-Visual.graphml b/doc/PickDeliver/images/LIFOinsertions-Visual.graphml deleted file mode 100644 index cc8d678..0000000 --- a/doc/PickDeliver/images/LIFOinsertions-Visual.graphml +++ /dev/null @@ -1,554 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dn - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - LIFO(On,Ok) - - - - - - - - - - - - - - - - PRECONDITIONS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ok is LIFO compatible with 01 up to On - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/images/LIFOinsertions.gif b/doc/PickDeliver/images/LIFOinsertions.gif deleted file mode 100644 index c786afc..0000000 Binary files a/doc/PickDeliver/images/LIFOinsertions.gif and /dev/null differ diff --git a/doc/PickDeliver/images/LIFOinsertions.graphml b/doc/PickDeliver/images/LIFOinsertions.graphml deleted file mode 100644 index 12b103c..0000000 --- a/doc/PickDeliver/images/LIFOinsertions.graphml +++ /dev/null @@ -1,712 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Depot - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dn - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - LIFO(On,Ok) - - - - - - - - - - - - - - - - PRECONDITIONS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ok is LIFO compatible with 01 up to On - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/images/PushBackInsertions-Visual.gif b/doc/PickDeliver/images/PushBackInsertions-Visual.gif deleted file mode 100644 index 82db47d..0000000 Binary files a/doc/PickDeliver/images/PushBackInsertions-Visual.gif and /dev/null differ diff --git a/doc/PickDeliver/images/PushBackInsertions-Visual.graphml b/doc/PickDeliver/images/PushBackInsertions-Visual.graphml deleted file mode 100644 index dd64ab9..0000000 --- a/doc/PickDeliver/images/PushBackInsertions-Visual.graphml +++ /dev/null @@ -1,554 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dn - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - PRECONDITIONS - - - - - - - - - - - - - - - - Ok IS PUSH_BACK compatible WITH 01 up to On - - - - - - - - - - - - - - - - PUSH_BACK(On,Ok) - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/images/PushBackInsertions.gif b/doc/PickDeliver/images/PushBackInsertions.gif deleted file mode 100644 index 7fbcf83..0000000 Binary files a/doc/PickDeliver/images/PushBackInsertions.gif and /dev/null differ diff --git a/doc/PickDeliver/images/PushBackInsertions.graphml b/doc/PickDeliver/images/PushBackInsertions.graphml deleted file mode 100644 index 619fa0b..0000000 --- a/doc/PickDeliver/images/PushBackInsertions.graphml +++ /dev/null @@ -1,714 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Depot - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dn - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - PRECONDITIONS - - - - - - - - - - - - - - - - Ok is PUSH_BACK Compatible with 01 up to On - - - - - - - - - - - - - - - - PUSH_BACK(On,Ok) - - - - - - - - - - - - - - - - Pi - - - - - - - - - - - - - - - - - Di - - - - - - - - - - - - - - - - - Pk - - - - - - - - - - - - - - - - - Dk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickDeliver/images/compatOrder-1-2.gif b/doc/PickDeliver/images/compatOrder-1-2.gif deleted file mode 100644 index 97324bd..0000000 Binary files a/doc/PickDeliver/images/compatOrder-1-2.gif and /dev/null differ diff --git a/doc/PickDeliver/images/compatOrder-1-2.graphml b/doc/PickDeliver/images/compatOrder-1-2.graphml deleted file mode 100644 index fa2e38b..0000000 --- a/doc/PickDeliver/images/compatOrder-1-2.graphml +++ /dev/null @@ -1,1023 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - P1 - - - - - - - - - - - - - - - - - D1 - - - - - - - - - - - - - - - - - P2 - - - - - - - - - - - - - - - - - D2 - - - - - - - - - - - - - - - - - PUSH_BACK(O1,O2) - - - - - - - - - - - - - - - - FIFO(O1,O2) - - - - - - - - - - - - - - - - LIFO(O1,O2) - - - - - - - - - - - - - - - - PRECONDITIONS - - - - - - - - - - - - - - - - O2 IS COMPATIBLE WITH 01 -= 02 CAN BE LACED AFTER 01 -COMPATIBLE-IJ(O1,O2) - - - - - - - - - - - - - - - - TYPE OF INSERTION - - - - - - - - - - - - - - - - Resulting Route INSERTIONS between Orders - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/PickupAndDelivery.md b/doc/PickupAndDelivery.md deleted file mode 100644 index 7114b23..0000000 --- a/doc/PickupAndDelivery.md +++ /dev/null @@ -1,44 +0,0 @@ -# Pickup and Delivery with Time Windows - VRPDPTW - -* description of the problem -* links to articles - -## Dpnode Class - -* overview of class -* class members -* class methods - -## Order Class - -* overview of class -* class members -* class methods - -## Prob_pd Class - -* overview of class -* class members -* class methods - -## Init_pd Class - -* overview of class -* class members -* class methods - -## Vehicle Class - -* overview of class -* class members -* class methods - -## Solver Class - -* overview of class -* class members -* class methods - ---- - -[Up](./README.md) diff --git a/doc/README.md b/doc/developers/README.md similarity index 100% rename from doc/README.md rename to doc/developers/README.md diff --git a/doc/TrashCollection.md b/doc/developers/TrashCollection.md similarity index 90% rename from doc/TrashCollection.md rename to doc/developers/TrashCollection.md index 5a302a0..a5db39d 100644 --- a/doc/TrashCollection.md +++ b/doc/developers/TrashCollection.md @@ -117,35 +117,5 @@ The sql output would looke like: * TBD -## Trashnode Class - -This is an extension of the Tweval base class and adds members for tracking the -the nearest two depots and the nearest dump site. It also has an explicit -``ntype`` member to identify if it is a pickup noe, and dump node or a depot -node. - -* class members -* class methods - - -## Vehicle Class - -* overview of class -* class members -* class methods - -## TrashProblem Class - -* overview of class -* class members -* class methods - -## Solver Class - -* overview of class -* class members -* class methods - ---- [Up](./README.md) diff --git a/doc/images/2-opt-exchange.png b/doc/developers/images/2-opt-exchange.png similarity index 100% rename from doc/images/2-opt-exchange.png rename to doc/developers/images/2-opt-exchange.png diff --git a/doc/images/2-opt-star-exchange.png b/doc/developers/images/2-opt-star-exchange.png similarity index 100% rename from doc/images/2-opt-star-exchange.png rename to doc/developers/images/2-opt-star-exchange.png diff --git a/doc/images/cross-exchange-opt.png b/doc/developers/images/cross-exchange-opt.png similarity index 100% rename from doc/images/cross-exchange-opt.png rename to doc/developers/images/cross-exchange-opt.png diff --git a/doc/images/cyclic-transfer-opt.png b/doc/developers/images/cyclic-transfer-opt.png similarity index 100% rename from doc/images/cyclic-transfer-opt.png rename to doc/developers/images/cyclic-transfer-opt.png diff --git a/doc/images/exchange-opt.png b/doc/developers/images/exchange-opt.png similarity index 100% rename from doc/images/exchange-opt.png rename to doc/developers/images/exchange-opt.png diff --git a/doc/images/geni-exchange-opt.png b/doc/developers/images/geni-exchange-opt.png similarity index 100% rename from doc/images/geni-exchange-opt.png rename to doc/developers/images/geni-exchange-opt.png diff --git a/doc/images/or-opt-exchange.png b/doc/developers/images/or-opt-exchange.png similarity index 100% rename from doc/images/or-opt-exchange.png rename to doc/developers/images/or-opt-exchange.png diff --git a/doc/images/relocate-opt.png b/doc/developers/images/relocate-opt.png similarity index 100% rename from doc/images/relocate-opt.png rename to doc/developers/images/relocate-opt.png diff --git a/doc/images/savings-heuristic.png b/doc/developers/images/savings-heuristic.png similarity index 100% rename from doc/images/savings-heuristic.png rename to doc/developers/images/savings-heuristic.png diff --git a/doc/optimization-moves.md b/doc/developers/optimization-moves.md similarity index 94% rename from doc/optimization-moves.md rename to doc/developers/optimization-moves.md index 5bdc7aa..abba626 100644 --- a/doc/optimization-moves.md +++ b/doc/developers/optimization-moves.md @@ -40,11 +40,11 @@ at most k 2-opt moves. For a proof, see [28]. [8] Christofides, N., Eilon, S.: Algorithms for large-scale traveling salesman problems. Oper. Res. Quart. 23, 511.518 (1972) -[26] Mak, K.T., Morton, A.J.: Distances between traveling salesman tours. -Discret. Appl. Math. 58, 281.291 (1995) -[28] Mendivil, D., Shonkwiler, R., Spruill, M.C.: An analysis of random +[26] (http://www.sciencedirect.com/science/article/pii/0166218X93E0115F "Mak, K.T., Morton, A.J.: Distances between traveling salesman tours. +Discret. Appl. Math. 58, 281.291 (1995)" +[28] (http://people.math.gatech.edu/~shenk/Research/Optimization/RR+II.pdf "Mendivil, D., Shonkwiler, R., Spruill, M.C.: An analysis of random restart and iterated improvement for global optimization with an application -to the traveling salesman problem. J. Optim. Theory Appl. 124(4), 407.433 (2005) +to the traveling salesman problem. J. Optim. Theory Appl. 124(4), 407.433 (2005)") ## Various Move Operations diff --git a/src/trash-prob/trashWithMovingDumps/README.md b/src/README.md similarity index 100% rename from src/trash-prob/trashWithMovingDumps/README.md rename to src/README.md diff --git a/src/trash-prob/baseTrash/basevehicle.cpp b/src/baseTrash/basevehicle.cpp similarity index 100% rename from src/trash-prob/baseTrash/basevehicle.cpp rename to src/baseTrash/basevehicle.cpp diff --git a/src/trash-prob/baseTrash/basevehicle.h b/src/baseTrash/basevehicle.h similarity index 100% rename from src/trash-prob/baseTrash/basevehicle.h rename to src/baseTrash/basevehicle.h diff --git a/src/trash-prob/baseTrash/extendedvehicle.cpp b/src/baseTrash/extendedvehicle.cpp similarity index 100% rename from src/trash-prob/baseTrash/extendedvehicle.cpp rename to src/baseTrash/extendedvehicle.cpp diff --git a/src/trash-prob/baseTrash/extendedvehicle.h b/src/baseTrash/extendedvehicle.h similarity index 100% rename from src/trash-prob/baseTrash/extendedvehicle.h rename to src/baseTrash/extendedvehicle.h diff --git a/src/trash-prob/baseTrash/forPostgres/trashprob.cpp b/src/baseTrash/forPostgres/trashprob.cpp similarity index 100% rename from src/trash-prob/baseTrash/forPostgres/trashprob.cpp rename to src/baseTrash/forPostgres/trashprob.cpp diff --git a/src/trash-prob/baseTrash/forPostgres/trashprob.h b/src/baseTrash/forPostgres/trashprob.h similarity index 100% rename from src/trash-prob/baseTrash/forPostgres/trashprob.h rename to src/baseTrash/forPostgres/trashprob.h diff --git a/src/trash-prob/baseTrash/prob_trash.cpp b/src/baseTrash/prob_trash.cpp similarity index 100% rename from src/trash-prob/baseTrash/prob_trash.cpp rename to src/baseTrash/prob_trash.cpp diff --git a/src/trash-prob/baseTrash/prob_trash.h b/src/baseTrash/prob_trash.h similarity index 100% rename from src/trash-prob/baseTrash/prob_trash.h rename to src/baseTrash/prob_trash.h diff --git a/src/trash-prob/baseTrash/solution.cpp b/src/baseTrash/solution.cpp similarity index 100% rename from src/trash-prob/baseTrash/solution.cpp rename to src/baseTrash/solution.cpp diff --git a/src/trash-prob/baseTrash/solution.h b/src/baseTrash/solution.h similarity index 100% rename from src/trash-prob/baseTrash/solution.h rename to src/baseTrash/solution.h diff --git a/src/trash-prob/baseTrash/trashconfig.cpp b/src/baseTrash/trashconfig.cpp similarity index 100% rename from src/trash-prob/baseTrash/trashconfig.cpp rename to src/baseTrash/trashconfig.cpp diff --git a/src/trash-prob/baseTrash/trashconfig.h b/src/baseTrash/trashconfig.h similarity index 100% rename from src/trash-prob/baseTrash/trashconfig.h rename to src/baseTrash/trashconfig.h diff --git a/src/trash-prob/baseTrash/trashnode.h b/src/baseTrash/trashnode.h similarity index 100% rename from src/trash-prob/baseTrash/trashnode.h rename to src/baseTrash/trashnode.h diff --git a/src/trash-prob/initTrash/basicOperations.cpp b/src/initTrash/basicOperations.cpp similarity index 100% rename from src/trash-prob/initTrash/basicOperations.cpp rename to src/initTrash/basicOperations.cpp diff --git a/src/trash-prob/initTrash/basicOperations.h b/src/initTrash/basicOperations.h similarity index 100% rename from src/trash-prob/initTrash/basicOperations.h rename to src/initTrash/basicOperations.h diff --git a/src/trash-prob/initTrash/givenInitialSol.cpp b/src/initTrash/givenInitialSol.cpp similarity index 100% rename from src/trash-prob/initTrash/givenInitialSol.cpp rename to src/initTrash/givenInitialSol.cpp diff --git a/src/trash-prob/initTrash/givenInitialSol.h b/src/initTrash/givenInitialSol.h similarity index 100% rename from src/trash-prob/initTrash/givenInitialSol.h rename to src/initTrash/givenInitialSol.h diff --git a/src/trash-prob/initTrash/truckManyVisitsDump.cpp b/src/initTrash/truckManyVisitsDump.cpp similarity index 100% rename from src/trash-prob/initTrash/truckManyVisitsDump.cpp rename to src/initTrash/truckManyVisitsDump.cpp diff --git a/src/trash-prob/initTrash/truckManyVisitsDump.h b/src/initTrash/truckManyVisitsDump.h similarity index 100% rename from src/trash-prob/initTrash/truckManyVisitsDump.h rename to src/initTrash/truckManyVisitsDump.h diff --git a/src/trash-prob/trashWithMovingDumps/integration/Makefile b/src/integration/Makefile similarity index 98% rename from src/trash-prob/trashWithMovingDumps/integration/Makefile rename to src/integration/Makefile index d6c4f47..13bf7a9 100644 --- a/src/trash-prob/trashWithMovingDumps/integration/Makefile +++ b/src/integration/Makefile @@ -15,9 +15,9 @@ BASECLASSES = baseClasses INITTRASH = initTrash SOLVERTRASH = solverTrash -BASECLASSES_DIR = ../../../$(BASECLASSES) -BASETRASH_DIR=../../$(BASETRASH) -INITTRASH_DIR=../../$(INITTRASH) +BASECLASSES_DIR = ../$(BASECLASSES) +BASETRASH_DIR=../$(BASETRASH) +INITTRASH_DIR=../$(INITTRASH) SOLVERTRASH_DIR=../$(SOLVERTRASH) BUILD_DIR = ./build @@ -269,7 +269,7 @@ build/baseTrash/%.o: $(BASETRASH_DIR)/%.cpp $(BASETRASH_DIR)/%.h $(BASECLASSES_ $(CPP) $(CPPFLAGS) $(INCLUDES) -c $< -o $@ -build/initTrash/%.o: $(INITTRASH_DIR)/%.cpp ../../$(INITTRASH)/%.h $(BASECLASSES_HEADS) $(BASETRASH_HEADS) $(INITTRASH_HEADS) +build/initTrash/%.o: $(INITTRASH_DIR)/%.cpp $(INITTRASH_DIR)/%.h $(BASECLASSES_HEADS) $(BASETRASH_HEADS) $(INITTRASH_HEADS) $(CPP) $(CPPFLAGS) $(INCLUDES) -c $< -o $@ build/solverTrash/%.o: $(SOLVERTRASH_DIR)/%.cpp $(SOLVERTRASH_DIR)/%.h $(BASECLASSES_HEADS) $(BASETRASH_HEADS) $(SOLVERTRASH_HEADS) diff --git a/src/trash-prob/trashWithMovingDumps/integration/Makefile.library b/src/integration/Makefile.library similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/Makefile.library rename to src/integration/Makefile.library diff --git a/src/trash-prob/trashWithMovingDumps/integration/README.md b/src/integration/README.md similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/README.md rename to src/integration/README.md diff --git a/src/trash-prob/trashWithMovingDumps/integration/README.vrptools b/src/integration/README.vrptools similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/README.vrptools rename to src/integration/README.vrptools diff --git a/src/trash-prob/trashWithMovingDumps/integration/make-compile b/src/integration/make-compile similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/make-compile rename to src/integration/make-compile diff --git a/src/trash-prob/trashWithMovingDumps/integration/make-library b/src/integration/make-library similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/make-library rename to src/integration/make-library diff --git a/src/trash-prob/trashWithMovingDumps/integration/make-passed-tests b/src/integration/make-passed-tests similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/make-passed-tests rename to src/integration/make-passed-tests diff --git a/src/trash-prob/trashWithMovingDumps/integration/make-test b/src/integration/make-test similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/make-test rename to src/integration/make-test diff --git a/src/trash-prob/trashWithMovingDumps/integration/minilog.h b/src/integration/minilog.h similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/minilog.h rename to src/integration/minilog.h diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/CMakeLists.txt b/src/integration/shared/CMakeLists.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/CMakeLists.txt rename to src/integration/shared/CMakeLists.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/cmake/FindGlog.cmake b/src/integration/shared/cmake/FindGlog.cmake similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/cmake/FindGlog.cmake rename to src/integration/shared/cmake/FindGlog.cmake diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/cmake/Findrapidjson.cmake b/src/integration/shared/cmake/Findrapidjson.cmake similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/cmake/Findrapidjson.cmake rename to src/integration/shared/cmake/Findrapidjson.cmake diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/loadfromfiles.cpp b/src/integration/shared/loadfromfiles.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/loadfromfiles.cpp rename to src/integration/shared/loadfromfiles.cpp diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/loadfromfiles.h b/src/integration/shared/loadfromfiles.h similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/loadfromfiles.h rename to src/integration/shared/loadfromfiles.h diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/others/nearest.hpp b/src/integration/shared/others/nearest.hpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/others/nearest.hpp rename to src/integration/shared/others/nearest.hpp diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/CMakeLists.txt b/src/integration/shared/tests/CMakeLists.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/CMakeLists.txt rename to src/integration/shared/tests/CMakeLists.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/a_du_rm_cl_01.dmatrix-time.txt b/src/integration/shared/tests/InputFiles/a_du_rm_cl_01.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/a_du_rm_cl_01.dmatrix-time.txt rename to src/integration/shared/tests/InputFiles/a_du_rm_cl_01.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/a_du_rm_cl_01.otherlocs.txt b/src/integration/shared/tests/InputFiles/a_du_rm_cl_01.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/a_du_rm_cl_01.otherlocs.txt rename to src/integration/shared/tests/InputFiles/a_du_rm_cl_01.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/a_du_rm_cl_01.vehicles.txt b/src/integration/shared/tests/InputFiles/a_du_rm_cl_01.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/a_du_rm_cl_01.vehicles.txt rename to src/integration/shared/tests/InputFiles/a_du_rm_cl_01.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/a_du_rm_cl_08.containers.txt b/src/integration/shared/tests/InputFiles/a_du_rm_cl_08.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/a_du_rm_cl_08.containers.txt rename to src/integration/shared/tests/InputFiles/a_du_rm_cl_08.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/rivera.containers.txt b/src/integration/shared/tests/InputFiles/rivera.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/rivera.containers.txt rename to src/integration/shared/tests/InputFiles/rivera.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/rivera.dmatrix-time.txt b/src/integration/shared/tests/InputFiles/rivera.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/rivera.dmatrix-time.txt rename to src/integration/shared/tests/InputFiles/rivera.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/rivera.otherlocs.txt b/src/integration/shared/tests/InputFiles/rivera.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/rivera.otherlocs.txt rename to src/integration/shared/tests/InputFiles/rivera.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/rivera.vehicles.txt b/src/integration/shared/tests/InputFiles/rivera.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/rivera.vehicles.txt rename to src/integration/shared/tests/InputFiles/rivera.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/riverasoca.containers.txt b/src/integration/shared/tests/InputFiles/riverasoca.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/riverasoca.containers.txt rename to src/integration/shared/tests/InputFiles/riverasoca.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/riverasoca.dmatrix-time.txt b/src/integration/shared/tests/InputFiles/riverasoca.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/riverasoca.dmatrix-time.txt rename to src/integration/shared/tests/InputFiles/riverasoca.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/riverasoca.dmatrix-time.txt.original b/src/integration/shared/tests/InputFiles/riverasoca.dmatrix-time.txt.original similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/riverasoca.dmatrix-time.txt.original rename to src/integration/shared/tests/InputFiles/riverasoca.dmatrix-time.txt.original diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/riverasoca.otherlocs.txt b/src/integration/shared/tests/InputFiles/riverasoca.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/riverasoca.otherlocs.txt rename to src/integration/shared/tests/InputFiles/riverasoca.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/riverasoca.vehicles.txt b/src/integration/shared/tests/InputFiles/riverasoca.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/InputFiles/riverasoca.vehicles.txt rename to src/integration/shared/tests/InputFiles/riverasoca.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/nodes/rivera.txt b/src/integration/shared/tests/nodes/rivera.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/nodes/rivera.txt rename to src/integration/shared/tests/nodes/rivera.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/results/.rivera.txt.kate-swp b/src/integration/shared/tests/results/.rivera.txt.kate-swp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/results/.rivera.txt.kate-swp rename to src/integration/shared/tests/results/.rivera.txt.kate-swp diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/results/rivera.txt b/src/integration/shared/tests/results/rivera.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/results/rivera.txt rename to src/integration/shared/tests/results/rivera.txt diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/test001.cpp b/src/integration/shared/tests/test001.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/test001.cpp rename to src/integration/shared/tests/test001.cpp diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/test002.cpp b/src/integration/shared/tests/test002.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/test002.cpp rename to src/integration/shared/tests/test002.cpp diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/testphantomnode.cpp b/src/integration/shared/tests/testphantomnode.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/testphantomnode.cpp rename to src/integration/shared/tests/testphantomnode.cpp diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/tests/testpoint.cpp b/src/integration/shared/tests/testpoint.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/tests/testpoint.cpp rename to src/integration/shared/tests/testpoint.cpp diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/vrptools.cpp b/src/integration/shared/vrptools.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/vrptools.cpp rename to src/integration/shared/vrptools.cpp diff --git a/src/trash-prob/trashWithMovingDumps/integration/shared/vrptools.h b/src/integration/shared/vrptools.h similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/shared/vrptools.h rename to src/integration/shared/vrptools.h diff --git a/src/trash-prob/trashWithMovingDumps/integration/test.sql b/src/integration/test.sql similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/test.sql rename to src/integration/test.sql diff --git a/src/trash-prob/trashWithMovingDumps/integration/trash.cpp b/src/integration/trash.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/trash.cpp rename to src/integration/trash.cpp diff --git a/src/trash-prob/trashWithMovingDumps/integration/trash_given_sol.cpp b/src/integration/trash_given_sol.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/trash_given_sol.cpp rename to src/integration/trash_given_sol.cpp diff --git a/src/trash-prob/trashWithMovingDumps/integration/trash_pg.cpp b/src/integration/trash_pg.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/trash_pg.cpp rename to src/integration/trash_pg.cpp diff --git a/src/trash-prob/trashWithMovingDumps/integration/trash_v.cpp b/src/integration/trash_v.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/trash_v.cpp rename to src/integration/trash_v.cpp diff --git a/src/trash-prob/trashWithMovingDumps/integration/vrptools--1.0.sql b/src/integration/vrptools--1.0.sql similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/vrptools--1.0.sql rename to src/integration/vrptools--1.0.sql diff --git a/src/trash-prob/trashWithMovingDumps/integration/vrptools.c b/src/integration/vrptools.c similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/vrptools.c rename to src/integration/vrptools.c diff --git a/src/trash-prob/trashWithMovingDumps/integration/vrptools.control b/src/integration/vrptools.control similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/vrptools.control rename to src/integration/vrptools.control diff --git a/src/trash-prob/trashWithMovingDumps/integration/vrptools.h b/src/integration/vrptools.h similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/vrptools.h rename to src/integration/vrptools.h diff --git a/src/trash-prob/trashWithMovingDumps/integration/vrptools_wrapper.cpp b/src/integration/vrptools_wrapper.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/integration/vrptools_wrapper.cpp rename to src/integration/vrptools_wrapper.cpp diff --git a/src/trash-prob/trashWithMovingDumps/muni-b/muni-b-latlon.sql b/src/muni-b/muni-b-latlon.sql similarity index 100% rename from src/trash-prob/trashWithMovingDumps/muni-b/muni-b-latlon.sql rename to src/muni-b/muni-b-latlon.sql diff --git a/src/trash-prob/trashWithMovingDumps/muni-b/muni-b.containers-All.txt b/src/muni-b/muni-b.containers-All.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/muni-b/muni-b.containers-All.txt rename to src/muni-b/muni-b.containers-All.txt diff --git a/src/trash-prob/trashWithMovingDumps/muni-b/muni-b.containers-Part.txt b/src/muni-b/muni-b.containers-Part.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/muni-b/muni-b.containers-Part.txt rename to src/muni-b/muni-b.containers-Part.txt diff --git a/src/trash-prob/trashWithMovingDumps/muni-b/muni-b.containers.txt b/src/muni-b/muni-b.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/muni-b/muni-b.containers.txt rename to src/muni-b/muni-b.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/muni-b/muni-b.dmatrix-time.txt b/src/muni-b/muni-b.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/muni-b/muni-b.dmatrix-time.txt rename to src/muni-b/muni-b.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/muni-b/muni-b.otherlocs.txt b/src/muni-b/muni-b.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/muni-b/muni-b.otherlocs.txt rename to src/muni-b/muni-b.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/muni-b/muni-b.sol.txt b/src/muni-b/muni-b.sol.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/muni-b/muni-b.sol.txt rename to src/muni-b/muni-b.sol.txt diff --git a/src/trash-prob/trashWithMovingDumps/muni-b/muni-b.sql b/src/muni-b/muni-b.sql similarity index 100% rename from src/trash-prob/trashWithMovingDumps/muni-b/muni-b.sql rename to src/muni-b/muni-b.sql diff --git a/src/trash-prob/trashWithMovingDumps/muni-b/muni-b.vehicles.txt b/src/muni-b/muni-b.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/muni-b/muni-b.vehicles.txt rename to src/muni-b/muni-b.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/muni-b/savedTests/original-test.txt b/src/muni-b/savedTests/original-test.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/muni-b/savedTests/original-test.txt rename to src/muni-b/savedTests/original-test.txt diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/costvehicle.cpp b/src/solverTrash/costvehicle.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/costvehicle.cpp rename to src/solverTrash/costvehicle.cpp diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/costvehicle.h b/src/solverTrash/costvehicle.h similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/costvehicle.h rename to src/solverTrash/costvehicle.h diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/fleetOpt.cpp b/src/solverTrash/fleetOpt.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/fleetOpt.cpp rename to src/solverTrash/fleetOpt.cpp diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/fleetOpt.h b/src/solverTrash/fleetOpt.h similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/fleetOpt.h rename to src/solverTrash/fleetOpt.h diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/optsol.cpp b/src/solverTrash/optsol.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/optsol.cpp rename to src/solverTrash/optsol.cpp diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/optsol.h b/src/solverTrash/optsol.h similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/optsol.h rename to src/solverTrash/optsol.h diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/tabubase.h b/src/solverTrash/tabubase.h similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/tabubase.h rename to src/solverTrash/tabubase.h diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/tabuopt.cpp b/src/solverTrash/tabuopt.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/tabuopt.cpp rename to src/solverTrash/tabuopt.cpp diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/tabuopt.h b/src/solverTrash/tabuopt.h similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/tabuopt.h rename to src/solverTrash/tabuopt.h diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/tripVehicle.cpp b/src/solverTrash/tripVehicle.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/tripVehicle.cpp rename to src/solverTrash/tripVehicle.cpp diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/tripVehicle.h b/src/solverTrash/tripVehicle.h similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/tripVehicle.h rename to src/solverTrash/tripVehicle.h diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/vehicle.cpp b/src/solverTrash/vehicle.cpp similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/vehicle.cpp rename to src/solverTrash/vehicle.cpp diff --git a/src/trash-prob/trashWithMovingDumps/solverTrash/vehicle.h b/src/solverTrash/vehicle.h similarity index 100% rename from src/trash-prob/trashWithMovingDumps/solverTrash/vehicle.h rename to src/solverTrash/vehicle.h diff --git a/src/trash-prob/trashWithMovingDumps/tests/.gitignore b/src/tests/.gitignore similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/.gitignore rename to src/tests/.gitignore diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_01.containers.txt b/src/tests/a_du_rm_cl_01.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_01.containers.txt rename to src/tests/a_du_rm_cl_01.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_01.dmatrix-time.txt b/src/tests/a_du_rm_cl_01.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_01.dmatrix-time.txt rename to src/tests/a_du_rm_cl_01.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_01.otherlocs.txt b/src/tests/a_du_rm_cl_01.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_01.otherlocs.txt rename to src/tests/a_du_rm_cl_01.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_01.vehicles.txt b/src/tests/a_du_rm_cl_01.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_01.vehicles.txt rename to src/tests/a_du_rm_cl_01.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_08.containers.txt b/src/tests/a_du_rm_cl_08.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_08.containers.txt rename to src/tests/a_du_rm_cl_08.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_08.dmatrix-time.txt b/src/tests/a_du_rm_cl_08.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_08.dmatrix-time.txt rename to src/tests/a_du_rm_cl_08.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_08.otherlocs.txt b/src/tests/a_du_rm_cl_08.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_08.otherlocs.txt rename to src/tests/a_du_rm_cl_08.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_08.vehicles.txt b/src/tests/a_du_rm_cl_08.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_08.vehicles.txt rename to src/tests/a_du_rm_cl_08.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_1533.containers.txt b/src/tests/a_du_rm_cl_1533.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_1533.containers.txt rename to src/tests/a_du_rm_cl_1533.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_1533.dmatrix-time.txt b/src/tests/a_du_rm_cl_1533.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_1533.dmatrix-time.txt rename to src/tests/a_du_rm_cl_1533.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_1533.otherlocs.txt b/src/tests/a_du_rm_cl_1533.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_1533.otherlocs.txt rename to src/tests/a_du_rm_cl_1533.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_1533.vehicles.txt b/src/tests/a_du_rm_cl_1533.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/a_du_rm_cl_1533.vehicles.txt rename to src/tests/a_du_rm_cl_1533.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/c_du_rm_cl_02.containers.txt b/src/tests/c_du_rm_cl_02.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/c_du_rm_cl_02.containers.txt rename to src/tests/c_du_rm_cl_02.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/c_du_rm_cl_02.dmatrix-time.txt b/src/tests/c_du_rm_cl_02.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/c_du_rm_cl_02.dmatrix-time.txt rename to src/tests/c_du_rm_cl_02.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/c_du_rm_cl_02.otherlocs.txt b/src/tests/c_du_rm_cl_02.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/c_du_rm_cl_02.otherlocs.txt rename to src/tests/c_du_rm_cl_02.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/c_du_rm_cl_02.vehicles.txt b/src/tests/c_du_rm_cl_02.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/c_du_rm_cl_02.vehicles.txt rename to src/tests/c_du_rm_cl_02.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_03.containers.txt b/src/tests/ch_du_rm_cl_03.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_03.containers.txt rename to src/tests/ch_du_rm_cl_03.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_03.dmatrix-time.txt b/src/tests/ch_du_rm_cl_03.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_03.dmatrix-time.txt rename to src/tests/ch_du_rm_cl_03.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_03.otherlocs.txt b/src/tests/ch_du_rm_cl_03.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_03.otherlocs.txt rename to src/tests/ch_du_rm_cl_03.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_03.vehicles.txt b/src/tests/ch_du_rm_cl_03.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_03.vehicles.txt rename to src/tests/ch_du_rm_cl_03.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05.containers.txt b/src/tests/ch_du_rm_cl_05.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05.containers.txt rename to src/tests/ch_du_rm_cl_05.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05.dmatrix-time.txt b/src/tests/ch_du_rm_cl_05.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05.dmatrix-time.txt rename to src/tests/ch_du_rm_cl_05.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05.otherlocs.txt b/src/tests/ch_du_rm_cl_05.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05.otherlocs.txt rename to src/tests/ch_du_rm_cl_05.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05.vehicles.txt b/src/tests/ch_du_rm_cl_05.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05.vehicles.txt rename to src/tests/ch_du_rm_cl_05.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.containers.txt b/src/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.containers.txt rename to src/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.dmatrix-time.txt b/src/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.dmatrix-time.txt rename to src/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.otherlocs.txt b/src/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.otherlocs.txt rename to src/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.out.txt b/src/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.out.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.out.txt rename to src/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.out.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.vehicles.txt b/src/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.vehicles.txt rename to src/tests/ch_du_rm_cl_05_oneTruck/ch_du_rm_cl_05.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/d_du_rm_cl_07.containers.txt b/src/tests/d_du_rm_cl_07.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/d_du_rm_cl_07.containers.txt rename to src/tests/d_du_rm_cl_07.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/d_du_rm_cl_07.dmatrix-time.txt b/src/tests/d_du_rm_cl_07.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/d_du_rm_cl_07.dmatrix-time.txt rename to src/tests/d_du_rm_cl_07.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/d_du_rm_cl_07.otherlocs.txt b/src/tests/d_du_rm_cl_07.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/d_du_rm_cl_07.otherlocs.txt rename to src/tests/d_du_rm_cl_07.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/d_du_rm_cl_07.vehicles.txt b/src/tests/d_du_rm_cl_07.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/d_du_rm_cl_07.vehicles.txt rename to src/tests/d_du_rm_cl_07.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/g_du_rm_cl_01.containers.txt b/src/tests/g_du_rm_cl_01.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/g_du_rm_cl_01.containers.txt rename to src/tests/g_du_rm_cl_01.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/g_du_rm_cl_01.dmatrix-time.txt b/src/tests/g_du_rm_cl_01.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/g_du_rm_cl_01.dmatrix-time.txt rename to src/tests/g_du_rm_cl_01.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/g_du_rm_cl_01.otherlocs.txt b/src/tests/g_du_rm_cl_01.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/g_du_rm_cl_01.otherlocs.txt rename to src/tests/g_du_rm_cl_01.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/g_du_rm_cl_01.vehicles.txt b/src/tests/g_du_rm_cl_01.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/g_du_rm_cl_01.vehicles.txt rename to src/tests/g_du_rm_cl_01.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue23.containers.txt b/src/tests/issue23.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue23.containers.txt rename to src/tests/issue23.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue23.dmatrix-time.txt b/src/tests/issue23.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue23.dmatrix-time.txt rename to src/tests/issue23.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue23.otherlocs.txt b/src/tests/issue23.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue23.otherlocs.txt rename to src/tests/issue23.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue23.vehicles.txt b/src/tests/issue23.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue23.vehicles.txt rename to src/tests/issue23.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue26.containers.txt b/src/tests/issue26.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue26.containers.txt rename to src/tests/issue26.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue26.dmatrix-time.txt b/src/tests/issue26.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue26.dmatrix-time.txt rename to src/tests/issue26.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue26.otherlocs.txt b/src/tests/issue26.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue26.otherlocs.txt rename to src/tests/issue26.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue26.vehicles.txt b/src/tests/issue26.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue26.vehicles.txt rename to src/tests/issue26.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue27.containers.txt b/src/tests/issue27.containers.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue27.containers.txt rename to src/tests/issue27.containers.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue27.dmatrix-time.txt b/src/tests/issue27.dmatrix-time.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue27.dmatrix-time.txt rename to src/tests/issue27.dmatrix-time.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue27.otherlocs.txt b/src/tests/issue27.otherlocs.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue27.otherlocs.txt rename to src/tests/issue27.otherlocs.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/issue27.vehicles.txt b/src/tests/issue27.vehicles.txt similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/issue27.vehicles.txt rename to src/tests/issue27.vehicles.txt diff --git a/src/trash-prob/trashWithMovingDumps/tests/sql-tests.sql b/src/tests/sql-tests.sql similarity index 100% rename from src/trash-prob/trashWithMovingDumps/tests/sql-tests.sql rename to src/tests/sql-tests.sql diff --git a/vrp.config b/tools/vrp-info/vrp.config similarity index 100% rename from vrp.config rename to tools/vrp-info/vrp.config diff --git a/vrp.creator b/tools/vrp-info/vrp.creator similarity index 100% rename from vrp.creator rename to tools/vrp-info/vrp.creator diff --git a/vrp.files b/tools/vrp-info/vrp.files similarity index 100% rename from vrp.files rename to tools/vrp-info/vrp.files diff --git a/vrp.includes b/tools/vrp-info/vrp.includes similarity index 100% rename from vrp.includes rename to tools/vrp-info/vrp.includes