No need for extra translation units (for edge data structures)

2016-01-11 16:29:20 +01:00
parent f875e26fbf
commit fc292cc2d8
3 changed files with 75 additions and 116 deletions
@@ -11,20 +11,46 @@ namespace extractor

 struct NodeBasedEdge
 {
-    bool operator<(const NodeBasedEdge &e) const;
+    bool operator<(const NodeBasedEdge &other) const
+    {
+        if (source == other.source)
+        {
+            if (target == other.target)
+            {
+                if (weight == other.weight)
+                {
+                    return forward && backward && ((!other.forward) || (!other.backward));
+                }
+                return weight < other.weight;
+            }
+            return target < other.target;
+        }
+        return source < other.source;
+    }

-    NodeBasedEdge();
-    explicit NodeBasedEdge(NodeID source,
-                           NodeID target,
-                           NodeID name_id,
-                           EdgeWeight weight,
-                           bool forward,
-                           bool backward,
-                           bool roundabout,
-                           bool access_restricted,
-                           bool startpoint,
-                           TravelMode travel_mode,
-                           bool is_split);
+    NodeBasedEdge()
+        : source(SPECIAL_NODEID), target(SPECIAL_NODEID), name_id(0), weight(0), forward(false),
+          backward(false), roundabout(false), access_restricted(false), startpoint(true),
+          is_split(false), travel_mode(false)
+    {
+    }
+
+    NodeBasedEdge(NodeID source,
+                  NodeID target,
+                  NodeID name_id,
+                  EdgeWeight weight,
+                  bool forward,
+                  bool backward,
+                  bool roundabout,
+                  bool access_restricted,
+                  bool startpoint,
+                  TravelMode travel_mode,
+                  bool is_split)
+        : source(source), target(target), name_id(name_id), weight(weight), forward(forward),
+          backward(backward), roundabout(roundabout), access_restricted(access_restricted),
+          startpoint(startpoint), is_split(is_split), travel_mode(travel_mode)
+    {
+    }

    NodeID source;
    NodeID target;
@@ -75,18 +101,44 @@ struct EdgeBasedEdge
 {

  public:
-    bool operator<(const EdgeBasedEdge &e) const;
+    bool operator<(const EdgeBasedEdge &other) const
+    {
+        if (source == other.source)
+        {
+            if (target == other.target)
+            {
+                if (weight == other.weight)
+                {
+                    return forward && backward && ((!other.forward) || (!other.backward));
+                }
+                return weight < other.weight;
+            }
+            return target < other.target;
+        }
+        return source < other.source;
+    }
+    template <class EdgeT>
+    explicit EdgeBasedEdge(const EdgeT &other)
+        : source(other.source), target(other.target), edge_id(other.data.via),
+          weight(other.data.distance), forward(other.data.forward), backward(other.data.backward)
+    {
+    }

-    template <class EdgeT> explicit EdgeBasedEdge(const EdgeT &myEdge);
+    EdgeBasedEdge() : source(0), target(0), edge_id(0), weight(0), forward(false), backward(false)
+    {
+    }

-    EdgeBasedEdge();
+    EdgeBasedEdge(const NodeID source,
+                  const NodeID target,
+                  const NodeID edge_id,
+                  const EdgeWeight weight,
+                  const bool forward,
+                  const bool backward)
+        : source(source), target(target), edge_id(edge_id), weight(weight), forward(forward),
+          backward(backward)
+    {
+    }

-    explicit EdgeBasedEdge(const NodeID source,
-                           const NodeID target,
-                           const NodeID edge_id,
-                           const EdgeWeight weight,
-                           const bool forward,
-                           const bool backward);
    NodeID source;
    NodeID target;
    NodeID edge_id;