Changeset 2467:2025a571895e in lemon-0.x for lemon/graph_reader.h

Timestamp:

08/28/07 16:00:42 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3305

Message:

PathNodeIt?

PathWriter/Reader? structures
Distinict MapSet? readers and writers

File:

• lemon/graph_reader.h (modified) (20 diffs)

lemon/graph_reader.h

@@ -325 +325 @@
     /// it. It is possible only if there was read a "label" named edge map.
     void readLabel(std::istream& is, Edge& edge) const {
-      return edgeset_reader.readLabel(is, edge);
+      edgeset_reader.readLabel(is, edge);
     } 
 
@@ -444 +444 @@
       : reader(new LemonReader(_is)), own_reader(true), skipper(_skipper),
         nodeset_reader(*reader, _graph, std::string(), skipper),
-        u_edgeset_reader(*reader, _graph, nodeset_reader, 
+        uedgeset_reader(*reader, _graph, nodeset_reader, 
                              std::string(), skipper),
         node_reader(*reader, nodeset_reader, std::string()),
-        u_edge_reader(*reader, u_edgeset_reader, std::string()),
+        uedge_reader(*reader, uedgeset_reader, std::string()),
         attribute_reader(*reader, std::string()) {}
 
@@ -459 +459 @@
         skipper(_skipper),
         nodeset_reader(*reader, _graph, std::string(), skipper),
-        u_edgeset_reader(*reader, _graph, nodeset_reader, 
+        uedgeset_reader(*reader, _graph, nodeset_reader, 
                              std::string(), skipper),
         node_reader(*reader, nodeset_reader, std::string()),
-        u_edge_reader(*reader, u_edgeset_reader, std::string()),
+        uedge_reader(*reader, uedgeset_reader, std::string()),
         attribute_reader(*reader, std::string()) {}
 
@@ -473 +473 @@
       : reader(_reader), own_reader(false), skipper(_skipper),
         nodeset_reader(*reader, _graph, std::string(), skipper),
-        u_edgeset_reader(*reader, _graph, nodeset_reader, 
+        uedgeset_reader(*reader, _graph, nodeset_reader, 
                              std::string(), skipper),
         node_reader(*reader, nodeset_reader, std::string()),
-        u_edge_reader(*reader, u_edgeset_reader, std::string()),
+        uedge_reader(*reader, uedgeset_reader, std::string()),
         attribute_reader(*reader, std::string()) {}
 
@@ -534 +534 @@
     template <typename Map>
     UGraphReader& readUEdgeMap(std::string name, Map& map) { 
-      u_edgeset_reader.readUEdgeMap(name, map);
+      uedgeset_reader.readUEdgeMap(name, map);
       return *this;
     }
@@ -540 +540 @@
     template <typename Map>
     UGraphReader& readUEdgeMap(std::string name, const Map& map) { 
-      u_edgeset_reader.readUEdgeMap(name, map);
+      uedgeset_reader.readUEdgeMap(name, map);
       return *this;
     }
@@ -551 +551 @@
     UGraphReader& readUEdgeMap(std::string name, Map& map,
                                const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.readUEdgeMap(name, map, ir);
+      uedgeset_reader.readUEdgeMap(name, map, ir);
       return *this;
     }
@@ -558 +558 @@
     UGraphReader& readUEdgeMap(std::string name, const Map& map,
                                const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.readUEdgeMap(name, map, ir);
+      uedgeset_reader.readUEdgeMap(name, map, ir);
       return *this;
     }
@@ -568 +568 @@
     UGraphReader& skipUEdgeMap(std::string name,
                                        const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.skipUMap(name, ir);
+      uedgeset_reader.skipUMap(name, ir);
       return *this;
     }
@@ -578 +578 @@
     template <typename Map>
     UGraphReader& readEdgeMap(std::string name, Map& map) { 
-      u_edgeset_reader.readEdgeMap(name, map);
+      uedgeset_reader.readEdgeMap(name, map);
       return *this;
     }
@@ -584 +584 @@
     template <typename Map>
     UGraphReader& readEdgeMap(std::string name, const Map& map) { 
-      u_edgeset_reader.readEdgeMap(name, map);
+      uedgeset_reader.readEdgeMap(name, map);
       return *this;
     }
@@ -595 +595 @@
     UGraphReader& readEdgeMap(std::string name, Map& map,
                               const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.readEdgeMap(name, map, ir);
+      uedgeset_reader.readEdgeMap(name, map, ir);
       return *this;
     }
@@ -602 +602 @@
     UGraphReader& readEdgeMap(std::string name, const Map& map,
                               const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.readEdgeMap(name, map, ir);
+      uedgeset_reader.readEdgeMap(name, map, ir);
       return *this;
     }
@@ -612 +612 @@
     UGraphReader& skipEdgeMap(std::string name,
                               const ItemReader& ir = ItemReader()) {
-      u_edgeset_reader.skipEdgeMap(name, ir);
+      uedgeset_reader.skipEdgeMap(name, ir);
       return *this;
     }
@@ -628 +628 @@
     /// Give a new labeled edge reading command to the reader.
     UGraphReader& readEdge(std::string name, Edge& edge) {
-      u_edge_reader.readEdge(name, edge);
+      uedge_reader.readEdge(name, edge);
     }
 
@@ -636 +636 @@
     /// Give a new labeled undirected edge reading command to the reader.
     UGraphReader& readUEdge(std::string name, UEdge& edge) {
-      u_edge_reader.readUEdge(name, edge);
+      uedge_reader.readUEdge(name, edge);
     }
 
@@ -678 +678 @@
     /// \brief Returns true if the reader can give back the items by its label.
     ///
-    /// \brief Returns true if the reader can give back the items by its label.
+    /// Returns true if the reader can give back the items by its label.
     bool isLabelReader() const {
       return nodeset_reader.isLabelReader() && 
-        u_edgeset_reader.isLabelReader();
+        uedgeset_reader.isLabelReader();
     }
 
@@ -697 +697 @@
     /// it. It is possible only if there was read a "label" named edge map.
     void readLabel(std::istream& is, Edge& edge) const {
-      return u_edgeset_reader.readLabel(is, edge);
+      return uedgeset_reader.readLabel(is, edge);
     } 
 
@@ -706 +706 @@
     /// edge map.
     void readLabel(std::istream& is, UEdge& uedge) const {
-      return u_edgeset_reader.readLabel(is, uedge);
+      return uedgeset_reader.readLabel(is, uedge);
     } 
     
@@ -718 +718 @@
 
     NodeSetReader<Graph, ReaderTraits> nodeset_reader;
-    UEdgeSetReader<Graph, ReaderTraits> u_edgeset_reader;
+    UEdgeSetReader<Graph, ReaderTraits> uedgeset_reader;
 
     NodeReader<Graph> node_reader;
-    UEdgeReader<Graph> u_edge_reader;
+    UEdgeReader<Graph> uedge_reader;
     
     AttributeReader<ReaderTraits> attribute_reader;