# HG changeset patch
# User Peter Kovacs <kpeter@inf.elte.hu>
# Date 1224328500 -7200
# Node ID fb41d1fb4641830275aa31079ab5dc65f058abe1
# Parent 109f3948dcc39faff5b00a266c77a3d372a4807d
Fixes and improvements related to GridGraph
diff --git a/lemon/grid_graph.h b/lemon/grid_graph.h
a
|
b
|
|
184 | 184 | |
185 | 185 | class Edge { |
186 | 186 | friend class GridGraphBase; |
| 187 | friend class Arc; |
187 | 188 | |
188 | 189 | protected: |
189 | 190 | int _id; |
… |
… |
|
472 | 473 | /// in the \c [0..width()-1] range and j is in the \c |
473 | 474 | /// [0..height()-1] range. Two nodes are connected in the graph if |
474 | 475 | /// the indexes differ exactly on one position and exactly one is |
475 | | /// the difference. The nodes of the graph be indexed by position |
476 | | /// with \c operator()() function. The positions of the nodes can be |
| 476 | /// the difference. The nodes of the graph can be indexed by position |
| 477 | /// with the \c operator()() function. The positions of the nodes can be |
477 | 478 | /// get with \c pos(), \c col() and \c row() members. The outgoing |
478 | 479 | /// arcs can be retrieved with the \c right(), \c up(), \c left() |
479 | 480 | /// and \c down() functions, where the bottom-left corner is the |
480 | 481 | /// origin. |
481 | 482 | /// |
482 | 483 | /// \image html grid_graph.png |
483 | | /// \image latex grid_graph.eps "Grid digraph" row_num=\textrow_num |
| 484 | /// \image latex grid_graph.eps "Grid graph" row_num=\textrow_num |
484 | 485 | /// |
485 | 486 | /// A short example about the basic usage: |
486 | 487 | ///\code |
… |
… |
|
493 | 494 | /// } |
494 | 495 | ///\endcode |
495 | 496 | /// |
496 | | /// The graph type is fully conform to the \ref concepts::Graph |
| 497 | /// This graph type is fully conform to the \ref concepts::Graph |
497 | 498 | /// "Graph" concept, and it also has an important extra feature |
498 | | /// that its maps are real \ref concepts::ReferenceMap "reference |
499 | | /// map"s. |
| 499 | /// that its maps are real \ref concepts::ReferenceMap |
| 500 | /// "reference map"s. |
500 | 501 | class GridGraph : public ExtendedGridGraphBase { |
501 | 502 | public: |
502 | 503 | |
diff --git a/test/graph_test.cc b/test/graph_test.cc
a
|
b
|
|
192 | 192 | GRAPH_TYPEDEFS(Graph); |
193 | 193 | Graph G(width, height); |
194 | 194 | |
195 | | check(G.width() == width, "Wrong row number"); |
196 | | check(G.height() == height, "Wrong column number"); |
| 195 | check(G.width() == width, "Wrong column number"); |
| 196 | check(G.height() == height, "Wrong row number"); |
197 | 197 | |
198 | 198 | for (int i = 0; i < width; ++i) { |
199 | 199 | for (int j = 0; j < height; ++j) { |