1.1 --- a/lemon/lgf_reader.h Tue Jun 17 12:28:49 2008 +0100
1.2 +++ b/lemon/lgf_reader.h Wed Jun 18 12:39:20 2008 +0100
1.3 @@ -2070,32 +2070,32 @@
1.4
1.5 /// \ingroup lemon_io
1.6 ///
1.7 - /// \brief Reader for the content of the \ref lgf-format "LGF" file
1.8 + /// \brief Reader for the contents of the \ref lgf-format "LGF" file
1.9 ///
1.10 /// This class can be used to read the sections, the map names and
1.11 /// the attributes from a file. Usually, the Lemon programs know
1.12 /// that, which type of graph, which maps and which attributes
1.13 /// should be read from a file, but in general tools (like glemon)
1.14 - /// the content of an LGF file should be guessed somehow. This class
1.15 + /// the contents of an LGF file should be guessed somehow. This class
1.16 /// reads the graph and stores the appropriate information for
1.17 /// reading the graph.
1.18 ///
1.19 - ///\code LgfContent content("graph.lgf");
1.20 - /// content.run();
1.21 + ///\code LgfContents contents("graph.lgf");
1.22 + /// contents.run();
1.23 ///
1.24 /// // does it contain any node section and arc section
1.25 - /// if (content.nodeSectionNum() == 0 || content.arcSectionNum()) {
1.26 + /// if (contents.nodeSectionNum() == 0 || contents.arcSectionNum()) {
1.27 /// std::cerr << "Failure, cannot find graph" << std::endl;
1.28 /// return -1;
1.29 /// }
1.30 /// std::cout << "The name of the default node section : "
1.31 - /// << content.nodeSection(0) << std::endl;
1.32 + /// << contents.nodeSection(0) << std::endl;
1.33 /// std::cout << "The number of the arc maps : "
1.34 - /// << content.arcMaps(0).size() << std::endl;
1.35 + /// << contents.arcMaps(0).size() << std::endl;
1.36 /// std::cout << "The name of second arc map : "
1.37 - /// << content.arcMaps(0)[1] << std::endl;
1.38 + /// << contents.arcMaps(0)[1] << std::endl;
1.39 ///\endcode
1.40 - class LgfContent {
1.41 + class LgfContents {
1.42 private:
1.43
1.44 std::istream* _is;
1.45 @@ -2121,30 +2121,30 @@
1.46
1.47 /// \brief Constructor
1.48 ///
1.49 - /// Construct an \e LGF content reader, which reads from the given
1.50 + /// Construct an \e LGF contents reader, which reads from the given
1.51 /// input stream.
1.52 - LgfContent(std::istream& is)
1.53 + LgfContents(std::istream& is)
1.54 : _is(&is), local_is(false) {}
1.55
1.56 /// \brief Constructor
1.57 ///
1.58 - /// Construct an \e LGF content reader, which reads from the given
1.59 + /// Construct an \e LGF contents reader, which reads from the given
1.60 /// file.
1.61 - LgfContent(const std::string& fn)
1.62 + LgfContents(const std::string& fn)
1.63 : _is(new std::ifstream(fn.c_str())), local_is(true) {}
1.64
1.65 /// \brief Constructor
1.66 ///
1.67 - /// Construct an \e LGF content reader, which reads from the given
1.68 + /// Construct an \e LGF contents reader, which reads from the given
1.69 /// file.
1.70 - LgfContent(const char* fn)
1.71 + LgfContents(const char* fn)
1.72 : _is(new std::ifstream(fn)), local_is(true) {}
1.73
1.74 /// \brief Copy constructor
1.75 ///
1.76 /// The copy constructor transfers all data from the other reader,
1.77 /// therefore the copied reader will not be usable more.
1.78 - LgfContent(LgfContent& other)
1.79 + LgfContents(LgfContents& other)
1.80 : _is(other._is), local_is(other.local_is) {
1.81
1.82 other._is = 0;
1.83 @@ -2163,7 +2163,7 @@
1.84 }
1.85
1.86 /// \brief Destructor
1.87 - ~LgfContent() {
1.88 + ~LgfContents() {
1.89 if (local_is) delete _is;
1.90 }
1.91
1.92 @@ -2359,7 +2359,7 @@
1.93
1.94 public:
1.95
1.96 - /// \name Execution of the content reader
1.97 + /// \name Execution of the contents reader
1.98 /// @{
1.99
1.100 /// \brief Start the reading