Fixes and improvements related to GridGraph
authorPeter Kovacs <kpeter@inf.elte.hu>
Sat, 18 Oct 2008 13:15:00 +0200
changeset 348052cecabcb71
parent 347 160bf92c7cdc
child 349 560e4b6d020d
Fixes and improvements related to GridGraph
lemon/grid_graph.h
test/graph_test.cc
     1.1 --- a/lemon/grid_graph.h	Mon Oct 20 12:36:02 2008 +0200
     1.2 +++ b/lemon/grid_graph.h	Sat Oct 18 13:15:00 2008 +0200
     1.3 @@ -184,6 +184,7 @@
     1.4  
     1.5      class Edge {
     1.6        friend class GridGraphBase;
     1.7 +      friend class Arc;
     1.8  
     1.9      protected:
    1.10        int _id;
    1.11 @@ -472,15 +473,15 @@
    1.12    /// in the \c [0..width()-1] range and j is in the \c
    1.13    /// [0..height()-1] range.  Two nodes are connected in the graph if
    1.14    /// the indexes differ exactly on one position and exactly one is
    1.15 -  /// the difference. The nodes of the graph be indexed by position
    1.16 -  /// with \c operator()() function. The positions of the nodes can be
    1.17 +  /// the difference. The nodes of the graph can be indexed by position
    1.18 +  /// with the \c operator()() function. The positions of the nodes can be
    1.19    /// get with \c pos(), \c col() and \c row() members. The outgoing
    1.20    /// arcs can be retrieved with the \c right(), \c up(), \c left()
    1.21    /// and \c down() functions, where the bottom-left corner is the
    1.22    /// origin.
    1.23    ///
    1.24    /// \image html grid_graph.png
    1.25 -  /// \image latex grid_graph.eps "Grid digraph" row_num=\textrow_num
    1.26 +  /// \image latex grid_graph.eps "Grid graph" row_num=\textrow_num
    1.27    ///
    1.28    /// A short example about the basic usage:
    1.29    ///\code
    1.30 @@ -493,10 +494,10 @@
    1.31    /// }
    1.32    ///\endcode
    1.33    ///
    1.34 -  /// The graph type is fully conform to the \ref concepts::Graph
    1.35 +  /// This graph type is fully conform to the \ref concepts::Graph
    1.36    /// "Graph" concept, and it also has an important extra feature
    1.37 -  /// that its maps are real \ref concepts::ReferenceMap "reference
    1.38 -  /// map"s.
    1.39 +  /// that its maps are real \ref concepts::ReferenceMap
    1.40 +  /// "reference map"s.
    1.41    class GridGraph : public ExtendedGridGraphBase {
    1.42    public:
    1.43  
     2.1 --- a/test/graph_test.cc	Mon Oct 20 12:36:02 2008 +0200
     2.2 +++ b/test/graph_test.cc	Sat Oct 18 13:15:00 2008 +0200
     2.3 @@ -192,8 +192,8 @@
     2.4    GRAPH_TYPEDEFS(Graph);
     2.5    Graph G(width, height);
     2.6  
     2.7 -  check(G.width() == width, "Wrong row number");
     2.8 -  check(G.height() == height, "Wrong column number");
     2.9 +  check(G.width() == width, "Wrong column number");
    2.10 +  check(G.height() == height, "Wrong row number");
    2.11  
    2.12    for (int i = 0; i < width; ++i) {
    2.13      for (int j = 0; j < height; ++j) {