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

Timestamp:

11/14/05 19:38:41 (19 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/hypercube_graph.h (modified) (6 diffs)

lemon/hypercube_graph.h

@@ -22 +22 @@
 #include <lemon/invalid.h>
 #include <lemon/utility.h>
+#include <lemon/error.h>
 
 #include <lemon/bits/iterable_graph_extender.h>
 #include <lemon/bits/alteration_notifier.h>
 #include <lemon/bits/default_map.h>
+#include <lemon/bits/graph_extender.h>
 
 ///\ingroup graphs
@@ -33 +35 @@
 namespace lemon {
 
-  /// \brief Base graph for HyperGraph.
+  /// \brief Base graph for HyperCubeGraph.
   ///
   /// Base graph for hyper-cube graph. It describes some member functions
@@ -78 +80 @@
     /// 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.
@@ -119 +121 @@
     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);}
 
     class Node {
@@ -236 +238 @@
     IterableGraphExtender<
     AlterableGraphExtender<
-    HyperCubeGraphBase > > > ExtendedHyperCubeGraphBase;
+    GraphExtender<
+    HyperCubeGraphBase> > > > ExtendedHyperCubeGraphBase;
 
   /// \ingroup graphs
@@ -308 +311 @@
                    T fv = 0.0, const BF& bf = BF()) 
         : _graph(graph), _values(begin, end), _first_value(fv), _bin_func(bf) {
-        if (_values.size() != graph.dimension()) {}
+        LEMON_ASSERT(_values.size() != graph.dimension(), 
+                     "Wrong size of dimension");
       }