diff --git a/doc/queries/oneDepotWrapper.queries b/doc/queries/oneDepotWrapper.queries index 8c24c836757..b3830a3a3fb 100644 --- a/doc/queries/oneDepotWrapper.queries +++ b/doc/queries/oneDepotWrapper.queries @@ -7,250 +7,3 @@ SELECT * FROM _pgr_vrpOneDepot( 'SELECT * FROM vrp_vehicles', 'SELECT src_id AS start_vid, dest_id AS end_vid, traveltime AS agg_cost FROM vrp_distance', 1); - seq | vehicle_seq | vehicle_id | stop_seq | stop_type | stop_id | order_id | cargo | travel_time | arrival_time | wait_time | service_time | departure_time ------+-------------+------------+----------+-----------+---------+----------+-------+-------------+--------------+-------------------+--------------+---------------- - 1 | 1 | 5 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 2 | 1 | 5 | 2 | 2 | 1 | 66 | 16 | 0 | 0 | 0 | 0 | 0 - 3 | 1 | 5 | 3 | 2 | 1 | 25 | 26 | 0 | 0 | 0 | 0 | 0 - 4 | 1 | 5 | 4 | 2 | 1 | 21 | 36 | 0 | 0 | 0 | 0 | 0 - 5 | 1 | 5 | 5 | 2 | 1 | 84 | 50 | 0 | 0 | 0 | 0 | 0 - 6 | 1 | 5 | 6 | 2 | 1 | 50 | 60 | 0 | 0 | 0 | 0 | 0 - 7 | 1 | 5 | 7 | 2 | 1 | 49 | 70 | 0 | 0 | 0 | 0 | 0 - 8 | 1 | 5 | 8 | 2 | 1 | 24 | 100 | 0 | 0 | 0 | 0 | 0 - 9 | 1 | 5 | 9 | 2 | 1 | 22 | 110 | 0 | 0 | 0 | 0 | 0 - 10 | 1 | 5 | 10 | 2 | 1 | 20 | 150 | 0 | 0 | 0 | 0 | 0 - 11 | 1 | 5 | 11 | 2 | 1 | 19 | 170 | 0 | 0 | 0 | 0 | 0 - 12 | 1 | 5 | 12 | 3 | 66 | 66 | 154 | 11.18034 | 11.18034 | 0 | 10 | 21.18034 - 13 | 1 | 5 | 13 | 3 | 84 | 84 | 140 | 9.219544 | 30.399884 | 4.600116 | 10 | 45 - 14 | 1 | 5 | 14 | 3 | 24 | 24 | 110 | 26.019224 | 71.019224 | 0 | 10 | 81.019224 - 15 | 1 | 5 | 15 | 3 | 22 | 22 | 100 | 2 | 83.019224 | 0 | 10 | 93.019224 - 16 | 1 | 5 | 16 | 3 | 20 | 20 | 60 | 5.385165 | 98.404389 | 0 | 10 | 108.404389 - 17 | 1 | 5 | 17 | 3 | 19 | 19 | 40 | 5.385165 | 113.789554 | 0 | 10 | 123.789554 - 18 | 1 | 5 | 18 | 3 | 50 | 50 | 30 | 7.28011 | 131.069664 | 0 | 10 | 141.069664 - 19 | 1 | 5 | 19 | 3 | 21 | 21 | 20 | 3 | 144.069664 | 0 | 10 | 154.069664 - 20 | 1 | 5 | 20 | 3 | 25 | 25 | 10 | 4 | 158.069664 | 0 | 10 | 168.069664 - 21 | 1 | 5 | 21 | 3 | 49 | 49 | 0 | 10.77033 | 178.839994 | 0 | 10 | 188.839994 - 22 | 1 | 5 | 22 | 6 | 1 | -1 | 0 | 45.044423 | 233.884417 | 0 | 0 | 233.884417 - 23 | 2 | 6 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 24 | 2 | 6 | 2 | 2 | 1 | 31 | 10 | 0 | 0 | 0 | 0 | 0 - 25 | 2 | 6 | 3 | 2 | 1 | 32 | 30 | 0 | 0 | 0 | 0 | 0 - 26 | 2 | 6 | 4 | 2 | 1 | 81 | 43 | 0 | 0 | 0 | 0 | 0 - 27 | 2 | 6 | 5 | 2 | 1 | 94 | 46 | 0 | 0 | 0 | 0 | 0 - 28 | 2 | 6 | 6 | 2 | 1 | 93 | 60 | 0 | 0 | 0 | 0 | 0 - 29 | 2 | 6 | 7 | 2 | 1 | 35 | 90 | 0 | 0 | 0 | 0 | 0 - 30 | 2 | 6 | 8 | 2 | 1 | 33 | 100 | 0 | 0 | 0 | 0 | 0 - 31 | 2 | 6 | 9 | 2 | 1 | 28 | 120 | 0 | 0 | 0 | 0 | 0 - 32 | 2 | 6 | 10 | 2 | 1 | 27 | 150 | 0 | 0 | 0 | 0 | 0 - 33 | 2 | 6 | 11 | 3 | 93 | 93 | 136 | 14.764823 | 14.764823 | 0 | 10 | 24.764823 - 34 | 2 | 6 | 12 | 3 | 32 | 32 | 116 | 35.902646 | 60.667469 | 0.332531000000003 | 10 | 71 - 35 | 2 | 6 | 13 | 3 | 28 | 28 | 96 | 7 | 78 | 0 | 10 | 88 - 36 | 2 | 6 | 14 | 3 | 31 | 31 | 86 | 8.602325 | 96.602325 | 0 | 10 | 106.602325 - 37 | 2 | 6 | 15 | 3 | 35 | 35 | 56 | 5.830952 | 112.433277 | 0 | 10 | 122.433277 - 38 | 2 | 6 | 16 | 3 | 27 | 27 | 26 | 11.18034 | 133.613617 | 0 | 10 | 143.613617 - 39 | 2 | 6 | 17 | 3 | 33 | 33 | 16 | 8 | 151.613617 | 0 | 10 | 161.613617 - 40 | 2 | 6 | 18 | 3 | 94 | 94 | 13 | 34.058773 | 195.67239 | 0 | 10 | 205.67239 - 41 | 2 | 6 | 19 | 3 | 81 | 81 | 0 | 14.866069 | 220.538459 | 0 | 10 | 230.538459 - 42 | 2 | 6 | 20 | 6 | 1 | -1 | 0 | 7.615773 | 238.154232 | 0 | 0 | 238.154232 - 43 | 3 | 3 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 44 | 3 | 3 | 2 | 2 | 1 | 16 | 20 | 0 | 0 | 0 | 0 | 0 - 45 | 3 | 3 | 3 | 2 | 1 | 14 | 30 | 0 | 0 | 0 | 0 | 0 - 46 | 3 | 3 | 4 | 2 | 1 | 48 | 40 | 0 | 0 | 0 | 0 | 0 - 47 | 3 | 3 | 5 | 2 | 1 | 18 | 60 | 0 | 0 | 0 | 0 | 0 - 48 | 3 | 3 | 6 | 2 | 1 | 17 | 80 | 0 | 0 | 0 | 0 | 0 - 49 | 3 | 3 | 7 | 2 | 1 | 15 | 90 | 0 | 0 | 0 | 0 | 0 - 50 | 3 | 3 | 8 | 2 | 1 | 13 | 110 | 0 | 0 | 0 | 0 | 0 - 51 | 3 | 3 | 9 | 2 | 1 | 11 | 140 | 0 | 0 | 0 | 0 | 0 - 52 | 3 | 3 | 10 | 2 | 1 | 10 | 160 | 0 | 0 | 0 | 0 | 0 - 53 | 3 | 3 | 11 | 3 | 15 | 15 | 150 | 35.355339 | 35.355339 | 0 | 10 | 45.355339 - 54 | 3 | 3 | 12 | 3 | 48 | 48 | 140 | 3 | 48.355339 | 0 | 10 | 58.355339 - 55 | 3 | 3 | 13 | 3 | 13 | 13 | 120 | 6 | 64.355339 | 0 | 10 | 74.355339 - 56 | 3 | 3 | 14 | 3 | 16 | 16 | 100 | 7.81025 | 82.165589 | 0 | 10 | 92.165589 - 57 | 3 | 3 | 15 | 3 | 17 | 17 | 80 | 2 | 94.165589 | 0 | 10 | 104.165589 - 58 | 3 | 3 | 16 | 3 | 10 | 10 | 60 | 11.18034 | 115.345929 | 0 | 10 | 125.345929 - 59 | 3 | 3 | 17 | 3 | 11 | 11 | 30 | 5 | 130.345929 | 0 | 10 | 140.345929 - 60 | 3 | 3 | 18 | 3 | 14 | 14 | 20 | 7.071068 | 147.416997 | 0 | 10 | 157.416997 - 61 | 3 | 3 | 19 | 3 | 18 | 18 | 0 | 11.18034 | 168.597337 | 0 | 10 | 178.597337 - 62 | 3 | 3 | 20 | 6 | 1 | -1 | 0 | 40.311289 | 218.908626 | 0 | 0 | 218.908626 - 63 | 4 | 8 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 64 | 4 | 8 | 2 | 2 | 1 | 71 | 23 | 0 | 0 | 0 | 0 | 0 - 65 | 4 | 8 | 3 | 2 | 1 | 55 | 39 | 0 | 0 | 0 | 0 | 0 - 66 | 4 | 8 | 4 | 2 | 1 | 44 | 59 | 0 | 0 | 0 | 0 | 0 - 67 | 4 | 8 | 5 | 2 | 1 | 43 | 69 | 0 | 0 | 0 | 0 | 0 - 68 | 4 | 8 | 6 | 2 | 1 | 42 | 89 | 0 | 0 | 0 | 0 | 0 - 69 | 4 | 8 | 7 | 2 | 1 | 41 | 119 | 0 | 0 | 0 | 0 | 0 - 70 | 4 | 8 | 8 | 2 | 1 | 40 | 129 | 0 | 0 | 0 | 0 | 0 - 71 | 4 | 8 | 9 | 2 | 1 | 39 | 159 | 0 | 0 | 0 | 0 | 0 - 72 | 4 | 8 | 10 | 3 | 43 | 43 | 149 | 33.54102 | 33.54102 | 0 | 10 | 43.54102 - 73 | 4 | 8 | 11 | 3 | 40 | 40 | 139 | 5 | 48.54102 | 0 | 10 | 58.54102 - 74 | 4 | 8 | 12 | 3 | 39 | 39 | 109 | 2 | 60.54102 | 14.45898 | 10 | 85 - 75 | 4 | 8 | 13 | 3 | 41 | 41 | 79 | 5.385165 | 90.385165 | 0 | 10 | 100.385165 - 76 | 4 | 8 | 14 | 3 | 42 | 42 | 59 | 10.198039 | 110.583204 | 0 | 10 | 120.583204 - 77 | 4 | 8 | 15 | 3 | 44 | 44 | 39 | 10.440307 | 131.023511 | 0 | 10 | 141.023511 - 78 | 4 | 8 | 16 | 3 | 55 | 55 | 23 | 25 | 166.023511 | 0 | 10 | 176.023511 - 79 | 4 | 8 | 17 | 3 | 71 | 71 | 0 | 21.931712 | 197.955223 | 0 | 10 | 207.955223 - 80 | 4 | 8 | 18 | 6 | 1 | -1 | 0 | 19.646883 | 227.602106 | 0 | 0 | 227.602106 - 81 | 5 | 1 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 82 | 5 | 1 | 2 | 2 | 1 | 4 | 10 | 0 | 0 | 0 | 0 | 0 - 83 | 5 | 1 | 3 | 2 | 1 | 101 | 13 | 0 | 0 | 0 | 0 | 0 - 84 | 5 | 1 | 4 | 2 | 1 | 46 | 23 | 0 | 0 | 0 | 0 | 0 - 85 | 5 | 1 | 5 | 2 | 1 | 5 | 63 | 0 | 0 | 0 | 0 | 0 - 86 | 5 | 1 | 6 | 2 | 1 | 3 | 93 | 0 | 0 | 0 | 0 | 0 - 87 | 5 | 1 | 7 | 3 | 46 | 46 | 83 | 37.735925 | 37.735925 | 0 | 10 | 47.735925 - 88 | 5 | 1 | 8 | 3 | 3 | 3 | 53 | 7.28011 | 55.016035 | 0 | 10 | 65.016035 - 89 | 5 | 1 | 9 | 2 | 1 | 2 | 73 | 30.805844 | 95.821879 | 0 | 0 | 95.821879 - 90 | 5 | 1 | 10 | 3 | 4 | 4 | 63 | 39.357337 | 135.179216 | 0 | 10 | 145.179216 - 91 | 5 | 1 | 11 | 3 | 2 | 2 | 43 | 3 | 148.179216 | 0 | 10 | 158.179216 - 92 | 5 | 1 | 12 | 3 | 5 | 5 | 3 | 7.071068 | 165.250284 | 0 | 10 | 175.250284 - 93 | 5 | 1 | 13 | 3 | 101 | 101 | 0 | 17.029386 | 192.27967 | 0 | 10 | 202.27967 - 94 | 5 | 1 | 14 | 6 | 1 | -1 | 0 | 19.235384 | 221.515054 | 0 | 0 | 221.515054 - 95 | 6 | 13 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 96 | 6 | 13 | 2 | 2 | 1 | 92 | 13 | 0 | 0 | 0 | 0 | 0 - 97 | 6 | 13 | 3 | 2 | 1 | 52 | 32 | 0 | 0 | 0 | 0 | 0 - 98 | 6 | 13 | 4 | 2 | 1 | 57 | 51 | 0 | 0 | 0 | 0 | 0 - 99 | 6 | 13 | 5 | 2 | 1 | 85 | 69 | 0 | 0 | 0 | 0 | 0 - 100 | 6 | 13 | 6 | 2 | 1 | 68 | 78 | 0 | 0 | 0 | 0 | 0 - 101 | 6 | 13 | 7 | 2 | 1 | 63 | 81 | 0 | 0 | 0 | 0 | 0 - 102 | 6 | 13 | 8 | 3 | 63 | 63 | 78 | 29.154759 | 29.154759 | 22.845241 | 10 | 62 - 103 | 6 | 13 | 9 | 3 | 68 | 68 | 69 | 7.071068 | 69.071068 | 0.928932000000003 | 10 | 80 - 104 | 6 | 13 | 10 | 3 | 52 | 52 | 50 | 23.769729 | 103.769729 | 0 | 10 | 113.769729 - 105 | 6 | 13 | 11 | 3 | 85 | 85 | 32 | 9.219544 | 122.989273 | 0 | 10 | 132.989273 - 106 | 6 | 13 | 12 | 3 | 57 | 57 | 13 | 9.219544 | 142.208817 | 0 | 10 | 152.208817 - 107 | 6 | 13 | 13 | 3 | 92 | 92 | 0 | 7.071068 | 159.279885 | 7.72011499999999 | 10 | 177 - 108 | 6 | 13 | 14 | 6 | 1 | -1 | 0 | 12.041595 | 189.041595 | 0 | 0 | 189.041595 - 109 | 7 | 7 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 110 | 7 | 7 | 2 | 2 | 1 | 30 | 10 | 0 | 0 | 0 | 0 | 0 - 111 | 7 | 7 | 3 | 2 | 1 | 29 | 20 | 0 | 0 | 0 | 0 | 0 - 112 | 7 | 7 | 4 | 2 | 1 | 38 | 30 | 0 | 0 | 0 | 0 | 0 - 113 | 7 | 7 | 5 | 2 | 1 | 36 | 50 | 0 | 0 | 0 | 0 | 0 - 114 | 7 | 7 | 6 | 2 | 1 | 34 | 60 | 0 | 0 | 0 | 0 | 0 - 115 | 7 | 7 | 7 | 3 | 34 | 34 | 50 | 51.478151 | 51.478151 | 0 | 10 | 61.478151 - 116 | 7 | 7 | 8 | 3 | 29 | 29 | 40 | 8.602325 | 70.080476 | 0 | 10 | 80.080476 - 117 | 7 | 7 | 9 | 3 | 30 | 30 | 30 | 5.385165 | 85.465641 | 0 | 10 | 95.465641 - 118 | 7 | 7 | 10 | 3 | 38 | 38 | 20 | 53.235327 | 148.700968 | 0 | 10 | 158.700968 - 119 | 7 | 7 | 11 | 3 | 36 | 36 | 0 | 3.605551 | 162.306519 | 0 | 10 | 172.306519 - 120 | 7 | 7 | 12 | 6 | 1 | -1 | 0 | 44.204072 | 216.510591 | 0 | 0 | 216.510591 - 121 | 8 | 2 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 122 | 8 | 2 | 2 | 2 | 1 | 89 | 19 | 0 | 0 | 0 | 0 | 0 - 123 | 8 | 2 | 3 | 2 | 1 | 47 | 29 | 0 | 0 | 0 | 0 | 0 - 124 | 8 | 2 | 4 | 2 | 1 | 61 | 46 | 0 | 0 | 0 | 0 | 0 - 125 | 8 | 2 | 5 | 2 | 1 | 9 | 56 | 0 | 0 | 0 | 0 | 0 - 126 | 8 | 2 | 6 | 2 | 1 | 8 | 76 | 0 | 0 | 0 | 0 | 0 - 127 | 8 | 2 | 7 | 3 | 89 | 89 | 57 | 17.888544 | 17.888544 | 49.111456 | 10 | 77 - 128 | 8 | 2 | 8 | 3 | 8 | 8 | 37 | 19.235384 | 96.235384 | 0 | 10 | 106.235384 - 129 | 8 | 2 | 9 | 3 | 9 | 9 | 27 | 5 | 111.235384 | 0 | 10 | 121.235384 - 130 | 8 | 2 | 10 | 3 | 47 | 47 | 17 | 3 | 124.235384 | 0 | 10 | 134.235384 - 131 | 8 | 2 | 11 | 3 | 61 | 61 | 0 | 20.223748 | 154.459132 | 0.540867999999989 | 10 | 165 - 132 | 8 | 2 | 12 | 6 | 1 | -1 | 0 | 26.925824 | 191.925824 | 0 | 0 | 191.925824 - 133 | 9 | 14 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 134 | 9 | 14 | 2 | 2 | 1 | 97 | 26 | 0 | 0 | 0 | 0 | 0 - 135 | 9 | 14 | 3 | 2 | 1 | 64 | 32 | 0 | 0 | 0 | 0 | 0 - 136 | 9 | 14 | 4 | 2 | 1 | 51 | 62 | 0 | 0 | 0 | 0 | 0 - 137 | 9 | 14 | 5 | 2 | 1 | 96 | 68 | 0 | 0 | 0 | 0 | 0 - 138 | 9 | 14 | 6 | 2 | 1 | 77 | 99 | 0 | 0 | 0 | 0 | 0 - 139 | 9 | 14 | 7 | 3 | 96 | 96 | 93 | 20.615528 | 20.615528 | 13.384472 | 10 | 44 - 140 | 9 | 14 | 8 | 3 | 64 | 64 | 87 | 19.235384 | 63.235384 | 0 | 10 | 73.235384 - 141 | 9 | 14 | 9 | 3 | 77 | 77 | 56 | 9.433981 | 82.669365 | 0 | 10 | 92.669365 - 142 | 9 | 14 | 10 | 3 | 51 | 51 | 26 | 25.942244 | 118.611609 | 0 | 10 | 128.611609 - 143 | 9 | 14 | 11 | 3 | 97 | 97 | 0 | 25.495098 | 154.106707 | 0 | 10 | 164.106707 - 144 | 9 | 14 | 12 | 6 | 1 | -1 | 0 | 15.524175 | 179.630882 | 0 | 0 | 179.630882 - 145 | 10 | 15 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 146 | 10 | 15 | 2 | 2 | 1 | 67 | 16 | 0 | 0 | 0 | 0 | 0 - 147 | 10 | 15 | 3 | 2 | 1 | 73 | 24 | 0 | 0 | 0 | 0 | 0 - 148 | 10 | 15 | 4 | 2 | 1 | 95 | 47 | 0 | 0 | 0 | 0 | 0 - 149 | 10 | 15 | 5 | 2 | 1 | 82 | 57 | 0 | 0 | 0 | 0 | 0 - 150 | 10 | 15 | 6 | 2 | 1 | 72 | 71 | 0 | 0 | 0 | 0 | 0 - 151 | 10 | 15 | 7 | 3 | 73 | 73 | 63 | 27.45906 | 27.45906 | 2.54094 | 10 | 40 - 152 | 10 | 15 | 8 | 3 | 72 | 72 | 49 | 10.198039 | 50.198039 | 14.801961 | 10 | 75 - 153 | 10 | 15 | 9 | 3 | 82 | 82 | 39 | 16.278821 | 91.278821 | 0 | 10 | 101.278821 - 154 | 10 | 15 | 10 | 3 | 95 | 95 | 16 | 12.806248 | 114.085069 | 0 | 10 | 124.085069 - 155 | 10 | 15 | 11 | 3 | 67 | 67 | 0 | 19.416488 | 143.501557 | 0 | 10 | 153.501557 - 156 | 10 | 15 | 12 | 6 | 1 | -1 | 0 | 13.038405 | 166.539962 | 0 | 0 | 166.539962 - 157 | 11 | 11 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 158 | 11 | 11 | 2 | 2 | 1 | 78 | 7 | 0 | 0 | 0 | 0 | 0 - 159 | 11 | 11 | 3 | 2 | 1 | 26 | 27 | 0 | 0 | 0 | 0 | 0 - 160 | 11 | 11 | 4 | 2 | 1 | 87 | 55 | 0 | 0 | 0 | 0 | 0 - 161 | 11 | 11 | 5 | 2 | 1 | 23 | 95 | 0 | 0 | 0 | 0 | 0 - 162 | 11 | 11 | 6 | 3 | 87 | 87 | 67 | 32.202484 | 32.202484 | 54.797516 | 10 | 97 - 163 | 11 | 11 | 7 | 3 | 23 | 23 | 27 | 21.023796 | 118.023796 | 0 | 10 | 128.023796 - 164 | 11 | 11 | 8 | 3 | 78 | 78 | 20 | 20.808652 | 148.832448 | 1.167552 | 10 | 160 - 165 | 11 | 11 | 9 | 3 | 26 | 26 | 0 | 12.165525 | 172.165525 | 0 | 10 | 182.165525 - 166 | 11 | 11 | 10 | 6 | 1 | -1 | 0 | 45.276926 | 227.442451 | 0 | 0 | 227.442451 - 167 | 12 | 4 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 168 | 12 | 4 | 2 | 2 | 1 | 60 | 19 | 0 | 0 | 0 | 0 | 0 - 169 | 12 | 4 | 3 | 2 | 1 | 59 | 39 | 0 | 0 | 0 | 0 | 0 - 170 | 12 | 4 | 4 | 2 | 1 | 100 | 54 | 0 | 0 | 0 | 0 | 0 - 171 | 12 | 4 | 5 | 2 | 1 | 54 | 59 | 0 | 0 | 0 | 0 | 0 - 172 | 12 | 4 | 6 | 3 | 60 | 60 | 40 | 42.426407 | 42.426407 | 0 | 10 | 52.426407 - 173 | 12 | 4 | 7 | 3 | 100 | 100 | 25 | 21.931712 | 74.358119 | 2.641881 | 10 | 87 - 174 | 12 | 4 | 8 | 3 | 54 | 54 | 20 | 16.155494 | 103.155494 | 0 | 10 | 113.155494 - 175 | 12 | 4 | 9 | 3 | 59 | 59 | 0 | 40.311289 | 153.466783 | 0 | 10 | 163.466783 - 176 | 12 | 4 | 10 | 6 | 1 | -1 | 0 | 47.169906 | 210.636689 | 0 | 0 | 210.636689 - 177 | 13 | 10 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 178 | 13 | 10 | 2 | 2 | 1 | 86 | 2 | 0 | 0 | 0 | 0 | 0 - 179 | 13 | 10 | 3 | 2 | 1 | 90 | 27 | 0 | 0 | 0 | 0 | 0 - 180 | 13 | 10 | 4 | 2 | 1 | 65 | 44 | 0 | 0 | 0 | 0 | 0 - 181 | 13 | 10 | 5 | 2 | 1 | 53 | 47 | 0 | 0 | 0 | 0 | 0 - 182 | 13 | 10 | 6 | 3 | 53 | 53 | 44 | 25 | 25 | 27 | 10 | 62 - 183 | 13 | 10 | 7 | 3 | 65 | 65 | 27 | 20 | 82 | 0 | 10 | 92 - 184 | 13 | 10 | 8 | 3 | 86 | 86 | 25 | 19.313208 | 111.313208 | 0 | 10 | 121.313208 - 185 | 13 | 10 | 9 | 3 | 90 | 90 | 0 | 18.439089 | 139.752297 | 4.247703 | 10 | 154 - 186 | 13 | 10 | 10 | 6 | 1 | -1 | 0 | 52.478567 | 206.478567 | 0 | 0 | 206.478567 - 187 | 14 | 12 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 188 | 14 | 12 | 2 | 2 | 1 | 6 | 20 | 0 | 0 | 0 | 0 | 0 - 189 | 14 | 12 | 3 | 2 | 1 | 80 | 50 | 0 | 0 | 0 | 0 | 0 - 190 | 14 | 12 | 4 | 2 | 1 | 7 | 70 | 0 | 0 | 0 | 0 | 0 - 191 | 14 | 12 | 5 | 2 | 1 | 56 | 86 | 0 | 0 | 0 | 0 | 0 - 192 | 14 | 12 | 6 | 3 | 6 | 6 | 66 | 40.311289 | 40.311289 | 0.688710999999998 | 10 | 51 - 193 | 14 | 12 | 7 | 3 | 80 | 80 | 36 | 22.022716 | 73.022716 | 15.977284 | 10 | 99 - 194 | 14 | 12 | 8 | 3 | 7 | 7 | 16 | 13.892444 | 112.892444 | 0 | 10 | 122.892444 - 195 | 14 | 12 | 9 | 3 | 56 | 56 | 0 | 19.209373 | 142.101817 | 0 | 10 | 152.101817 - 196 | 14 | 12 | 10 | 6 | 1 | -1 | 0 | 14.142136 | 166.243953 | 0 | 0 | 166.243953 - 197 | 15 | 19 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 198 | 15 | 19 | 2 | 2 | 1 | 88 | 13 | 0 | 0 | 0 | 0 | 0 - 199 | 15 | 19 | 3 | 2 | 1 | 70 | 40 | 0 | 0 | 0 | 0 | 0 - 200 | 15 | 19 | 4 | 2 | 1 | 58 | 63 | 0 | 0 | 0 | 0 | 0 - 201 | 15 | 19 | 5 | 2 | 1 | 99 | 72 | 0 | 0 | 0 | 0 | 0 - 202 | 15 | 19 | 6 | 3 | 70 | 70 | 45 | 9.219544 | 9.219544 | 31.780456 | 10 | 51 - 203 | 15 | 19 | 7 | 3 | 99 | 99 | 36 | 5 | 56 | 0 | 10 | 66 - 204 | 15 | 19 | 8 | 3 | 88 | 88 | 23 | 31.304952 | 97.304952 | 0 | 10 | 107.304952 - 205 | 15 | 19 | 9 | 3 | 58 | 58 | 0 | 18.027756 | 125.332708 | 0 | 10 | 135.332708 - 206 | 15 | 19 | 10 | 6 | 1 | -1 | 0 | 26.925824 | 162.258532 | 0 | 0 | 162.258532 - 207 | 16 | 17 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 208 | 16 | 17 | 2 | 2 | 1 | 75 | 8 | 0 | 0 | 0 | 0 | 0 - 209 | 16 | 17 | 3 | 2 | 1 | 98 | 43 | 0 | 0 | 0 | 0 | 0 - 210 | 16 | 17 | 4 | 2 | 1 | 76 | 59 | 0 | 0 | 0 | 0 | 0 - 211 | 16 | 17 | 5 | 3 | 76 | 76 | 43 | 57.008771 | 57.008771 | 16.991229 | 10 | 84 - 212 | 16 | 17 | 6 | 3 | 98 | 98 | 8 | 13.038405 | 97.038405 | 22.961595 | 10 | 130 - 213 | 16 | 17 | 7 | 3 | 75 | 75 | 0 | 16.124515 | 146.124515 | 0 | 10 | 156.124515 - 214 | 16 | 17 | 8 | 6 | 1 | -1 | 0 | 36.055513 | 192.180028 | 0 | 0 | 192.180028 - 215 | 17 | 16 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 216 | 17 | 16 | 2 | 2 | 1 | 69 | 21 | 0 | 0 | 0 | 0 | 0 - 217 | 17 | 16 | 3 | 2 | 1 | 79 | 48 | 0 | 0 | 0 | 0 | 0 - 218 | 17 | 16 | 4 | 2 | 1 | 74 | 53 | 0 | 0 | 0 | 0 | 0 - 219 | 17 | 16 | 5 | 3 | 74 | 74 | 48 | 39.293765 | 39.293765 | 37.706235 | 10 | 87 - 220 | 17 | 16 | 6 | 3 | 79 | 79 | 21 | 7.211103 | 94.211103 | 0 | 10 | 104.211103 - 221 | 17 | 16 | 7 | 3 | 69 | 69 | 0 | 32.249031 | 136.460134 | 7.53986600000002 | 10 | 154 - 222 | 17 | 16 | 8 | 6 | 1 | -1 | 0 | 10 | 164 | 0 | 0 | 164 - 223 | 18 | 9 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 224 | 18 | 9 | 2 | 2 | 1 | 62 | 9 | 0 | 0 | 0 | 0 | 0 - 225 | 18 | 9 | 3 | 2 | 1 | 37 | 49 | 0 | 0 | 0 | 0 | 0 - 226 | 18 | 9 | 4 | 2 | 1 | 45 | 59 | 0 | 0 | 0 | 0 | 0 - 227 | 18 | 9 | 5 | 3 | 37 | 37 | 19 | 43.011626 | 43.011626 | 0 | 10 | 53.011626 - 228 | 18 | 9 | 6 | 3 | 45 | 45 | 9 | 10.440307 | 63.451933 | 0.548067000000003 | 10 | 74 - 229 | 18 | 9 | 7 | 3 | 62 | 62 | 0 | 19.723083 | 93.723083 | 0 | 10 | 103.723083 - 230 | 18 | 9 | 8 | 6 | 1 | -1 | 0 | 15.811388 | 119.534471 | 0 | 0 | 119.534471 - 231 | 19 | 18 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 232 | 19 | 18 | 2 | 2 | 1 | 91 | 6 | 0 | 0 | 0 | 0 | 0 - 233 | 19 | 18 | 3 | 2 | 1 | 12 | 46 | 0 | 0 | 0 | 0 | 0 - 234 | 19 | 18 | 4 | 3 | 12 | 12 | 6 | 33.526109 | 33.526109 | 25.473891 | 10 | 69 - 235 | 19 | 18 | 5 | 3 | 91 | 91 | 0 | 29.832868 | 98.832868 | 0 | 10 | 108.832868 - 236 | 19 | 18 | 6 | 6 | 1 | -1 | 0 | 4.242641 | 113.075509 | 0 | 0 | 113.075509 - 237 | 20 | 20 | 1 | 1 | 1 | -1 | 0 | 0 | 0 | 0 | 0 | 0 - 238 | 20 | 20 | 2 | 2 | 1 | 83 | 9 | 0 | 0 | 0 | 0 | 0 - 239 | 20 | 20 | 3 | 3 | 83 | 83 | 0 | 14.764823 | 14.764823 | 27.235177 | 10 | 52 - 240 | 20 | 20 | 4 | 6 | 1 | -1 | 0 | 14.764823 | 66.764823 | 0 | 0 | 66.764823 - 241 | -2 | 0 | 0 | -1 | -1 | -1 | -1 | 2304.305537 | -1 | 408.022775 | 1000 | 3712.328312 -(241 rows) - -ROLLBACK; -ROLLBACK diff --git a/tools/sql-update-scripts/pgrouting--2.0.0--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.0.0--2.5.0.sql index 77a4c52bc1e..0ca8e590d54 100644 --- a/tools/sql-update-scripts/pgrouting--2.0.0--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.0.0--2.5.0.sql @@ -3275,10 +3275,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3304,25 +3304,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3345,6 +3345,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.0.1--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.0.1--2.5.0.sql index 5e24b26db7a..7eb9c63794b 100644 --- a/tools/sql-update-scripts/pgrouting--2.0.1--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.0.1--2.5.0.sql @@ -3275,10 +3275,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3304,25 +3304,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3345,6 +3345,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.1.0--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.1.0--2.5.0.sql index f8b1b018302..9dc961f37ea 100644 --- a/tools/sql-update-scripts/pgrouting--2.1.0--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.1.0--2.5.0.sql @@ -3373,10 +3373,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3402,25 +3402,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3443,6 +3443,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.2.0--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.2.0--2.5.0.sql index d9d11c57fbb..b99df5d9cee 100644 --- a/tools/sql-update-scripts/pgrouting--2.2.0--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.2.0--2.5.0.sql @@ -3227,10 +3227,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3256,25 +3256,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3297,6 +3297,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.2.1--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.2.1--2.5.0.sql index 97e1c4fdc7a..d862cd2f35f 100644 --- a/tools/sql-update-scripts/pgrouting--2.2.1--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.2.1--2.5.0.sql @@ -3227,10 +3227,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3256,25 +3256,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3297,6 +3297,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.2.2--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.2.2--2.5.0.sql index b4dd4452516..46c969c7113 100644 --- a/tools/sql-update-scripts/pgrouting--2.2.2--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.2.2--2.5.0.sql @@ -3227,10 +3227,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3256,25 +3256,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3297,6 +3297,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.2.3--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.2.3--2.5.0.sql index f92fae39915..7620e31dea3 100644 --- a/tools/sql-update-scripts/pgrouting--2.2.3--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.2.3--2.5.0.sql @@ -3227,10 +3227,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3256,25 +3256,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3297,6 +3297,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.2.4--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.2.4--2.5.0.sql index a274311f61c..a8b850ccf1a 100644 --- a/tools/sql-update-scripts/pgrouting--2.2.4--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.2.4--2.5.0.sql @@ -3227,10 +3227,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3256,25 +3256,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3297,6 +3297,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.3.0--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.3.0--2.5.0.sql index 5ba554d4799..f74fc62c981 100644 --- a/tools/sql-update-scripts/pgrouting--2.3.0--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.3.0--2.5.0.sql @@ -3261,10 +3261,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3290,25 +3290,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3331,6 +3331,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.3.1--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.3.1--2.5.0.sql index 7af43034960..3b2a1f058f2 100644 --- a/tools/sql-update-scripts/pgrouting--2.3.1--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.3.1--2.5.0.sql @@ -3261,10 +3261,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3290,25 +3290,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3331,6 +3331,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.3.2--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.3.2--2.5.0.sql index 354dd7cad70..5559e36e296 100644 --- a/tools/sql-update-scripts/pgrouting--2.3.2--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.3.2--2.5.0.sql @@ -3261,10 +3261,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3290,25 +3290,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3331,6 +3331,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.4.0--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.4.0--2.5.0.sql index 18a3b00ad2c..9bd89b86c8f 100644 --- a/tools/sql-update-scripts/pgrouting--2.4.0--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.4.0--2.5.0.sql @@ -3222,10 +3222,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3251,25 +3251,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3292,6 +3292,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.4.1--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.4.1--2.5.0.sql index c20bd128643..a5ddc04255f 100644 --- a/tools/sql-update-scripts/pgrouting--2.4.1--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.4.1--2.5.0.sql @@ -3222,10 +3222,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3251,25 +3251,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3292,6 +3292,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description diff --git a/tools/sql-update-scripts/pgrouting--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.5.0.sql index abd90131360..4fa168d69af 100644 --- a/tools/sql-update-scripts/pgrouting--2.5.0.sql +++ b/tools/sql-update-scripts/pgrouting--2.5.0.sql @@ -3125,10 +3125,10 @@ CREATE OR REPLACE FUNCTION pgr_pickDeliverEuclidean ( CREATE OR REPLACE FUNCTION _pgr_vrpOneDepot( - customers_sql TEXT, - vehicles_sql TEXT, + TEXT, -- customers_sql + TEXT, -- vehicles_sql TEXT, -- matrix_sql - depot_id INTEGER, + INTEGER, -- depot_id OUT seq INTEGER, OUT vehicle_seq INTEGER, @@ -3154,25 +3154,25 @@ final_sql TEXT; BEGIN orders_sql = $$WITH - vrp_orders AS ($$ || customers_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), pickups AS ( SELECT id, x AS p_x, y AS p_y, open_time AS p_open, close_time AS p_close, service_time AS p_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vrp_orders.id AS id, order_unit AS demand, pickups.id AS p_node_id, p_x, p_y, p_open, p_close, p_service, vrp_orders.id AS d_node_id, x AS d_x, y AS d_y, open_time AS d_open, close_time AS d_close, service_time AS d_service FROM vrp_orders, pickups - WHERE vrp_orders.id != $$ || depot_id; + WHERE vrp_orders.id != $$ || $4; trucks_sql = $$ WITH - vrp_orders AS ($$ || customers_sql || $$ ), - vrp_vehicles AS ($$ || vehicles_sql || $$ ), + vrp_orders AS ($$ || $1 || $$ ), + vrp_vehicles AS ($$ || $2 || $$ ), starts AS ( SELECT id AS start_node_id, x AS start_x, y AS start_y, open_time AS start_open, close_time AS start_close, service_time AS start_service FROM vrp_orders - WHERE id = $$ || depot_id || $$ + WHERE id = $$ || $4 || $$ ) SELECT vehicle_id AS id, capacity, starts.* FROM vrp_vehicles, starts; $$; @@ -3195,6 +3195,7 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; + ----------------------------------------------------------------------- -- Core function for vrp with sigle depot computation -- See README for description