# HG changeset patch
# User Peter Kovacs <kpeter@inf.elte.hu>
# Date 1225541535 -3600
# Node ID c4c933e05fc0edcd43c69cdcb171e48b08767b37
# Parent 95df249983db52dd0401545d246b6f5eb3b5c7d5
Improvement for the nauty reader
diff --git a/lemon/nauty_reader.h b/lemon/nauty_reader.h
a
|
b
|
|
35 | 35 | /// |
36 | 36 | /// The \e geng program is in the \e gtools suite of the nauty |
37 | 37 | /// package. This tool can generate all non-isomorphic undirected |
38 | | /// graphs with given node number from several classes (for example, |
| 38 | /// graphs of several classes with given node number (e.g. |
39 | 39 | /// general, connected, biconnected, triangle-free, 4-cycle-free, |
40 | 40 | /// bipartite and graphs with given edge number and degree |
41 | | /// constraints). This function reads a \e nauty \e graph6 \e format |
| 41 | /// constraints). This function reads a \e nauty \e graph \e format |
42 | 42 | /// line from the given stream and builds it in the given graph. |
43 | 43 | /// |
44 | 44 | /// The site of nauty package: http://cs.anu.edu.au/~bdm/nauty/ |
45 | 45 | /// |
46 | | /// For example, the number of all non-isomorphic connected graphs |
47 | | /// can be computed with following code. |
| 46 | /// For example, the number of all non-isomorphic planar graphs |
| 47 | /// can be computed with the following code. |
48 | 48 | ///\code |
49 | 49 | /// int num = 0; |
50 | 50 | /// SmartGraph graph; |
… |
… |
|
56 | 56 | ///\endcode |
57 | 57 | /// |
58 | 58 | /// The nauty files are quite huge, therefore instead of the direct |
59 | | /// file generation the pipelining is recommended. |
| 59 | /// file generation pipelining is recommended. For example, |
60 | 60 | ///\code |
61 | | /// ./geng -c 10 | ./num_of_pg |
| 61 | /// ./geng -c 10 | ./num_of_planar_graphs |
62 | 62 | ///\endcode |
63 | 63 | template <typename Graph> |
64 | | std::istream& readNauty(Graph& graph, std::istream& is) { |
| 64 | std::istream& readNauty(Graph& graph, std::istream& is = std::cin) { |
65 | 65 | graph.clear(); |
66 | 66 | |
67 | 67 | std::string line; |