1.1 --- a/lemon/lgf_reader.h Wed Mar 17 12:35:52 2010 +0100
1.2 +++ b/lemon/lgf_reader.h Sat Mar 06 14:35:12 2010 +0000
1.3 @@ -2,7 +2,7 @@
1.4 *
1.5 * This file is a part of LEMON, a generic C++ optimization library.
1.6 *
1.7 - * Copyright (C) 2003-2009
1.8 + * Copyright (C) 2003-2010
1.9 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.10 * (Egervary Research Group on Combinatorial Optimization, EGRES).
1.11 *
1.12 @@ -562,7 +562,7 @@
1.13 template <typename TDGR>
1.14 friend DigraphReader<TDGR> digraphReader(TDGR& digraph, std::istream& is);
1.15 template <typename TDGR>
1.16 - friend DigraphReader<TDGR> digraphReader(TDGR& digraph,
1.17 + friend DigraphReader<TDGR> digraphReader(TDGR& digraph,
1.18 const std::string& fn);
1.19 template <typename TDGR>
1.20 friend DigraphReader<TDGR> digraphReader(TDGR& digraph, const char *fn);
1.21 @@ -1187,14 +1187,14 @@
1.22 /// @}
1.23
1.24 };
1.25 -
1.26 +
1.27 /// \ingroup lemon_io
1.28 ///
1.29 /// \brief Return a \ref DigraphReader class
1.30 ///
1.31 /// This function just returns a \ref DigraphReader class.
1.32 ///
1.33 - /// With this function a digraph can be read from an
1.34 + /// With this function a digraph can be read from an
1.35 /// \ref lgf-format "LGF" file or input stream with several maps and
1.36 /// attributes. For example, there is network flow problem on a
1.37 /// digraph, i.e. a digraph with a \e capacity map on the arcs and
1.38 @@ -1249,7 +1249,7 @@
1.39
1.40 template <typename GR>
1.41 class GraphReader;
1.42 -
1.43 +
1.44 template <typename TGR>
1.45 GraphReader<TGR> graphReader(TGR& graph, std::istream& is = std::cin);
1.46 template <typename TGR>
1.47 @@ -1386,7 +1386,7 @@
1.48 template <typename TGR>
1.49 friend GraphReader<TGR> graphReader(TGR& graph, std::istream& is);
1.50 template <typename TGR>
1.51 - friend GraphReader<TGR> graphReader(TGR& graph, const std::string& fn);
1.52 + friend GraphReader<TGR> graphReader(TGR& graph, const std::string& fn);
1.53 template <typename TGR>
1.54 friend GraphReader<TGR> graphReader(TGR& graph, const char *fn);
1.55
1.56 @@ -2063,9 +2063,9 @@
1.57 ///
1.58 /// \brief Return a \ref GraphReader class
1.59 ///
1.60 - /// This function just returns a \ref GraphReader class.
1.61 + /// This function just returns a \ref GraphReader class.
1.62 ///
1.63 - /// With this function a graph can be read from an
1.64 + /// With this function a graph can be read from an
1.65 /// \ref lgf-format "LGF" file or input stream with several maps and
1.66 /// attributes. For example, there is weighted matching problem on a
1.67 /// graph, i.e. a graph with a \e weight map on the edges. This