Changeset 1394:f0c48d7fa73d in lemon-0.x for src/lemon/graph_reader.h

Timestamp:

04/27/05 12:44:58 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Modifying the interface.
add -> read, write

File:

• src/lemon/graph_reader.h (modified) (12 diffs)

src/lemon/graph_reader.h

@@ -201 +201 @@
   /// \endcode
   ///
-  /// The \c addNodeMap() function reads a map from the \c \@nodeset section.
+  /// The \c readNodeMap() function reads a map from the \c \@nodeset section.
   /// If there is a map that you do not want to read from the file and there is
   /// whitespace in the string represenation of the values then you should
@@ -208 +208 @@
   ///
   /// \code
-  /// reader.addNodeMap("x-coord", xCoordMap);
-  /// reader.addNodeMap("y-coord", yCoordMap);
-  ///
-  /// reader.addNodeMap<QuotedStringReader>("label", labelMap);
+  /// reader.readNodeMap("x-coord", xCoordMap);
+  /// reader.readNodeMap("y-coord", yCoordMap);
+  ///
+  /// reader.readNodeMap<QuotedStringReader>("label", labelMap);
   /// reader.skipNodeMap<QuotedStringReader>("description");
   ///
-  /// reader.addNodeMap("color", colorMap);
+  /// reader.readNodeMap("color", colorMap);
   /// \endcode
   ///
-  /// With the \c addEdgeMap() member function you can give an edge map
+  /// With the \c readEdgeMap() member function you can give an edge map
   /// reading command similar to the NodeMaps. 
   ///
   /// \code
-  /// reader.addEdgeMap("weight", weightMap);
-  /// reader.addEdgeMap("label", labelMap);
+  /// reader.readEdgeMap("weight", weightMap);
+  /// reader.readEdgeMap("label", labelMap);
   /// \endcode
   ///
-  /// With \c addNode() and \c addEdge() functions you can read labeled Nodes 
+  /// With \c readNode() and \c readEdge() functions you can read labeled Nodes 
   /// and Edges.
   ///
   /// \code
-  /// reader.addNode("source", sourceNode);
-  /// reader.addNode("target", targetNode);
-  ///
-  /// reader.addEdge("observed", edge);
+  /// reader.readNode("source", sourceNode);
+  /// reader.readNode("target", targetNode);
+  ///
+  /// reader.readEdge("observed", edge);
   /// \endcode
   ///
@@ -286 +286 @@
     /// Add a new node map reader command for the reader.
     template <typename Map>
-    GraphReader& addNodeMap(std::string name, Map& map) {
-      return addNodeMap<typename ReaderTraits::template 
+    GraphReader& readNodeMap(std::string name, Map& map) {
+      return readNodeMap<typename ReaderTraits::template 
         Reader<typename Map::Value>, Map>(name, map);
     }
@@ -295 +295 @@
     /// Add a new node map reader command for the reader.
     template <typename Reader, typename Map>
-    GraphReader& addNodeMap(std::string name, Map& map, 
+    GraphReader& readNodeMap(std::string name, Map& map, 
                              const Reader& reader = Reader()) {
       if (node_map_readers.find(name) != node_map_readers.end()) {
@@ -327 +327 @@
     /// Add a new edge map reader command for the reader.
     template <typename Map>
-    GraphReader& addEdgeMap(std::string name, Map& map) { 
-      return addEdgeMap<typename ReaderTraits::template
+    GraphReader& readEdgeMap(std::string name, Map& map) { 
+      return readEdgeMap<typename ReaderTraits::template
         Reader<typename Map::Value>, Map>(name, map);
     }
@@ -337 +337 @@
     /// Add a new edge map reader command for the reader.
     template <typename Reader, typename Map>
-    GraphReader& addEdgeMap(std::string name, Map& map,
+    GraphReader& readEdgeMap(std::string name, Map& map,
                              const Reader& reader = Reader()) {
       if (edge_map_readers.find(name) != edge_map_readers.end()) {
@@ -368 +368 @@
     ///
     /// Add a new labeled node reader for the reader.
-    GraphReader& addNode(std::string name, Node& node) {
+    GraphReader& readNode(std::string name, Node& node) {
       if (node_readers.find(name) != node_readers.end()) {
         ErrorMessage msg;
@@ -381 +381 @@
     ///
     /// Add a new labeled edge reader for the reader.
-    GraphReader& addEdge(std::string name, Edge& edge) {
+    GraphReader& readEdge(std::string name, Edge& edge) {
       if (edge_readers.find(name) != edge_readers.end()) {
         ErrorMessage msg;
@@ -755 +755 @@
                   CostMap& cost) {
     GraphReader<Graph> reader(is, g);
-    reader.addEdgeMap("capacity", capacity);
-    reader.addEdgeMap("cost", cost);
-    reader.addNode("source", s);
-    reader.addNode("target", t);
+    reader.readEdgeMap("capacity", capacity);
+    reader.readEdgeMap("cost", cost);
+    reader.readNode("source", s);
+    reader.readNode("target", t);
     reader.run();
   }
@@ -774 +774 @@
                   typename Graph::Node &s, typename Graph::Node &t) {
     GraphReader<Graph> reader(is, g);
-    reader.addEdgeMap("capacity", capacity);
-    reader.addNode("source", s);
-    reader.addNode("target", t);
+    reader.readEdgeMap("capacity", capacity);
+    reader.readNode("source", s);
+    reader.readNode("target", t);
     reader.run();
   }
@@ -791 +791 @@
                   typename Graph::Node &s) {
     GraphReader<Graph> reader(is, g);
-    reader.addEdgeMap("capacity", capacity);
-    reader.addNode("source", s);
+    reader.readEdgeMap("capacity", capacity);
+    reader.readNode("source", s);
     reader.run();
   }
@@ -805 +805 @@
   void readGraph(std::istream& is, Graph &g, CapacityMap& capacity) {
     GraphReader<Graph> reader(is, g);
-    reader.addEdgeMap("capacity", capacity);
+    reader.readEdgeMap("capacity", capacity);
     reader.run();
   }