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 12 line context
... ... 
@@ -35,36 +35,36 @@
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 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/
45 45 
  ///
46 46 
  /// For example, the number of all non-isomorphic planar graphs
47 47 
  /// can be computed with the following code.
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 
  /// }
55 55 
  /// std::cout << "Number of planar graphs: " << num << std::endl;
56 56 
  ///\endcode
57 57 
  ///
58 58 
  /// The nauty files are quite huge, therefore instead of the direct
59 59 
  /// file generation pipelining is recommended. For example,
60 60 
  ///\code
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;


			




	68
	68
	
		
    if (getline(is, line)) {


			




	69
	69
	
		
      int index = 0;


			




	70
	70
	
		

			




        

    

    

    

        

            

                

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

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -87,9 +87,10 @@


			




	87
	87
	
		
        -e "s/\<\([Ff]\)unctorMap\>/\1unctorToMap/g"\


			




	88
	88
	
		
        -e "s/\<\([Mm]\)apFunctor\>/\1apToFunctor/g"\


			




	89
	89
	
		
        -e "s/\<\([Ff]\)orkWriteMap\>/\1orkMap/g"\


			




	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)