From 0d7b77ae21b0949eb819cf4a31aadc76d8589d1c Mon Sep 17 00:00:00 2001 From: rohith Date: Fri, 5 Feb 2016 00:14:34 +0530 Subject: [PATCH 1/2] Cleaning up includes part-2 --- src/contraction/src/contractGraph_driver.cpp | 53 +++++++++++++++----- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/src/contraction/src/contractGraph_driver.cpp b/src/contraction/src/contractGraph_driver.cpp index 15ced80a5de..43f090fe6ad 100644 --- a/src/contraction/src/contractGraph_driver.cpp +++ b/src/contraction/src/contractGraph_driver.cpp @@ -39,6 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "./contractGraph_driver.h" #include "./contract_function.h" +#include "./../../common/src/baseGraph.hpp" // #define DEBUG @@ -64,7 +65,11 @@ do_pgr_contractGraph( size_t *return_count, char ** err_msg){ std::ostringstream log; - std::ostringstream graphnameStream,edgeStream,removedEStream,removedVStream,psuedoEStream; + std::ostringstream graphnameStream; + std::ostringstream edgeStream; + std::ostringstream removedEStream; + std::ostringstream removedVStream; + std::ostringstream psuedoEStream; try { if (total_tuples == 1) { @@ -78,7 +83,6 @@ do_pgr_contractGraph( graphType gType = directed? DIRECTED: UNDIRECTED; const int initial_size = total_tuples; - std::deque< Path >paths; log << "Level" << level << "\n"; if (directed) { log << "Working with directed Graph\n"; @@ -87,7 +91,24 @@ do_pgr_contractGraph( #ifdef DEBUG digraph.print_graph(log); #endif - //pgr_dijkstra(digraph, paths, start_vid, end_vertices, false); + /* + Function call to get the contracted graph. + + fetch_contracted_graph(undigraph,level, + graphnameStream,edgeStream,removedEStream, + removedVStream,psuedoEStream + ); + + (*return_tuples)->contracted_graph_name=graphnameStream.str().c_str(); + (*return_tuples)->contracted_graph_blob=edgeStream.str().c_str(); + (*return_tuples)->removedVertices=removedEStream.str().c_str(); + (*return_tuples)->removedEdges=removedVStream.str().c_str(); + (*return_tuples)->psuedoEdges=psuedoEStream.str().c_str(); + + + */ + + } else { log << "Working with Undirected Graph\n"; Pgr_base_graph< UndirectedGraph > undigraph(gType, initial_size); @@ -95,20 +116,26 @@ do_pgr_contractGraph( #ifdef DEBUG undigraph.print_graph(log); #endif - //pgr_dijkstra(undigraph, paths, start_vid, end_vertices, false); - } - size_t count(count_tuples(paths)); - if (count == 0) { - (*return_tuples) = NULL; - (*return_count) = 0; - log << - "No paths found between Starting and any of the Ending vertices\n"; - *err_msg = strdup(log.str().c_str()); - return; + /* + Function call to get the contracted graph. + + fetch_contracted_graph(undigraph,level, + graphnameStream,edgeStream,removedEStream, + removedVStream,psuedoEStream + ); + (*return_tuples)->contracted_graph_name=graphnameStream.str().c_str(); + (*return_tuples)->contracted_graph_blob=edgeStream.str().c_str(); + (*return_tuples)->removedVertices=removedEStream.str().c_str(); + (*return_tuples)->removedEdges=removedVStream.str().c_str(); + (*return_tuples)->psuedoEdges=psuedoEStream.str().c_str(); + */ + } + + (*return_tuples) = NULL; (*return_count) = 0; #if 0 From 61e51b5dd73e32a47a19488ddbfb3d9a05740a3c Mon Sep 17 00:00:00 2001 From: rohith Date: Fri, 5 Feb 2016 00:36:54 +0530 Subject: [PATCH 2/2] Cleaning up includes part-3 --- src/contraction/src/contractGraph_driver.cpp | 43 ++++++++++---------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/contraction/src/contractGraph_driver.cpp b/src/contraction/src/contractGraph_driver.cpp index 43f090fe6ad..4368705695a 100644 --- a/src/contraction/src/contractGraph_driver.cpp +++ b/src/contraction/src/contractGraph_driver.cpp @@ -65,11 +65,11 @@ do_pgr_contractGraph( size_t *return_count, char ** err_msg){ std::ostringstream log; - std::ostringstream graphnameStream; - std::ostringstream edgeStream; - std::ostringstream removedEStream; - std::ostringstream removedVStream; - std::ostringstream psuedoEStream; + std::ostringstream contracted_graph_name; + std::ostringstream contracted_graph_blob; + std::ostringstream removedEdges; + std::ostringstream removedVertices; + std::ostringstream psuedoEdges; try { if (total_tuples == 1) { @@ -94,16 +94,16 @@ do_pgr_contractGraph( /* Function call to get the contracted graph. - fetch_contracted_graph(undigraph,level, - graphnameStream,edgeStream,removedEStream, - removedVStream,psuedoEStream + fetch_contracted_graph(digraph,level, + contracted_graph_name,contracted_graph_blob,removedEdges, + removedVertices,psuedoEdges ); - - (*return_tuples)->contracted_graph_name=graphnameStream.str().c_str(); - (*return_tuples)->contracted_graph_blob=edgeStream.str().c_str(); - (*return_tuples)->removedVertices=removedEStream.str().c_str(); - (*return_tuples)->removedEdges=removedVStream.str().c_str(); - (*return_tuples)->psuedoEdges=psuedoEStream.str().c_str(); + return_tuples = get_memory (1, pgr_contracted_blob); + return_tuples->contracted_graph_name=strdup(contracted_graph_name.str().c_str()); + return_tuples->contracted_graph_blob=strdup(contracted_graph_blob.str().c_str()); + return_tuples->removedVertices=strdup(removedVertices.str().c_str()); + return_tuples->removedEdges=strdup(removedEdges.str().c_str()); + return_tuples->psuedoEdges=strdup(psuedoEdges.str().c_str()); */ @@ -121,15 +121,16 @@ do_pgr_contractGraph( /* Function call to get the contracted graph. + return_tuples = get_memory (1, pgr_contracted_blob); fetch_contracted_graph(undigraph,level, - graphnameStream,edgeStream,removedEStream, - removedVStream,psuedoEStream + contracted_graph_name,contracted_graph_blob,removedEdges, + removedVertices,psuedoEStream ); - (*return_tuples)->contracted_graph_name=graphnameStream.str().c_str(); - (*return_tuples)->contracted_graph_blob=edgeStream.str().c_str(); - (*return_tuples)->removedVertices=removedEStream.str().c_str(); - (*return_tuples)->removedEdges=removedVStream.str().c_str(); - (*return_tuples)->psuedoEdges=psuedoEStream.str().c_str(); + (return_tuples)->contracted_graph_name=strdup(contracted_graph_name.str().c_str()); + (return_tuples)->contracted_graph_blob=strdup(contracted_graph_blob.str().c_str()); + (return_tuples)->removedVertices=strdup(removedVertices.str().c_str()); + (return_tuples)->removedEdges=strdup(removedEdges.str().c_str()); + (return_tuples)->psuedoEdges=strdup(psuedoEdges.str().c_str()); */ }