Changeset 2200:2f2ac1b1ca1e in lemon-0.x for lemon/graph_reader.h

Timestamp:

09/06/06 12:01:15 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

An easy avoiding of a bug

The functional interfaces are removed.
Better solution could be a reference counted core of the io interfaces

Now it is huge work so just write that:

GraphReader?<ListGraph?>(std::cin, graph).

Instead of:

graphReader(std::cin, graph).

File:

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

lemon/graph_reader.h

@@ -345 +345 @@
 
 
-  /// \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>
-  GraphReader<Graph> graphReader(std::istream& is, Graph &g) {
-    return GraphReader<Graph>(is, g);
-  }
-
-  /// \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.
-  template<typename Graph>
-  GraphReader<Graph> graphReader(const std::string& fn, Graph &g) {
-    return GraphReader<Graph>(fn, g);
-  }
-
   /// \brief The undirected graph reader class.
   ///
@@ -756 +726 @@
   };
 
-  /// \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 UGraphReader 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>
-  UGraphReader<Graph> uGraphReader(std::istream& is, Graph &g) {
-    return GraphReader<Graph>(is, g);
-  }
-
-  /// \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 UGraphReader 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.
-  template<typename Graph>
-  UGraphReader<Graph> uGraphReader(const std::string& fn, Graph &g) {
-    return GraphReader<Graph>(fn, g);
-  }
 
   /// @}