add edge_id attr to DGraphEdge for #90

UrbanAnalyst · Oct 16, 2019 · 710f15c · 710f15c
1 parent 880cd4c
commit 710f15c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/src/centrality.cpp b/src/centrality.cpp
@@ -17,7 +17,7 @@ void inst_graph (std::shared_ptr<DGraph> g, unsigned int nedges,
     {
         unsigned int fromi = vert_map.at(from [i]);
         unsigned int toi = vert_map.at(to [i]);
-        g->addNewEdge (fromi, toi, dist [i], wt [i]);
+        g->addNewEdge (fromi, toi, dist [i], wt [i], i);
     }
 }
 // # nocov end

diff --git a/src/dgraph.cpp b/src/dgraph.cpp
@@ -67,11 +67,12 @@ void DGraph::initVertices()
  * with a corresponding distance of dist.
  */
 void DGraph::addNewEdge(unsigned int source, unsigned int target,
-        double dist, double wt)
+        double dist, double wt, unsigned int edge_id)
 {
     DGraphEdge *newEdge = new DGraphEdge;
     newEdge->source = source;
     newEdge->target = target;
+    newEdge->edge_id = edge_id;
     newEdge->dist = dist;
     newEdge->wt = wt;
     newEdge->nextOut = nullptr;

diff --git a/src/dgraph.h b/src/dgraph.h
@@ -22,7 +22,7 @@
  */
 class DGraphEdge {
     public:
-        unsigned int source, target;
+        unsigned int source, target, edge_id; // edge_id only used in centrality
         double dist, wt;
         DGraphEdge *nextOut, *nextIn;
 };
@@ -69,7 +69,7 @@ class DGraph {
 
         void clear();
         void addNewEdge(unsigned int srcVertexNo, unsigned int destVertexNo,
-                double dist, double wt);
+                double dist, double wt, unsigned int edge_id);
         bool edgeExists(unsigned int v, unsigned int w) const;
         bool reachable(unsigned int s) const;
         void print() const;

diff --git a/src/flows.cpp b/src/flows.cpp
@@ -17,7 +17,7 @@ void inst_graph (std::shared_ptr<DGraph> g, unsigned int nedges,
     {
         unsigned int fromi = vert_map.at(from [i]);
         unsigned int toi = vert_map.at(to [i]);
-        g->addNewEdge (fromi, toi, dist [i], wt [i]);
+        g->addNewEdge (fromi, toi, dist [i], wt [i], i);
     }
 }
 

diff --git a/src/run_sp.cpp b/src/run_sp.cpp
@@ -17,7 +17,7 @@ void inst_graph (std::shared_ptr<DGraph> g, unsigned int nedges,
     {
         unsigned int fromi = vert_map.at(from [i]);
         unsigned int toi = vert_map.at(to [i]);
-        g->addNewEdge (fromi, toi, dist [i], wt [i]);
+        g->addNewEdge (fromi, toi, dist [i], wt [i], i);
     }
 }
 // # nocov end