# HG changeset patch # User Peter Kovacs # Date 1224328500 -7200 # Node ID 052cecabcb718cefa02098b9a3a2c8822a5482e5 # Parent 160bf92c7cdc3f9aa776d4138d9ce996ab81979e Fixes and improvements related to GridGraph diff -r 160bf92c7cdc -r 052cecabcb71 lemon/grid_graph.h --- a/lemon/grid_graph.h Mon Oct 20 12:36:02 2008 +0200 +++ b/lemon/grid_graph.h Sat Oct 18 13:15:00 2008 +0200 @@ -184,6 +184,7 @@ class Edge { friend class GridGraphBase; + friend class Arc; protected: int _id; @@ -472,15 +473,15 @@ /// in the \c [0..width()-1] range and j is in the \c /// [0..height()-1] range. Two nodes are connected in the graph if /// the indexes differ exactly on one position and exactly one is - /// the difference. The nodes of the graph be indexed by position - /// with \c operator()() function. The positions of the nodes can be + /// the difference. The nodes of the graph can be indexed by position + /// with the \c operator()() function. The positions of the nodes can be /// get with \c pos(), \c col() and \c row() members. The outgoing /// arcs can be retrieved with the \c right(), \c up(), \c left() /// and \c down() functions, where the bottom-left corner is the /// origin. /// /// \image html grid_graph.png - /// \image latex grid_graph.eps "Grid digraph" row_num=\textrow_num + /// \image latex grid_graph.eps "Grid graph" row_num=\textrow_num /// /// A short example about the basic usage: ///\code @@ -493,10 +494,10 @@ /// } ///\endcode /// - /// The graph type is fully conform to the \ref concepts::Graph + /// This graph type is fully conform to the \ref concepts::Graph /// "Graph" concept, and it also has an important extra feature - /// that its maps are real \ref concepts::ReferenceMap "reference - /// map"s. + /// that its maps are real \ref concepts::ReferenceMap + /// "reference map"s. class GridGraph : public ExtendedGridGraphBase { public: diff -r 160bf92c7cdc -r 052cecabcb71 test/graph_test.cc --- a/test/graph_test.cc Mon Oct 20 12:36:02 2008 +0200 +++ b/test/graph_test.cc Sat Oct 18 13:15:00 2008 +0200 @@ -192,8 +192,8 @@ GRAPH_TYPEDEFS(Graph); Graph G(width, height); - check(G.width() == width, "Wrong row number"); - check(G.height() == height, "Wrong column number"); + check(G.width() == width, "Wrong column number"); + check(G.height() == height, "Wrong row number"); for (int i = 0; i < width; ++i) { for (int j = 0; j < height; ++j) {