[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/51597950d0fe
changeset: 374:51597950d0fe
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Wed Nov 05 08:11:44 2008 +0000
description:
	Merge

diffstat:

2 files changed, 4 insertions(+), 3 deletions(-)
lemon/nauty_reader.h      |    6 +++---
tools/lemon-0.x-to-1.x.sh |    1 +

diffs (41 lines):

diff -r f58410582b9b -r 51597950d0fe lemon/nauty_reader.h
--- a/lemon/nauty_reader.h	Tue Nov 04 21:37:59 2008 +0100
+++ b/lemon/nauty_reader.h	Wed Nov 05 08:11:44 2008 +0000
@@ -38,7 +38,7 @@
   /// graphs of several classes with given node number (e.g.
   /// 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/
@@ -48,7 +48,7 @@
   ///\code
   /// int num = 0;
   /// SmartGraph graph;
-  /// while (readNauty(graph, std::cin)) {
+  /// while (readNautyGraph(graph, std::cin)) {
   ///   PlanarityChecking<SmartGraph> pc(graph);
   ///   if (pc.run()) ++num;
   /// }
@@ -61,7 +61,7 @@
   /// ./geng -c 10 | ./num_of_planar_graphs
   ///\endcode
   template <typename Graph>
-  std::istream& readNauty(Graph& graph, std::istream& is = std::cin) {
+  std::istream& readNautyGraph(Graph& graph, std::istream& is = std::cin) {
     graph.clear();
 
     std::string line;
diff -r f58410582b9b -r 51597950d0fe tools/lemon-0.x-to-1.x.sh
--- a/tools/lemon-0.x-to-1.x.sh	Tue Nov 04 21:37:59 2008 +0100
+++ b/tools/lemon-0.x-to-1.x.sh	Wed Nov 05 08:11:44 2008 +0000
@@ -90,6 +90,7 @@
         -e "s/\<StoreBoolMap\>/LoggerBoolMap/g"\
         -e "s/\<storeBoolMap\>/loggerBoolMap/g"\
         -e "s/\<BoundingBox\>/Box/g"\
+        -e "s/\<readNauty\>/readNautyGraph/g"\
     <$i > $TMP
     mv $TMP $i
 done