prepared directory for withPoints

Author: cvvergara

src/common/src/baseGraph.hpp

@@ -148,9 +148,78 @@ class Pgr_base_graph {
      //! @name Graph Modification
      //@{
      //! Used for storing the removed_edges
-     std::deque<pgr_edge_t> removed_edges;
+     std::deque<boost_edge_t> removed_edges;
+
+     //! Used for storing modified edges because of adding points
+     // TODO
+#if 0
+     std::deque<boost_edge_t> modified_edges;
+     std::deque< Point_on_edge > points;
+     // map to get wich boost edge was modified
+     std::map < int64_t, int64_t >;
+#endif
      //@}
 
+#if 0
+     void add_point(Point_on_edge &point, int driving) {
+         // we have:
+         // point.point_id
+         // point.edge_id
+         // point.fraction
+         // Look for the edge in modified edges
+         //
+         // Driving: 0: doesnt matter (both), 1) right, 2) left
+         bool found = false;
+         int64_t edge_to_modify = 0;
+         for (const auto &edge : modified_edges) {
+             if (point.edge_id == edge.id) {
+                 found = true;
+                 break;
+             }
+             ++edge_to_modify;
+         }
+
+         //was not there so look for it in the graph
+         if (!found) {
+             E_i edge_ptr, edges_end;
+             for (boost::tie(edge_ptr, edges_end) = edges(graph);
+                     edge_ptr != edges_end; ++edge_ptr) {
+                 if (point.edge_id == edge_ptr->id) {
+                     modified_edges.push_back(*edge_ptr);
+                     boost::remove_edge(edge_ptr, graph);
+                     //delete the edge from the graph
+                     found = true;
+                     break;
+                 }
+             }
+         }
+
+         // add the point
+         int64_t vertex_id = -(points.size() + 1);
+         point.vertex_id = vertex_id;
+         points.push_back(point);
+
+         // add the vertex
+         LI vm_s;
+         vm_s = vertices_map.find(vertex_id);
+         if (vm_s == vertices_map.end()) {
+             vertices_map[vertex_id]=  m_num_vertices;
+             gVertices_map[m_num_vertices++] = vertex_id;
+             vm_s = vertices_map.find(vertex_id);
+         }
+
+         if (!found) {
+             // the vertex remains disconnected
+             // because the edge was not found
+             return;
+         }
+         
+     }
+#endif
+
+
+
+
 
      //! @name The Graph
      //@{
@@ -190,7 +259,7 @@ class Pgr_base_graph {
      void disconnect_edge(int64_t p_from, int64_t p_to) {
          V g_from;
          V g_to;
-         pgr_edge_t d_edge;
+         boost_edge_t d_edge;
          // nothing to do, the vertex doesnt exist
          if (!get_gVertex(p_from, g_from)) return;
          if (!get_gVertex(p_to, g_to)) return;
@@ -203,7 +272,7 @@ class Pgr_base_graph {
                  d_edge.source = graph[source(*out, graph)].id;
                  d_edge.target = graph[target(*out, graph)].id;
                  d_edge.cost = graph[*out].cost;
-                 d_edge.reverse_cost = -1;
+                 //        d_edge.reverse_cost = -1;
                  removed_edges.push_back(d_edge);
              }
          }
@@ -219,8 +288,8 @@ class Pgr_base_graph {
        \returns 0: The out degree of a vertex that its not in the graph
 
        @param [IN] *vertex_id* original vertex id
-     */
-       
+       */
+
 
      degree_size_type out_degree(int64_t vertex_id) const{
          V v_from;
@@ -234,7 +303,7 @@ class Pgr_base_graph {
          return boost::out_degree(v, graph);
      }
      //@}
-     
+
 
      //! \brief Disconnects the outgoing edges with a particular original id from a vertex
      /*!
@@ -247,7 +316,7 @@ class Pgr_base_graph {
        */
      void disconnect_out_going_edge(int64_t vertex_id, int64_t edge_id) {
          V v_from;
-         pgr_edge_t d_edge;
+         boost_edge_t d_edge;
 
          // nothing to do, the vertex doesnt exist
          if (!get_gVertex(vertex_id, v_from)) {
@@ -266,7 +335,7 @@ class Pgr_base_graph {
                      d_edge.source = graph[source(*out, graph)].id;
                      d_edge.target = graph[target(*out, graph)].id;
                      d_edge.cost = graph[*out].cost;
-                     d_edge.reverse_cost = -1;
+                     //        d_edge.reverse_cost = -1;
                      removed_edges.push_back(d_edge);
                      boost::remove_edge((*out), graph);
                      change = true;
@@ -294,7 +363,7 @@ class Pgr_base_graph {
        */
      void disconnect_vertex(int64_t p_vertex) {
          V g_vertex;
-         pgr_edge_t d_edge;
+         boost_edge_t d_edge;
          // nothing to do, the vertex doesnt exist
          if (!get_gVertex(p_vertex, g_vertex)) return;
          EO_i out, out_end;
@@ -305,7 +374,7 @@ class Pgr_base_graph {
              d_edge.source = graph[source(*out, graph)].id;
              d_edge.target = graph[target(*out, graph)].id;
              d_edge.cost = graph[*out].cost;
-             d_edge.reverse_cost = -1;
+             //        d_edge.reverse_cost = -1;
              removed_edges.push_back(d_edge);
          }
 
@@ -318,7 +387,7 @@ class Pgr_base_graph {
                  d_edge.source = graph[source(*in, graph)].id;
                  d_edge.target = graph[target(*in, graph)].id;
                  d_edge.cost = graph[*in].cost;
-                 d_edge.reverse_cost = -1;
+                 //           d_edge.reverse_cost = -1;
                  removed_edges.push_back(d_edge);
              }
          }
@@ -411,6 +480,38 @@ class Pgr_base_graph {
      }
 
  private:
+
+
+     void
+         graph_add_edge(const boost_edge_t &edge ) {
+             bool inserted;
+             LI vm_s, vm_t;
+             E e;
+
+             vm_s = vertices_map.find(edge.source);
+             if (vm_s == vertices_map.end()) {
+                 vertices_map[edge.source]=  m_num_vertices;
+                 gVertices_map[m_num_vertices++] = edge.source;
+                 vm_s = vertices_map.find(edge.source);
+             }
+
+             vm_t = vertices_map.find(edge.target);
+             if (vm_t == vertices_map.end()) {
+                 vertices_map[edge.target]=  m_num_vertices;
+                 gVertices_map[m_num_vertices++] = edge.target;
+                 vm_t = vertices_map.find(edge.target);
+             }
+
+             if (edge.cost >= 0) {
+                 boost::tie(e, inserted) =
+                     boost::add_edge(vm_s->second, vm_t->second, graph);
+                 graph[e].cost = edge.cost;
+                 graph[e].id = edge.id;
+                 graph[e].first = edge.first;
+             }
+
+         }
+
      void
          graph_add_edge(const pgr_edge_t &edge ) {
              bool inserted;
@@ -436,13 +537,15 @@ class Pgr_base_graph {
                      boost::add_edge(vm_s->second, vm_t->second, graph);
                  graph[e].cost = edge.cost;
                  graph[e].id = edge.id;
+                 graph[e].first = true;
              }
 
              if (edge.reverse_cost >= 0) {
                  boost::tie(e, inserted) =
                      boost::add_edge(vm_t->second, vm_s->second, graph);
                  graph[e].cost = edge.reverse_cost;
                  graph[e].id = edge.id;
+                 graph[e].first = false;
              }
          }
 };

src/common/src/pgr_types.h

@@ -109,7 +109,13 @@ typedef struct
 }
 Restrict_t;
 
-
+typedef struct {
+    int64_t point_id;
+    int64_t edge_id;
+    bool right;  // true when the point is on the right of the edge
+    float8 fraction;
+    int64_t vertex_id; // number is negative
+} Point_on_edge;
 
 
 struct boost_vertex_t {
@@ -119,8 +125,9 @@ struct boost_vertex_t {
 struct boost_edge_t{
     int64_t id;
     float8 cost;
-    int64_t source_id;
-    int64_t target_id;
+    int64_t source;
+    int64_t target;
+    bool first;  // true (source, target) false (target, source)
 };
 
 

src/dijkstraViaVertex/src/dijkstraViaVertex.c

@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 /*
   Uncomment when needed
 */
-#define DEBUG
+// #define DEBUG
 
 #include "fmgr.h"
 #include "./../../common/src/debug_macro.h"

src/trsp/sql/CMakeLists.txt

@@ -1,9 +1,9 @@
 # Append in local scope
 list(APPEND PACKAGE_SQL_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/routing_trsp.sql
-    ${CMAKE_CURRENT_SOURCE_DIR}/routing_trsp_vias.sql
-    #${CMAKE_CURRENT_SOURCE_DIR}/vias_trsp_V2.2.sql
-    #${CMAKE_CURRENT_SOURCE_DIR}/trsp_V2.2.sql
+    #${CMAKE_CURRENT_SOURCE_DIR}/routing_trsp.sql
+    #${CMAKE_CURRENT_SOURCE_DIR}/routing_trsp_vias.sql
+    ${CMAKE_CURRENT_SOURCE_DIR}/vias_trsp_V2.2.sql
+    ${CMAKE_CURRENT_SOURCE_DIR}/trsp_V2.2.sql
     )
 
 # set in parent scope

src/trsp/test/from1to3.test.sql

@@ -88,7 +88,6 @@ BEGIN;
     SELECT set_eq('q21','q22','3: Directed: without retrictions returns the same as pgr_dijkstra');
     SELECT set_eq('q31','q32','4: Directed: with retrictions returns expected path');
 
-    -- Finish the tests and clean up.
 
 
 

src/trsp/test/from3to4-directed.result

@@ -0,0 +1,4 @@
+1..3
+ok 1 - 1: No path from 1 to 1
+ok 2 - 2: without retrictions returns the same as pgr_dijkstra
+ok 3 - 3: with retrictions returns expected path

src/trsp/test/from3to4-directed.test.sql

@@ -0,0 +1,87 @@
+/*PGR-GNU*****************************************************************
+
+Copyright (c) 2015 pgRouting developers
+Mail: project@pgrouting.org
+
+------
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+********************************************************************PGR-GNU*/
+
+\set ECHO none
+\set QUIET 1
+-- Turn off echo and keep things quiet.
+
+-- Format the output for nice TAP.
+\pset format unaligned
+\pset tuples_only true
+\pset pager
+\set VERBOSITY terse
+
+-- Revert all changes on failure.
+\set ON_ERROR_ROLLBACK true
+\set ON_ERROR_STOP true
+\set QUIET 1
+
+BEGIN;
+    SELECT plan(3);
+
+    UPDATE edge_table SET cost = cost + 0.001 * id * id, reverse_cost = reverse_cost + 0.001 * id * id;
+
+
+    PREPARE q1 AS
+    SELECT * from pgr_trsp(
+        'select id as id, source::integer, target::integer,cost, reverse_cost from edge_table',
+        1, 1,
+        true, true);
+
+    PREPARE q21 AS
+    SELECT seq, id1, id2, cost::text from pgr_trsp(
+        'select id as id, source::integer, target::integer,cost, reverse_cost from edge_table',
+        3, 4,
+        true, true);
+        
+    PREPARE q22 AS
+    SELECT seq-1, node::INTEGER, edge::INTEGER, cost::text from pgr_dijkstra(
+        'select id as id, source::integer, target::integer,cost, reverse_cost from edge_table',
+        3, 4, true);
+
+    PREPARE q31 AS
+    SELECT seq, id1, id2, cost::text from pgr_trsp(
+        'select id as id, source::integer, target::integer,cost, reverse_cost from edge_table',
+        3, 4,
+        true, true,
+        'select 9::INTEGER as target_id, ''5''::TEXT as via_path,  100.2::FLOAT to_cost');
+
+    PREPARE q32 AS
+    SELECT (row_number() over() -1)::INTEGER, node::INTEGER, 
+                        (CASE WHEN edge = -2 THEN -1 ELSE edge END)::INTEGER, cost::text
+        FROM pgr_dijkstraViaVertex(
+        'select id as id, source::integer, target::integer,cost, reverse_cost from edge_table',
+        ARRAY[3, 2, 4],
+        true) where edge != -1;
+
+
+    SELECT is_empty('q1', '1: No path from 1 to 1');
+    SELECT set_eq('q21','q22','2: without retrictions returns the same as pgr_dijkstra');
+    SELECT set_eq('q31','q32','3: with retrictions returns expected path');
+
+    -- Finish the tests and clean up.
+
+    SELECT * FROM finish();
+
+
+    ROLLBACK