Changeset 1744:51d5d41e15b1 in lemon-0.x for lemon/graph_reader.h

Timestamp:

10/26/05 13:09:29 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Removing old input/output functions

File:

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

lemon/graph_reader.h

@@ -340 +340 @@
 
 
-  ///\anchor readGraph()
-  ///
-  /// \brief Read a graph from an input stream.
-  ///
-  /// Read a graph from an input stream.
+  /// \brief Read a graph from the input.
+  ///
+  /// It is a helper function to read a graph from the given input
+  /// stream. It gives back an GraphReader object and this object
+  /// can read more maps, labeled nodes, edges and attributes.
+  ///
+  /// \warning Do not forget to call the \c run() function.
+  ///
   /// \param is The input stream.
   /// \param g The graph.
   template<typename Graph>
-  void readGraph(std::istream& is, Graph &g) {
-    GraphReader<Graph> reader(is, g);
-    reader.run();
+  GraphReader<Graph> graphReader(std::istream& is, Graph &g) {
+    return GraphReader<Graph>(is, g);
   }
 
-  /// \brief Read a capacitated graph instance from an input stream.
-  /// 
-  /// Read a capacitated graph (graph+capacity on the
-  /// edges) from an input stream.
-  /// \param is The input stream.
+  /// \brief Read a graph from the input.
+  ///
+  /// It is a helper function to read a graph from the given input
+  /// file. It gives back an GraphReader object and this object
+  /// can read more maps, labeled nodes, edges and attributes.
+  ///
+  /// \warning Do not forget to call the \c run() function.
+  ///
+  /// \param fn The input filename.
   /// \param g The graph.
-  /// \param capacity The capacity map.
-  template<typename Graph, typename CapacityMap>
-  void readGraph(std::istream& is, Graph &g, CapacityMap& capacity) {
-    GraphReader<Graph> reader(is, g);
-    reader.readEdgeMap("capacity", capacity);
-    reader.run();
+  template<typename Graph>
+  GraphReader<Graph> graphReader(const std::string& fn, Graph &g) {
+    return GraphReader<Graph>(fn, g);
   }
 
-  /// \brief Read a shortest path instance from an input stream.
-  /// 
-  /// Read a shortest path instance (graph+capacity on the
-  /// edges+designated source) from an input stream.
-  /// \param is The input stream.
-  /// \param g The graph.
-  /// \param capacity The capacity map.
-  /// \param s The source node.
-  template<typename Graph, typename CapacityMap>
-  void readGraph(std::istream& is, Graph &g, CapacityMap& capacity, 
-                  typename Graph::Node &s) {
-    GraphReader<Graph> reader(is, g);
-    reader.readEdgeMap("capacity", capacity);
-    reader.readNode("source", s);
-    reader.run();
-  }
-
-
-
-  /// \brief Read a max flow instance from an input stream.
-  ///
-  /// Read a max flow instance (graph+capacity on the
-  /// edges+designated source and target) from an input stream.
-  ///
-  /// \param is The input stream.
-  /// \param g The graph.
-  /// \param capacity The capacity map.
-  /// \param s The source node.
-  /// \param t The target node.
-  template<typename Graph, typename CapacityMap>
-  void readGraph(std::istream& is, Graph &g, CapacityMap& capacity, 
-                  typename Graph::Node &s, typename Graph::Node &t) {
-    GraphReader<Graph> reader(is, g);
-    reader.readEdgeMap("capacity", capacity);
-    reader.readNode("source", s);
-    reader.readNode("target", t);
-    reader.run();
-  }
-
-  /// \brief Read a min cost flow instance from an input stream.
-  ///
-  /// Read a min cost flow instance (graph+capacity on the edges+cost
-  /// function on the edges+designated source and target) from an input stream.
-  ///
-  /// \param is The input stream.
-  /// \param g The graph.
-  /// \param capacity The capacity map.
-  /// \param s The source node.
-  /// \param t The target node.
-  /// \param cost The cost map.
-  template<typename Graph, typename CapacityMap, typename CostMap>
-  void readGraph(std::istream& is, Graph &g, CapacityMap& capacity, 
-                  typename Graph::Node &s, typename Graph::Node &t, 
-                  CostMap& cost) {
-    GraphReader<Graph> reader(is, g);
-    reader.readEdgeMap("capacity", capacity);
-    reader.readEdgeMap("cost", cost);
-    reader.readNode("source", s);
-    reader.readNode("target", t);
-    reader.run();
-  }
-
-
-  /// \brief The undir graph reader class.
+  /// \brief The undirected graph reader class.
   ///
   /// The \c UndirGraphReader class provides the graph input. 
@@ -807 +747 @@
   };
 
-  /// \brief Read an undirected graph from an input stream.
-  ///
-  /// Read an undirected graph from an input stream.
+  /// \brief Read an undirected graph from the input.
+  ///
+  /// It is a helper function to read an undirected graph from the given input
+  /// stream. It gives back an UndirGraphReader object and this object
+  /// can read more maps, labeled nodes, edges, undirected edges and
+  /// attributes.
+  ///
+  /// \warning Do not forget to call the \c run() function.
+  ///
   /// \param is The input stream.
   /// \param g The graph.
   template<typename Graph>
-  void readUndirGraph(std::istream& is, Graph &g) {
-    UndirGraphReader<Graph> reader(is, g);
-    reader.run();
+  UndirGraphReader<Graph> undirGraphReader(std::istream& is, Graph &g) {
+    return GraphReader<Graph>(is, g);
   }
 
-  /// \brief Read an undirected multigraph (undirected graph + capacity
-  /// map on the edges) from an input stream.
-  ///
-  /// Read an undirected multigraph (undirected graph + capacity
-  /// map on the edges) from an input stream.
-  /// \param is The input stream.
+  /// \brief Read an undirected graph from the input.
+  ///
+  /// It is a helper function to read an undirected graph from the given input
+  /// file. It gives back an UndirGraphReader object and this object
+  /// can read more maps, labeled nodes, edges, undirected edges and 
+  /// attributes.
+  ///
+  /// \warning Do not forget to call the \c run() function.
+  ///
+  /// \param fn The input filename.
   /// \param g The graph.
-  /// \param capacity The capacity map.
-  template<typename Graph, typename CapacityMap>
-  void readUndirGraph(std::istream& is, Graph &g, CapacityMap& capacity) {
-    UndirGraphReader<Graph> reader(is, g);
-    reader.readUndirEdgeMap("capacity", capacity);
-    reader.run();
+  template<typename Graph>
+  UndirGraphReader<Graph> undirGraphReader(const std::string& fn, Graph &g) {
+    return GraphReader<Graph>(fn, g);
   }
-
 
   /// @}