Changes in / [369:3fb8ed1322de:368:99f1bdf8f7db] in lemon

Files:

• doc/groups.dox (modified) (2 diffs)
• lemon/nauty_reader.h (modified) (3 diffs)

doc/groups.dox

@@ -465 +465 @@
 
 /**
-@defgroup lemon_io LEMON Graph Format
+@defgroup lemon_io LEMON Input-Output
 @ingroup io_group
 \brief Reading and writing LEMON Graph Format.
@@ -480 +480 @@
 This group describes general \c EPS drawing methods and special
 graph exporting tools.
-*/
-
-/**
-@defgroup nauty_group NAUTY Format
-@ingroup io_group
-\brief Read \e Nauty format
-Tool to read graphs from \e Nauty format data.
 */
 

lemon/nauty_reader.h

@@ -24 +24 @@
 #include <string>
 
+/// \ingroup io_group
+///
+/// @defgroup nauty_group NAUTY format
+///
+/// \brief Read \e Nauty format
+///
+/// Tool to read graphs from \e Nauty format data
+
 /// \ingroup nauty_group
 /// \file
 /// \brief Nauty file reader.
-
 namespace lemon {
 
@@ -36 +43 @@
   /// The \e geng program is in the \e gtools suite of the nauty
   /// package. This tool can generate all non-isomorphic undirected
-  /// graphs of several classes with given node number (e.g.
+  /// graphs with given node number from several classes (for example,
   /// general, connected, biconnected, triangle-free, 4-cycle-free,
   /// bipartite and graphs with given edge number and degree
-  /// constraints). This function reads a \e nauty \e graph \e format
+  /// constraints). This function reads a \e nauty \e graph6 \e format
   /// line from the given stream and builds it in the given graph.
   ///
   /// The site of nauty package: http://cs.anu.edu.au/~bdm/nauty/
   ///
-  /// For example, the number of all non-isomorphic planar graphs
-  /// can be computed with the following code.
+  /// For example, the number of all non-isomorphic connected graphs
+  /// can be computed with following code.
   ///\code
   /// int num = 0;
@@ -57 +64 @@
   ///
   /// The nauty files are quite huge, therefore instead of the direct
-  /// file generation pipelining is recommended. For example,
+  /// file generation the pipelining is recommended.
   ///\code
-  /// ./geng -c 10 | ./num_of_planar_graphs
+  /// ./geng -c 10 | ./num_of_pg
   ///\endcode
   template <typename Graph>
-  std::istream& readNauty(Graph& graph, std::istream& is = std::cin) {
+  std::istream& readNauty(Graph& graph, std::istream& is) {
     graph.clear();