[transitiveClosure] Add id to sql.

nike0good · nike0good · commit 74c29815ea7e · 2019-08-03T00:39:24.000+08:00
diff --git a/sql/transitiveClosure/_transitiveClosure.sql b/sql/transitiveClosure/_transitiveClosure.sql
@@ -33,6 +33,7 @@ CREATE OR REPLACE FUNCTION _pgr_transitiveClosure(
     edges_sql TEXT,
 
     OUT seq INTEGER,
+    OUT id BIGINT,
     OUT target_array BIGINT[])
 RETURNS SETOF RECORD AS
 'MODULE_PATHNAME', 'transitiveClosure'
diff --git a/sql/transitiveClosure/transitiveClosure.sql b/sql/transitiveClosure/transitiveClosure.sql
@@ -33,6 +33,7 @@ CREATE OR REPLACE FUNCTION pgr_transitiveClosure(
     edges_sql TEXT, -- edges_sql (required)
 
     OUT seq INTEGER,
+    OUT id BIGINT,
     OUT target_array BIGINT[])
 RETURNS SETOF RECORD AS
 $BODY$
diff --git a/src/transitiveClosure/transitiveClosure_driver.cpp b/src/transitiveClosure/transitiveClosure_driver.cpp
@@ -47,36 +47,14 @@ static void process_transitiveClosure(
         std::ostringstream &log,
         std::ostringstream &err) {
     graph.insert_edges(edges);
-    /*
-     * this check does not ignore vertices ids that do not belong to the graph
-     */
-
-#ifndef NDEBUG
-    log << "Before contraction\n";
-    graph.print_graph(log);
-#endif
 
     /*
      * Function call to get the contracted graph.
      */
-    pgrouting::contraction::Pgr_contract<G> result(graph,
-            forbid_vertices,
-            contraction_order,
-            max_cycles, remaining_vertices,
+    pgrouting::ransitiveClosure::Pgr_transitiveClosure<G> result(graph,
+            remaining_vertices,
             shortcut_edges, log);
 
-#ifndef NDEBUG
-    log << "After contraction\n";
-    log << graph;
-    log << "Remaining Vertices:" << "\n";
-    for (const auto vertex : remaining_vertices) {
-        log << vertex << "\n";
-    }
-    log << "Added Edges:" << "\n";
-    for (const auto edge : shortcut_edges) {
-        log << edge << "\n";
-    }
-#endif
 }
 
 template <typename G>
