Skip to content

Commit

Permalink
Merge pull request #159 from cvvergara/remove/unusedCode
Browse files Browse the repository at this point in the history 
Remove/unused code
  • Loading branch information
@cvvergara
cvvergara authored Jun 28, 2017
2 parents 8068b61 + 6701a89 commit cd908da
Show file tree
Hide file tree
Showing 42 changed files with 714 additions and 13,621 deletions.
10 changes: 6 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,18 @@ This library contains following features:
* Shortest Path Dijkstra Cost Family of functions
* Driving Distance
* K-Shortest Path, Multiple Alternative Paths (Yen's algorithm)
* Traveling Sales Person
* Traveling Sales Person (TSP)
* Turn Restriction Shortest Path (TRSP)

Additionally, ready for testing and to be part of 2.3 official version:
Additionally, ready for testing and to be part of 2.5 official version:

* Shortest Path Dijkstra With Points Family of functions
* Shortest Path Dijkstra Cost With Points Family of functions
* Driving Distance With Points
* K-Shortest Path With Points, Multiple Alternative Paths (Yen's algorithm)
* Dijkstra Via vertices
* Dijkstra Via (Vertices)

and many more.

Family of functions include:

Expand Down Expand Up @@ -147,7 +149,7 @@ Postgresql 9.2+

## USAGE

See online documentation: http://docs.pgrouting.org/2.3/en/doc/index.html
See online documentation: http://docs.pgrouting.org/dev/en/index.html

## LICENSE

Expand Down
2 changes: 1 addition & 1 deletion configuration.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ trsp | Y | Y | Y
max_flow | Y | Y | Y
contraction | Y | Y | Y
pickDeliver | Y | Y | Y
vrp_basic | Y | Y | Y
vrp_basic | N | Y | Y
withPoints | Y | Y | Y
#doc-dijkstraTRSP | Y | Y | Y
#areaContraction | Y | Y | Y
Expand Down
6 changes: 4 additions & 2 deletions doc/queries/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@ SET(LOCAL_FILES
doc-pgr_eucledianTSP.queries
doc-pgr_TSP.queries
doc-pickDeliverEuclidean.queries
proof_of_concept.queries
doc-contractGraph.queries
doc-pgr_analyzeGraph.queries
doc-pgr_dijkstraCost.queries
doc-pgr_fooDmatrix.queries
doc-pgr_version.queries
doc-pickDeliver.queries
trsp_notes_v2.5.0.queries
doc-contraction.queries
doc-pgr_bdAstarCost.queries
doc-pgr_dijkstra.queries
Expand All @@ -40,6 +38,10 @@ SET(LOCAL_FILES
doc-pgr_drivingDistance.queries
doc-pgr_maxFlow.queries
doc-pgr_withPointsKSP.queries
doc-pgr_vrpOneDepot.queries
proof_of_concept.queries
trsp_notes_v2.5.0.queries
oneDepotWrapper.queries
)

foreach (f ${LOCAL_FILES})
Expand Down
256 changes: 256 additions & 0 deletions doc/queries/doc-pgr_vrpOneDepot.queries
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,256 @@
BEGIN;
BEGIN
SET client_min_messages TO NOTICE;
SET
SELECT * FROM pgr_vrpOneDepot(
'SELECT * FROM vrp_orders',
'SELECT * FROM vrp_vehicles',
'SELECT * FROM vrp_distance',
1);
oid | opos | vid | tarrival | tdepart
-----+------+-----+----------+---------
-1 | 1 | 5 | 0 | 0
66 | 2 | 5 | 0 | 0
25 | 3 | 5 | 0 | 0
21 | 4 | 5 | 0 | 0
84 | 5 | 5 | 0 | 0
50 | 6 | 5 | 0 | 0
49 | 7 | 5 | 0 | 0
24 | 8 | 5 | 0 | 0
22 | 9 | 5 | 0 | 0
20 | 10 | 5 | 0 | 0
19 | 11 | 5 | 0 | 0
66 | 12 | 5 | 11 | 21
84 | 13 | 5 | 30 | 45
24 | 14 | 5 | 71 | 81
22 | 15 | 5 | 83 | 93
20 | 16 | 5 | 98 | 108
19 | 17 | 5 | 114 | 124
50 | 18 | 5 | 131 | 141
21 | 19 | 5 | 144 | 154
25 | 20 | 5 | 158 | 168
49 | 21 | 5 | 179 | 189
-1 | 22 | 5 | 234 | 234
-1 | 1 | 6 | 0 | 0
31 | 2 | 6 | 0 | 0
32 | 3 | 6 | 0 | 0
81 | 4 | 6 | 0 | 0
94 | 5 | 6 | 0 | 0
93 | 6 | 6 | 0 | 0
35 | 7 | 6 | 0 | 0
33 | 8 | 6 | 0 | 0
28 | 9 | 6 | 0 | 0
27 | 10 | 6 | 0 | 0
93 | 11 | 6 | 15 | 25
32 | 12 | 6 | 61 | 71
28 | 13 | 6 | 78 | 88
31 | 14 | 6 | 97 | 107
35 | 15 | 6 | 112 | 122
27 | 16 | 6 | 134 | 144
33 | 17 | 6 | 152 | 162
94 | 18 | 6 | 196 | 206
81 | 19 | 6 | 221 | 231
-1 | 20 | 6 | 238 | 238
-1 | 1 | 3 | 0 | 0
16 | 2 | 3 | 0 | 0
14 | 3 | 3 | 0 | 0
48 | 4 | 3 | 0 | 0
18 | 5 | 3 | 0 | 0
17 | 6 | 3 | 0 | 0
15 | 7 | 3 | 0 | 0
13 | 8 | 3 | 0 | 0
11 | 9 | 3 | 0 | 0
10 | 10 | 3 | 0 | 0
15 | 11 | 3 | 35 | 45
48 | 12 | 3 | 48 | 58
13 | 13 | 3 | 64 | 74
16 | 14 | 3 | 82 | 92
17 | 15 | 3 | 94 | 104
10 | 16 | 3 | 115 | 125
11 | 17 | 3 | 130 | 140
14 | 18 | 3 | 147 | 157
18 | 19 | 3 | 169 | 179
-1 | 20 | 3 | 219 | 219
-1 | 1 | 8 | 0 | 0
71 | 2 | 8 | 0 | 0
55 | 3 | 8 | 0 | 0
44 | 4 | 8 | 0 | 0
43 | 5 | 8 | 0 | 0
42 | 6 | 8 | 0 | 0
41 | 7 | 8 | 0 | 0
40 | 8 | 8 | 0 | 0
39 | 9 | 8 | 0 | 0
43 | 10 | 8 | 34 | 44
40 | 11 | 8 | 49 | 59
39 | 12 | 8 | 61 | 85
41 | 13 | 8 | 90 | 100
42 | 14 | 8 | 111 | 121
44 | 15 | 8 | 131 | 141
55 | 16 | 8 | 166 | 176
71 | 17 | 8 | 198 | 208
-1 | 18 | 8 | 228 | 228
-1 | 1 | 1 | 0 | 0
4 | 2 | 1 | 0 | 0
101 | 3 | 1 | 0 | 0
46 | 4 | 1 | 0 | 0
5 | 5 | 1 | 0 | 0
3 | 6 | 1 | 0 | 0
46 | 7 | 1 | 38 | 48
3 | 8 | 1 | 55 | 65
2 | 9 | 1 | 96 | 96
4 | 10 | 1 | 135 | 145
2 | 11 | 1 | 148 | 158
5 | 12 | 1 | 165 | 175
101 | 13 | 1 | 192 | 202
-1 | 14 | 1 | 222 | 222
-1 | 1 | 13 | 0 | 0
92 | 2 | 13 | 0 | 0
52 | 3 | 13 | 0 | 0
57 | 4 | 13 | 0 | 0
85 | 5 | 13 | 0 | 0
68 | 6 | 13 | 0 | 0
63 | 7 | 13 | 0 | 0
63 | 8 | 13 | 29 | 62
68 | 9 | 13 | 69 | 80
52 | 10 | 13 | 104 | 114
85 | 11 | 13 | 123 | 133
57 | 12 | 13 | 142 | 152
92 | 13 | 13 | 159 | 177
-1 | 14 | 13 | 189 | 189
-1 | 1 | 7 | 0 | 0
30 | 2 | 7 | 0 | 0
29 | 3 | 7 | 0 | 0
38 | 4 | 7 | 0 | 0
36 | 5 | 7 | 0 | 0
34 | 6 | 7 | 0 | 0
34 | 7 | 7 | 51 | 61
29 | 8 | 7 | 70 | 80
30 | 9 | 7 | 85 | 95
38 | 10 | 7 | 149 | 159
36 | 11 | 7 | 162 | 172
-1 | 12 | 7 | 217 | 217
-1 | 1 | 2 | 0 | 0
89 | 2 | 2 | 0 | 0
47 | 3 | 2 | 0 | 0
61 | 4 | 2 | 0 | 0
9 | 5 | 2 | 0 | 0
8 | 6 | 2 | 0 | 0
89 | 7 | 2 | 18 | 77
8 | 8 | 2 | 96 | 106
9 | 9 | 2 | 111 | 121
47 | 10 | 2 | 124 | 134
61 | 11 | 2 | 154 | 165
-1 | 12 | 2 | 192 | 192
-1 | 1 | 14 | 0 | 0
97 | 2 | 14 | 0 | 0
64 | 3 | 14 | 0 | 0
51 | 4 | 14 | 0 | 0
96 | 5 | 14 | 0 | 0
77 | 6 | 14 | 0 | 0
96 | 7 | 14 | 21 | 44
64 | 8 | 14 | 63 | 73
77 | 9 | 14 | 83 | 93
51 | 10 | 14 | 119 | 129
97 | 11 | 14 | 154 | 164
-1 | 12 | 14 | 180 | 180
-1 | 1 | 15 | 0 | 0
67 | 2 | 15 | 0 | 0
73 | 3 | 15 | 0 | 0
95 | 4 | 15 | 0 | 0
82 | 5 | 15 | 0 | 0
72 | 6 | 15 | 0 | 0
73 | 7 | 15 | 27 | 40
72 | 8 | 15 | 50 | 75
82 | 9 | 15 | 91 | 101
95 | 10 | 15 | 114 | 124
67 | 11 | 15 | 144 | 154
-1 | 12 | 15 | 167 | 167
-1 | 1 | 11 | 0 | 0
78 | 2 | 11 | 0 | 0
26 | 3 | 11 | 0 | 0
87 | 4 | 11 | 0 | 0
23 | 5 | 11 | 0 | 0
87 | 6 | 11 | 32 | 97
23 | 7 | 11 | 118 | 128
78 | 8 | 11 | 149 | 160
26 | 9 | 11 | 172 | 182
-1 | 10 | 11 | 227 | 227
-1 | 1 | 4 | 0 | 0
60 | 2 | 4 | 0 | 0
59 | 3 | 4 | 0 | 0
100 | 4 | 4 | 0 | 0
54 | 5 | 4 | 0 | 0
60 | 6 | 4 | 42 | 52
100 | 7 | 4 | 74 | 87
54 | 8 | 4 | 103 | 113
59 | 9 | 4 | 153 | 163
-1 | 10 | 4 | 211 | 211
-1 | 1 | 10 | 0 | 0
86 | 2 | 10 | 0 | 0
90 | 3 | 10 | 0 | 0
65 | 4 | 10 | 0 | 0
53 | 5 | 10 | 0 | 0
53 | 6 | 10 | 25 | 62
65 | 7 | 10 | 82 | 92
86 | 8 | 10 | 111 | 121
90 | 9 | 10 | 140 | 154
-1 | 10 | 10 | 206 | 206
-1 | 1 | 12 | 0 | 0
6 | 2 | 12 | 0 | 0
80 | 3 | 12 | 0 | 0
7 | 4 | 12 | 0 | 0
56 | 5 | 12 | 0 | 0
6 | 6 | 12 | 40 | 51
80 | 7 | 12 | 73 | 99
7 | 8 | 12 | 113 | 123
56 | 9 | 12 | 142 | 152
-1 | 10 | 12 | 166 | 166
-1 | 1 | 19 | 0 | 0
88 | 2 | 19 | 0 | 0
70 | 3 | 19 | 0 | 0
58 | 4 | 19 | 0 | 0
99 | 5 | 19 | 0 | 0
70 | 6 | 19 | 9 | 51
99 | 7 | 19 | 56 | 66
88 | 8 | 19 | 97 | 107
58 | 9 | 19 | 125 | 135
-1 | 10 | 19 | 162 | 162
-1 | 1 | 17 | 0 | 0
75 | 2 | 17 | 0 | 0
98 | 3 | 17 | 0 | 0
76 | 4 | 17 | 0 | 0
76 | 5 | 17 | 57 | 84
98 | 6 | 17 | 97 | 130
75 | 7 | 17 | 146 | 156
-1 | 8 | 17 | 192 | 192
-1 | 1 | 16 | 0 | 0
69 | 2 | 16 | 0 | 0
79 | 3 | 16 | 0 | 0
74 | 4 | 16 | 0 | 0
74 | 5 | 16 | 39 | 87
79 | 6 | 16 | 94 | 104
69 | 7 | 16 | 136 | 154
-1 | 8 | 16 | 164 | 164
-1 | 1 | 9 | 0 | 0
62 | 2 | 9 | 0 | 0
37 | 3 | 9 | 0 | 0
45 | 4 | 9 | 0 | 0
37 | 5 | 9 | 43 | 53
45 | 6 | 9 | 63 | 74
62 | 7 | 9 | 94 | 104
-1 | 8 | 9 | 120 | 120
-1 | 1 | 18 | 0 | 0
91 | 2 | 18 | 0 | 0
12 | 3 | 18 | 0 | 0
12 | 4 | 18 | 34 | 69
91 | 5 | 18 | 99 | 109
-1 | 6 | 18 | 113 | 113
-1 | 1 | 20 | 0 | 0
83 | 2 | 20 | 0 | 0
83 | 3 | 20 | 15 | 52
-1 | 4 | 20 | 67 | 67
-1 | 0 | 0 | -1 | 3712
(241 rows)

ROLLBACK;
ROLLBACK
9 changes: 9 additions & 0 deletions doc/queries/oneDepotWrapper.queries
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
BEGIN;
BEGIN
SET client_min_messages TO NOTICE;
SET
SELECT * FROM _pgr_vrpOneDepot(
'SELECT * FROM vrp_orders',
'SELECT * FROM vrp_vehicles',
'SELECT src_id AS start_vid, dest_id AS end_vid, traveltime AS agg_cost FROM vrp_distance',
1);
22 changes: 20 additions & 2 deletions doc/vrp_basic/pgr_vrpOneDepot.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,25 @@ pgr_vrpOneDepot - experimental
:start-after: begin-warn-expr
:end-before: end-warn-expr

No documentation available from the original developer
**No documentation available**

Example:
-------------------------------------------------------------------------------

**Under discussion**

.. rubric:: Current Result

.. literalinclude:: doc-pgr_vrpOneDepot.queries

.. rubric:: Current Result

.. literalinclude:: oneDepotWrapper.queries


.. rubric:: Data

.. literalinclude:: ../../tools/testers/vrpOneDepot.data


* :ref:`type_cost_result`
* http://en.wikipedia.org/wiki/Vehicle_routing_problem
Loading

0 comments on commit cd908da

Please sign in to comment.