Changes in / [183:0c6556a8e105:178:d2bac07f1742] in lemon-main

File:

• lemon/lgf_reader.h (modified) (12 diffs)

lemon/lgf_reader.h

@@ -2071 +2071 @@
   /// \ingroup lemon_io
   ///
-  /// \brief Reader for the contents of the \ref lgf-format "LGF" file 
+  /// \brief Reader for the content of the \ref lgf-format "LGF" file 
   ///
   /// This class can be used to read the sections, the map names and
@@ -2077 +2077 @@
   /// that, which type of graph, which maps and which attributes
   /// should be read from a file, but in general tools (like glemon)
-  /// the contents of an LGF file should be guessed somehow. This class
+  /// the content of an LGF file should be guessed somehow. This class
   /// reads the graph and stores the appropriate information for
   /// reading the graph.
   ///
-  ///\code LgfContents contents("graph.lgf"); 
-  /// contents.run();
+  ///\code LgfContent content("graph.lgf"); 
+  /// content.run();
   ///
   /// // does it contain any node section and arc section
-  /// if (contents.nodeSectionNum() == 0 || contents.arcSectionNum()) {
+  /// if (content.nodeSectionNum() == 0 || content.arcSectionNum()) {
   ///   std::cerr << "Failure, cannot find graph" << std::endl;
   ///   return -1;
   /// }
   /// std::cout << "The name of the default node section : " 
-  ///           << contents.nodeSection(0) << std::endl;
+  ///           << content.nodeSection(0) << std::endl;
   /// std::cout << "The number of the arc maps : " 
-  ///           << contents.arcMaps(0).size() << std::endl;
+  ///           << content.arcMaps(0).size() << std::endl;
   /// std::cout << "The name of second arc map : " 
-  ///           << contents.arcMaps(0)[1] << std::endl;
+  ///           << content.arcMaps(0)[1] << std::endl;
   ///\endcode
-  class LgfContents {    
+  class LgfContent {    
   private:
 
@@ -2122 +2122 @@
     /// \brief Constructor
     ///
-    /// Construct an \e LGF contents reader, which reads from the given
+    /// Construct an \e LGF content reader, which reads from the given
     /// input stream.
-    LgfContents(std::istream& is) 
+    LgfContent(std::istream& is) 
       : _is(&is), local_is(false) {}
 
     /// \brief Constructor
     ///
-    /// Construct an \e LGF contents reader, which reads from the given
+    /// Construct an \e LGF content reader, which reads from the given
     /// file.
-    LgfContents(const std::string& fn) 
+    LgfContent(const std::string& fn) 
       : _is(new std::ifstream(fn.c_str())), local_is(true) {}
 
     /// \brief Constructor
     ///
-    /// Construct an \e LGF contents reader, which reads from the given
+    /// Construct an \e LGF content reader, which reads from the given
     /// file.
-    LgfContents(const char* fn)
+    LgfContent(const char* fn)
       : _is(new std::ifstream(fn)), local_is(true) {}
 
@@ -2145 +2145 @@
     /// The copy constructor transfers all data from the other reader,
     /// therefore the copied reader will not be usable more. 
-    LgfContents(LgfContents& other)
+    LgfContent(LgfContent& other)
       : _is(other._is), local_is(other.local_is) {
       
@@ -2164 +2164 @@
     
     /// \brief Destructor
-    ~LgfContents() {
+    ~LgfContent() {
       if (local_is) delete _is;
     }
@@ -2189 +2189 @@
     ///
     /// Gives back the node maps for the given section.
-    const std::vector<std::string>& nodeMapNames(int i) const {
+    const std::vector<std::string>& nodeMaps(int i) const {
       return _node_maps[i];
     }
@@ -2195 +2195 @@
     /// @}
 
-    /// \name Arc/Edge sections 
+    /// \name Arc sections 
     /// @{
 
-    /// \brief Gives back the number of arc/edge sections in the file.
-    ///
-    /// Gives back the number of arc/edge sections in the file.
-    /// \note It is synonym of \c edgeSectionNum().
+    /// \brief Gives back the number of arc sections in the file.
+    ///
+    /// Gives back the number of arc sections in the file.
+    /// \note It is synonim of \c edgeSectionNum().
     int arcSectionNum() const {
       return _edge_sections.size();
@@ -2209 +2209 @@
     ///
     /// Returns the section name at the given position. 
-    /// \note It is synonym of \c edgeSection().
+    /// \note It is synonim of \c edgeSection().
     const std::string& arcSection(int i) const {
       return _edge_sections[i];
     }
 
-    /// \brief Gives back the arc/edge maps for the given section.
-    ///
-    /// Gives back the arc/edge maps for the given section.
-    /// \note It is synonym of \c edgeMapNames().
-    const std::vector<std::string>& arcMapNames(int i) const {
+    /// \brief Gives back the arc maps for the given section.
+    ///
+    /// Gives back the arc maps for the given section.
+    /// \note It is synonim of \c edgeMaps().
+    const std::vector<std::string>& arcMaps(int i) const {
       return _edge_maps[i];
     }
 
+    /// \brief Returns true when the section type is \c "@arcs".
+    ///
+    /// Returns true when the section type is \c "@arcs", and not "@edges".
+    bool isArcSection(int i) const {
+      return _arc_sections[i];
+    }
+
     /// @}
 
-    /// \name Synonyms
+    /// \name Edge sections   
     /// @{
 
-    /// \brief Gives back the number of arc/edge sections in the file.
-    ///
-    /// Gives back the number of arc/edge sections in the file.
-    /// \note It is synonym of \c arcSectionNum().
+    /// \brief Gives back the number of edge sections in the file.
+    ///
+    /// Gives back the number of edge sections in the file.
     int edgeSectionNum() const {
       return _edge_sections.size();
@@ -2238 +2244 @@
     ///
     /// Returns the section name at the given position. 
-    /// \note It is synonym of \c arcSection().
     const std::string& edgeSection(int i) const {
       return _edge_sections[i];
@@ -2246 +2251 @@
     ///
     /// Gives back the edge maps for the given section.
-    /// \note It is synonym of \c arcMapNames().
-    const std::vector<std::string>& edgeMapNames(int i) const {
+    const std::vector<std::string>& edgeMaps(int i) const {
       return _edge_maps[i];
+    }
+
+    /// \brief Returns true when the section type is \c "@edges".
+    ///
+    /// Returns true when the section type is \c "@edges", and not "@arcs".
+    bool isEdgeSection(int i) const {
+      return !_arc_sections[i];
     }
 
@@ -2266 +2277 @@
     ///
     /// Returns the section name at the given position. 
-    const std::string& attributeSectionNames(int i) const {
+    const std::string& attributeSection(int i) const {
       return _attribute_sections[i];
     }
@@ -2349 +2360 @@
   public:
 
-    /// \name Execution of the contents reader    
+    /// \name Execution of the content reader    
     /// @{