Loads the edge based graph edges and constructs a dynamic graph from it

This commit is contained in:
Daniel J. Hofmann
2017-02-03 16:03:11 +01:00
committed by Patrick Niklaus
parent e0665856b0
commit 3e409bea26
5 changed files with 232 additions and 8 deletions
-2
View File
@@ -105,8 +105,6 @@ template <typename EdgeDataT> class DynamicGraph
}
}
~DynamicGraph() {}
unsigned GetNumberOfNodes() const { return number_of_nodes; }
unsigned GetNumberOfEdges() const { return number_of_edges; }
@@ -1,5 +1,5 @@
#ifndef STATIC_GRAPH_TRAITS_HPP
#define STATIC_GRAPH_TRAITS_HPP
#ifndef OSRM_GRAPH_TRAITS_HPP
#define OSRM_GRAPH_TRAITS_HPP
#include <type_traits>
@@ -31,14 +31,14 @@ struct HasTargetMember<T, decltype((void)(sizeof(std::declval<T>().target) > 0))
{
};
// Static Graph requires edges to have a .target and .data member attribute
// Our graphs require edges to have a .target and .data member attribute
template <typename Edge>
struct HasDataAndTargetMember
: std::integral_constant<bool, HasDataMember<Edge>::value && HasTargetMember<Edge>::value>
{
};
// Static Graph requires nodes to have a .first_edge member attribute
// Our graphs require nodes to have a .first_edge member attribute
template <typename T, typename = void> struct HasFirstEdgeMember : std::false_type
{
};
+1 -1
View File
@@ -1,10 +1,10 @@
#ifndef STATIC_GRAPH_HPP
#define STATIC_GRAPH_HPP
#include "util/graph_traits.hpp"
#include "util/integer_range.hpp"
#include "util/percent.hpp"
#include "util/shared_memory_vector_wrapper.hpp"
#include "util/static_graph_traits.hpp"
#include "util/typedefs.hpp"
#include <boost/assert.hpp>