Changeset - r374:51597950d0fe
« 371:0eec17
« 373:f58410
375:a637fb »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge
0 2 0
merge default
0 files changed with 4 insertions and 3 deletions:
lemon/nauty_reader.h
3
3
tools/lemon-0.x-to-1.x.sh
1
↑ Collapse diff ↑
lemon/nauty_reader.h
Ignore white space 6 line context
... ... 
@@ -38,7 +38,7 @@
38 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 graph \e format
41 
  /// constraints). This function reads a \e nauty \e graph6 \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/
... ... 
@@ -48,7 +48,7 @@
48 48 
  ///\code
49 49 
  /// int num = 0;
50 50 
  /// SmartGraph graph;
51 
  /// while (readNauty(graph, std::cin)) {
51 
  /// while (readNautyGraph(graph, std::cin)) {
52 52 
  ///   PlanarityChecking<SmartGraph> pc(graph);
53 53 
  ///   if (pc.run()) ++num;
54 54 
  /// }
... ... 
@@ -61,7 +61,7 @@
61 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 = std::cin) {
64 
  std::istream& readNautyGraph(Graph& graph, std::istream& is = std::cin) {
65 65 
    graph.clear();
66 66 

			




	67
	67
	
		
    std::string line;

			




        

    

    

    

        

            

                

                    tools/lemon-0.x-to-1.x.sh
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -90,6 +90,7 @@


			




	90
	90
	
		
        -e "s/\<StoreBoolMap\>/LoggerBoolMap/g"\


			




	91
	91
	
		
        -e "s/\<storeBoolMap\>/loggerBoolMap/g"\


			




	92
	92
	
		
        -e "s/\<BoundingBox\>/Box/g"\


			




	
	93
	
		
        -e "s/\<readNauty\>/readNautyGraph/g"\


			




	93
	94
	
		
    <$i > $TMP


			




	94
	95
	
		
    mv $TMP $i


			




	95
	96
	
		
done


			




        

    






    
    



    


    

     
    
0 comments (0 inline)