Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

lib/graph: move identifiers into classes

Browse source
This commit is contained in:
Daniel Krebs 2018-01-30 19:08:55 +01:00
parent bd4f547e97
commit 201bbde4b6
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
fpga/include/villas/directed_graph.hpp
View file

@ -15,8 +15,6 @@ namespace villas {
namespace graph {
// use vector indices as identifiers
using VertexIdentifier = std::size_t;
using EdgeIdentifier = std::size_t;
// forward declarations
class Edge;
@ -28,13 +26,16 @@ class Vertex {
friend class DirectedGraph;
public:
using Identifier = std::size_t;
bool
operator==(const Vertex& other)
{ return this->id == other.id; }
private:
VertexIdentifier id;
std::list<EdgeIdentifier> edges;
Identifier id;
// HACK: how to resolve this circular type dependency?
std::list<std::size_t> edges;
};
@ -43,14 +44,16 @@ class Edge {
friend class DirectedGraph;
public:
using Identifier = std::size_t;
bool
operator==(const Edge& other)
{ return this->id == other.id; }
private:
EdgeIdentifier id;
VertexIdentifier from;
VertexIdentifier to;
Identifier id;
Vertex::Identifier from;
Vertex::Identifier to;
};
@ -58,6 +61,9 @@ template<typename VertexType = Vertex, typename EdgeType = Edge>
class DirectedGraph {
public:
using VertexIdentifier = Vertex::Identifier;
using EdgeIdentifier = Edge::Identifier;
DirectedGraph(const std::string& name = "DirectedGraph") :
lastVertexId(0), lastEdgeId(0)
{