1.1 --- a/lemon/nauty_reader.h	Tue Nov 04 10:21:22 2008 +0000
     1.2 +++ b/lemon/nauty_reader.h	Tue Nov 04 10:25:47 2008 +0000
     1.3 @@ -23,17 +23,10 @@
     1.4  #include <iostream>
     1.5  #include <string>
     1.6  
     1.7 -/// \ingroup io_group
     1.8 -///
     1.9 -/// @defgroup nauty_group NAUTY format
    1.10 -///
    1.11 -/// \brief Read \e Nauty format
    1.12 -///
    1.13 -/// Tool to read graphs from \e Nauty format data
    1.14 -
    1.15  /// \ingroup nauty_group
    1.16  /// \file
    1.17  /// \brief Nauty file reader.
    1.18 +
    1.19  namespace lemon {
    1.20  
    1.21    /// \ingroup nauty_group
    1.22 @@ -42,16 +35,16 @@
    1.23    ///
    1.24    /// The \e geng program is in the \e gtools suite of the nauty
    1.25    /// package. This tool can generate all non-isomorphic undirected
    1.26 -  /// graphs with given node number from several classes (for example,
    1.27 +  /// graphs of several classes with given node number (e.g.
    1.28    /// general, connected, biconnected, triangle-free, 4-cycle-free,
    1.29    /// bipartite and graphs with given edge number and degree
    1.30 -  /// constraints). This function reads a \e nauty \e graph6 \e format
    1.31 +  /// constraints). This function reads a \e nauty \e graph \e format
    1.32    /// line from the given stream and builds it in the given graph.
    1.33    ///
    1.34    /// The site of nauty package: http://cs.anu.edu.au/~bdm/nauty/
    1.35    ///
    1.36 -  /// For example, the number of all non-isomorphic connected graphs
    1.37 -  /// can be computed with following code.
    1.38 +  /// For example, the number of all non-isomorphic planar graphs
    1.39 +  /// can be computed with the following code.
    1.40    ///\code
    1.41    /// int num = 0;
    1.42    /// SmartGraph graph;
    1.43 @@ -63,12 +56,12 @@
    1.44    ///\endcode
    1.45    ///
    1.46    /// The nauty files are quite huge, therefore instead of the direct
    1.47 -  /// file generation the pipelining is recommended.
    1.48 +  /// file generation pipelining is recommended. For example,
    1.49    ///\code
    1.50 -  /// ./geng -c 10 | ./num_of_pg
    1.51 +  /// ./geng -c 10 | ./num_of_planar_graphs
    1.52    ///\endcode
    1.53    template <typename Graph>
    1.54 -  std::istream& readNauty(Graph& graph, std::istream& is) {
    1.55 +  std::istream& readNauty(Graph& graph, std::istream& is = std::cin) {
    1.56      graph.clear();
    1.57  
    1.58      std::string line;