Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions include/boost/graph/adj_list_serialize.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ namespace serialization
const unsigned int /* file_version */
)
{
typedef adjacency_list< OEL, VL, D, VP, EP, GP, EL > Graph;
typedef typename graph_traits< Graph >::vertex_descriptor Vertex;
using Graph = adjacency_list< OEL, VL, D, VP, EP, GP, EL >;
using Vertex = typename graph_traits< Graph >::vertex_descriptor;

int V = num_vertices(graph);
int E = num_edges(graph);
unsigned int V = num_vertices(graph);
unsigned int E = num_edges(graph);
ar << BOOST_SERIALIZATION_NVP(V);
ar << BOOST_SERIALIZATION_NVP(E);

// assign indices to vertices
std::map< Vertex, int > indices;
int num = 0;
std::map< Vertex, size_t > indices;
size_t num = 0;
BGL_FORALL_VERTICES_T(v, graph, Graph)
{
indices[v] = num++;
Expand Down Expand Up @@ -81,17 +81,16 @@ namespace serialization
const unsigned int /* file_version */
)
{
typedef adjacency_list< OEL, VL, D, VP, EP, GP, EL > Graph;
typedef typename graph_traits< Graph >::vertex_descriptor Vertex;
typedef typename graph_traits< Graph >::edge_descriptor Edge;
using Graph = adjacency_list< OEL, VL, D, VP, EP, GP, EL >;
using Vertex = typename graph_traits< Graph >::vertex_descriptor;

unsigned int V;
ar >> BOOST_SERIALIZATION_NVP(V);
unsigned int E;
ar >> BOOST_SERIALIZATION_NVP(E);

std::vector< Vertex > verts(V);
int i = 0;
size_t i = 0;
while (V-- > 0)
{
Vertex v = add_vertex(graph);
Expand All @@ -101,13 +100,12 @@ namespace serialization
}
while (E-- > 0)
{
int u;
int v;
Vertex u;
Vertex v;
ar >> BOOST_SERIALIZATION_NVP(u);
ar >> BOOST_SERIALIZATION_NVP(v);
Edge e;
bool inserted;
boost::tie(e, inserted) = add_edge(verts[u], verts[v], graph);

auto [e, inserted] = add_edge(verts[u], verts[v], graph);
ar >> serialization::make_nvp(
"edge_property", get(edge_all_t(), graph, e));
}
Expand Down