author Alpar Juttner Wed, 05 Nov 2008 08:11:44 +0000 changeset 362 51597950d0fe parent 361 f58410582b9b parent 359 0eec1736ff1d child 363 a637fb9d457b
Merge
```     1.1 --- a/lemon/nauty_reader.h	Tue Nov 04 21:37:59 2008 +0100
1.2 +++ b/lemon/nauty_reader.h	Wed Nov 05 08:11:44 2008 +0000
1.3 @@ -38,7 +38,7 @@
1.4    /// graphs of several classes with given node number (e.g.
1.5    /// general, connected, biconnected, triangle-free, 4-cycle-free,
1.6    /// bipartite and graphs with given edge number and degree
1.7 -  /// constraints). This function reads a \e nauty \e graph \e format
1.8 +  /// constraints). This function reads a \e nauty \e graph6 \e format
1.9    /// line from the given stream and builds it in the given graph.
1.10    ///
1.11    /// The site of nauty package: http://cs.anu.edu.au/~bdm/nauty/
1.12 @@ -48,7 +48,7 @@
1.13    ///\code
1.14    /// int num = 0;
1.15    /// SmartGraph graph;
1.16 -  /// while (readNauty(graph, std::cin)) {
1.17 +  /// while (readNautyGraph(graph, std::cin)) {
1.18    ///   PlanarityChecking<SmartGraph> pc(graph);
1.19    ///   if (pc.run()) ++num;
1.20    /// }
1.21 @@ -61,7 +61,7 @@
1.22    /// ./geng -c 10 | ./num_of_planar_graphs
1.23    ///\endcode
1.24    template <typename Graph>
1.25 -  std::istream& readNauty(Graph& graph, std::istream& is = std::cin) {
1.26 +  std::istream& readNautyGraph(Graph& graph, std::istream& is = std::cin) {
1.27      graph.clear();
1.28
1.29      std::string line;
```
```     2.1 --- a/tools/lemon-0.x-to-1.x.sh	Tue Nov 04 21:37:59 2008 +0100
2.2 +++ b/tools/lemon-0.x-to-1.x.sh	Wed Nov 05 08:11:44 2008 +0000
2.3 @@ -90,6 +90,7 @@
2.4          -e "s/\<StoreBoolMap\>/LoggerBoolMap/g"\
2.5          -e "s/\<storeBoolMap\>/loggerBoolMap/g"\
2.6          -e "s/\<BoundingBox\>/Box/g"\