1.1 --- a/doc/groups.dox	Tue Nov 04 10:21:22 2008 +0000
     1.2 +++ b/doc/groups.dox	Tue Nov 04 10:25:47 2008 +0000
     1.3 @@ -464,7 +464,7 @@
     1.4  */
     1.5  
     1.6  /**
     1.7 -@defgroup lemon_io LEMON Input-Output
     1.8 +@defgroup lemon_io LEMON Graph Format
     1.9  @ingroup io_group
    1.10  \brief Reading and writing LEMON Graph Format.
    1.11  
    1.12 @@ -482,6 +482,13 @@
    1.13  */
    1.14  
    1.15  /**
    1.16 +@defgroup nauty_group NAUTY Format
    1.17 +@ingroup io_group
    1.18 +\brief Read \e Nauty format
    1.19 +Tool to read graphs from \e Nauty format data.
    1.20 +*/
    1.21 +
    1.22 +/**
    1.23  @defgroup concept Concepts
    1.24  \brief Skeleton classes and concept checking classes
    1.25  

     2.1 --- a/lemon/nauty_reader.h	Tue Nov 04 10:21:22 2008 +0000
     2.2 +++ b/lemon/nauty_reader.h	Tue Nov 04 10:25:47 2008 +0000
     2.3 @@ -23,17 +23,10 @@
     2.4  #include <iostream>
     2.5  #include <string>
     2.6  
     2.7 -/// \ingroup io_group
     2.8 -///
     2.9 -/// @defgroup nauty_group NAUTY format
    2.10 -///
    2.11 -/// \brief Read \e Nauty format
    2.12 -///
    2.13 -/// Tool to read graphs from \e Nauty format data
    2.14 -
    2.15  /// \ingroup nauty_group
    2.16  /// \file
    2.17  /// \brief Nauty file reader.
    2.18 +
    2.19  namespace lemon {
    2.20  
    2.21    /// \ingroup nauty_group
    2.22 @@ -42,16 +35,16 @@
    2.23    ///
    2.24    /// The \e geng program is in the \e gtools suite of the nauty
    2.25    /// package. This tool can generate all non-isomorphic undirected
    2.26 -  /// graphs with given node number from several classes (for example,
    2.27 +  /// graphs of several classes with given node number (e.g.
    2.28    /// general, connected, biconnected, triangle-free, 4-cycle-free,
    2.29    /// bipartite and graphs with given edge number and degree
    2.30 -  /// constraints). This function reads a \e nauty \e graph6 \e format
    2.31 +  /// constraints). This function reads a \e nauty \e graph \e format
    2.32    /// line from the given stream and builds it in the given graph.
    2.33    ///
    2.34    /// The site of nauty package: http://cs.anu.edu.au/~bdm/nauty/
    2.35    ///
    2.36 -  /// For example, the number of all non-isomorphic connected graphs
    2.37 -  /// can be computed with following code.
    2.38 +  /// For example, the number of all non-isomorphic planar graphs
    2.39 +  /// can be computed with the following code.
    2.40    ///\code
    2.41    /// int num = 0;
    2.42    /// SmartGraph graph;
    2.43 @@ -63,12 +56,12 @@
    2.44    ///\endcode
    2.45    ///
    2.46    /// The nauty files are quite huge, therefore instead of the direct
    2.47 -  /// file generation the pipelining is recommended.
    2.48 +  /// file generation pipelining is recommended. For example,
    2.49    ///\code
    2.50 -  /// ./geng -c 10 | ./num_of_pg
    2.51 +  /// ./geng -c 10 | ./num_of_planar_graphs
    2.52    ///\endcode
    2.53    template <typename Graph>
    2.54 -  std::istream& readNauty(Graph& graph, std::istream& is) {
    2.55 +  std::istream& readNauty(Graph& graph, std::istream& is = std::cin) {
    2.56      graph.clear();
    2.57  
    2.58      std::string line;