Changeset 1901:723b2b81d900 in lemon-0.x for lemon/graph_reader.h

Timestamp:

01/24/06 17:07:38 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Lemon Graph Format uses label instead of id named map.

File:

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

lemon/graph_reader.h

@@ -68 +68 @@
   /// reader.readNodeMap("coords", coords);
   ///
-  /// reader.readNodeMap<QuotedStringReader>("label", labelMap);
-  /// reader.skipNodeMap<QuotedStringReader>("description");
+  /// reader.skipNodeMap("description", desc);
   ///
   /// reader.readNodeMap("color", colorMap);
@@ -307 +306 @@
     }
 
-    /// \brief Gives back the node by its id.
-    ///
-    /// It reads an id from the stream and gives back which node belongs to
-    /// it. It is possible only if there was read an "id" named node map.
-    Node readId(std::istream& is, Node) const {
-      return nodeset_reader.readId(is, Node());
+
+    /// \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.
+    bool isLabelReader() const {
+      return nodeset_reader.isLabelReader() && edgeset_reader.isLabelReader();
+    }
+
+    /// \brief Gives back the node by its label.
+    ///
+    /// It reads an label from the stream and gives back which node belongs to
+    /// it. It is possible only if there was read an "label" named node map.
+    void readLabel(std::istream& is, Node& node) const {
+      nodeset_reader.readLabel(is, node);
     } 
 
-    /// \brief Gives back the edge by its id.
-    ///
-    /// It reads an id from the stream and gives back which edge belongs to
-    /// it. It is possible only if there was read an "id" named edge map.
-    Edge readId(std::istream& is, Edge) const {
-      return edgeset_reader.readId(is, Edge());
+    /// \brief Gives back the edge by its label.
+    ///
+    /// It reads an label from the stream and gives back which edge belongs to
+    /// it. It is possible only if there was read an "label" named edge map.
+    void readLabel(std::istream& is, Edge& edge) const {
+      return edgeset_reader.readLabel(is, edge);
     } 
 
@@ -405 +412 @@
   /// reader.readNodeMap("coords", coords);
   ///
-  /// reader.readNodeMap<QuotedStringReader>("label", labelMap);
-  /// reader.skipNodeMap<QuotedStringReader>("description");
+  /// reader.skipNodeMap("description", desc);
   ///
   /// reader.readNodeMap("color", colorMap);
@@ -705 +711 @@
     }
 
-    /// \brief Gives back the node by its id.
-    ///
-    /// It reads an id from the stream and gives back which node belongs to
-    /// it. It is possible only if there was read an "id" named node map.
-    Node readId(std::istream& is, Node) const {
-      return nodeset_reader.readId(is, Node());
+
+    /// \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.
+    bool isLabelReader() const {
+      return nodeset_reader.isLabelReader() && 
+        undir_edgeset_reader.isLabelReader();
+    }
+
+    /// \brief Gives back the node by its label.
+    ///
+    /// It reads an label from the stream and gives back which node belongs to
+    /// it. It is possible only if there was read an "label" named node map.
+    void readLabel(std::istream& is, Node& node) const {
+      return nodeset_reader.readLabel(is, node);
     } 
 
-    /// \brief Gives back the edge by its id.
-    ///
-    /// It reads an id from the stream and gives back which edge belongs to
-    /// it. It is possible only if there was read an "id" named edge map.
-    Edge readId(std::istream& is, Edge) const {
-      return undir_edgeset_reader.readId(is, Edge());
+    /// \brief Gives back the edge by its label.
+    ///
+    /// It reads an label from the stream and gives back which edge belongs to
+    /// it. It is possible only if there was read an "label" named edge map.
+    void readLabel(std::istream& is, Edge& edge) const {
+      return undir_edgeset_reader.readLabel(is, edge);
     } 
 
-    /// \brief Gives back the undirected edge by its id.
-    ///
-    /// It reads an id from the stream and gives back which undirected edge 
-    /// belongs to it. It is possible only if there was read an "id" named 
+    /// \brief Gives back the undirected edge by its label.
+    ///
+    /// It reads an label from the stream and gives back which undirected edge 
+    /// belongs to it. It is possible only if there was read an "label" named 
     /// edge map.
-    UndirEdge readId(std::istream& is, UndirEdge) const {
-      return undir_edgeset_reader.readId(is, UndirEdge());
+    void readLabel(std::istream& is, UndirEdge& uedge) const {
+      return undir_edgeset_reader.readLabel(is, uedge);
     }