Changeset 980:0f1044b7a3af in lemon-0.x for src/lemon/smart_graph.h

Timestamp:

11/11/04 10:31:55 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

maxNodeId() and maxEdgeId() changed to maxId(Node) and maxId(Edge)
getNodeObserverRegistry() and getEdgeObserverRegistry() changed to
getObserverRegistry(Node) and getObserverRegistry(Edge)

IdMappableGraphExtender? erased

File:

• src/lemon/smart_graph.h (modified) (4 diffs)

src/lemon/smart_graph.h

@@ -28 +28 @@
 #include <lemon/clearable_graph_extender.h>
 #include <lemon/extendable_graph_extender.h>
-#include <lemon/idmappable_graph_extender.h>
 #include <lemon/iterable_graph_extender.h>
 #include <lemon/alteration_observer_registry.h>
@@ -92 +91 @@
     /// Maximum node ID.
     ///\sa id(Node)
-    int maxNodeId() const { return nodes.size()-1; }
+    int maxId(Node = INVALID) const { return nodes.size()-1; }
     /// Maximum edge ID.
     
     /// Maximum edge ID.
     ///\sa id(Edge)
-    int maxEdgeId() const { return edges.size()-1; }
+    int maxId(Edge = INVALID) const { return edges.size()-1; }
 
     Node tail(Edge e) const { return edges[e.n].tail; }
@@ -222 +221 @@
   typedef AlterableGraphExtender<SmartGraphBase> AlterableSmartGraphBase;
   typedef IterableGraphExtender<AlterableSmartGraphBase> IterableSmartGraphBase;
-  typedef IdMappableGraphExtender<IterableSmartGraphBase> IdMappableSmartGraphBase;
-  typedef DefaultMappableGraphExtender<IdMappableSmartGraphBase> MappableSmartGraphBase;
+  typedef DefaultMappableGraphExtender<IterableSmartGraphBase> MappableSmartGraphBase;
   typedef ExtendableGraphExtender<MappableSmartGraphBase> ExtendableSmartGraphBase;
   typedef ClearableGraphExtender<ExtendableSmartGraphBase> ClearableSmartGraphBase;
@@ -240 +238 @@
   ///
   ///\author Alpar Juttner
-  class SmartGraph :public ClearableSmartGraphBase {
+  class SmartGraph : public ClearableSmartGraphBase {
   public:
     /// Finds an edge between two nodes.