From 5d7c23c62ad7a82eb19e05de6e6245fe93d1f735 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 27 Sep 2013 15:01:25 +0200 Subject: [PATCH] graph format now canonical --- Util/GraphLoader.h | 13 +++++-------- createHierarchy.cpp | 9 ++++++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Util/GraphLoader.h b/Util/GraphLoader.h index 23fd40236..58e59e2c4 100644 --- a/Util/GraphLoader.h +++ b/Util/GraphLoader.h @@ -426,20 +426,17 @@ unsigned readHSGRFromStream( } unsigned number_of_nodes = 0; - hsgr_input_stream.read((char*) check_sum, sizeof(unsigned)); - hsgr_input_stream.read((char*) & number_of_nodes, sizeof(unsigned)); + unsigned number_of_edges = 0; + hsgr_input_stream.read( (char*) check_sum, sizeof(unsigned) ); + hsgr_input_stream.read( (char*) &number_of_nodes, sizeof(unsigned) ); BOOST_ASSERT_MSG( 0 != number_of_nodes, "number of nodes is zero"); + hsgr_input_stream.read( (char*) &number_of_edges, sizeof(unsigned) ); + BOOST_ASSERT_MSG( 0 != number_of_edges, "number of edges is zero"); node_list.resize(number_of_nodes + 1); hsgr_input_stream.read( (char*) &(node_list[0]), number_of_nodes*sizeof(NodeT) ); - unsigned number_of_edges = 0; - hsgr_input_stream.read( - (char*) &number_of_edges, - sizeof(unsigned) - ); - BOOST_ASSERT_MSG( 0 != number_of_edges, "number of edges is zero"); edge_list.resize(number_of_edges); hsgr_input_stream.read( diff --git a/createHierarchy.cpp b/createHierarchy.cpp index e771b6980..74ce9a4d7 100644 --- a/createHierarchy.cpp +++ b/createHierarchy.cpp @@ -304,12 +304,15 @@ int main (int argc, char *argv[]) { "no. of nodes dont match" ); - //Serialize numberOfNodes, nodes + //serialize crc32, aka checksum hsgr_output_stream.write((char*) &crc32OfNodeBasedEdgeList, sizeof(unsigned)); + //serialize number f nodes hsgr_output_stream.write((char*) &numberOfNodes, sizeof(unsigned)); - hsgr_output_stream.write((char*) &_nodes[0], sizeof(StaticGraph::_StrNode)*(numberOfNodes)); - //Serialize number of Edges + //serialize number of edges hsgr_output_stream.write((char*) &position, sizeof(unsigned)); + //serialize all nodes + hsgr_output_stream.write((char*) &_nodes[0], sizeof(StaticGraph::_StrNode)*(numberOfNodes)); + //serialize all edges --numberOfNodes; edge = 0; int usedEdgeCounter = 0;