Changeset 1791:62e7d237e1fb in lemon-0.x for lemon/grid_graph.h

Timestamp:

11/14/05 19:38:41 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2332

Message:

Modification on the base graph concept
The extended interface does not changed

File:

• lemon/grid_graph.h (modified) (5 diffs)

lemon/grid_graph.h

@@ -25 +25 @@
 #include <lemon/bits/alteration_notifier.h>
 #include <lemon/bits/static_map.h>
-
-#include <lemon/bits/undir_graph_extender.h>
+#include <lemon/bits/graph_extender.h>
 
 #include <lemon/xy.h>
@@ -165 +164 @@
     /// Maximum node ID.
     ///\sa id(Node)
-    int maxId(Node = INVALID) const { return nodeNum() - 1; }
+    int maxNodeId() const { return nodeNum() - 1; }
     /// Maximum edge ID.
     
     /// Maximum edge ID.
     ///\sa id(Edge)
-    int maxId(Edge = INVALID) const { return edgeNum() - 1; }
+    int maxEdgeId() const { return edgeNum() - 1; }
 
     /// \brief Gives back the source node of an edge.
@@ -216 +215 @@
     static int id(Edge e) { return e.id; }
 
-    static Node fromId(int id, Node) { return Node(id);}
-    
-    static Edge fromId(int id, Edge) { return Edge(id);}
+    static Node nodeFromId(int id) { return Node(id);}
+    
+    static Edge edgeFromId(int id) { return Edge(id);}
 
     typedef True FindEdgeTag;
@@ -359 +358 @@
   /// GridGraph graph(h, w);
   /// GridGraph::NodeMap<int> val(graph); 
-  /// for (int i = 0; i < graph.height(); ++i) {
-  ///   for (int j = 0; j < graph.width(); ++j) {
+  /// for (int i = 0; i < graph.width(); ++i) {
+  ///   for (int j = 0; j < graph.height(); ++j) {
   ///     val[graph(i, j)] = i + j;
   ///   }
@@ -504 +503 @@
   /// \brief Row map of the grid graph
   ///
-  /// Just returns an RowMap for the grid graph.
+  /// Just returns a RowMap for the grid graph.
   GridGraph::RowMap rowMap(const GridGraph& graph) {
     return GridGraph::RowMap(graph);
   }
 
-  /// \brief Coloumn map of the grid graph
-  ///
-  /// Just returns an ColMap for the grid graph.
+  /// \brief Column map of the grid graph
+  ///
+  /// Just returns a ColMap for the grid graph.
   GridGraph::ColMap colMap(const GridGraph& graph) {
     return GridGraph::ColMap(graph);