Changeset 1979:c2992fd74dad in lemon-0.x for lemon/full_graph.h

Timestamp:

02/22/06 19:26:56 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Mergeing extendermerge branch
Changes:

the extender system
resize for static size graph
UGraphExtender => UndirectGraphExtender?

UGraphExtenders with changed meaning

Some UGraphExtender /SubUGraphExtenders, DirectUGraphExtender/
GridGraph? => GridUGraph
radix sort to ansi compatible

File:

• lemon/full_graph.h (modified) (7 diffs)

lemon/full_graph.h

@@ -23 +23 @@
 
 
-#include <lemon/bits/iterable_graph_extender.h>
-#include <lemon/bits/alteration_notifier.h>
-#include <lemon/bits/static_map.h>
 #include <lemon/bits/graph_extender.h>
+
 
 #include <lemon/invalid.h>
@@ -192 +190 @@
   };
 
-  typedef StaticMappableGraphExtender<
-    IterableGraphExtender<
-    AlterableGraphExtender<
-    GraphExtender<FullGraphBase> > > > ExtendedFullGraphBase;
+  typedef GraphExtender<FullGraphBase> ExtendedFullGraphBase;
 
   /// \ingroup graphs
@@ -212 +207 @@
   public:
 
+    typedef ExtendedFullGraphBase Parent;
+
+    /// \brief Constructor
+    ///
     FullGraph(int n) { construct(n); }
+
+    /// \brief Resize the graph
+    ///
+    void resize(int n) {
+      Parent::getNotifier(Edge()).clear();
+      Parent::getNotifier(Node()).clear();
+      construct(n);
+      Parent::getNotifier(Node()).build();
+      Parent::getNotifier(Edge()).build();
+    }
   };
 
@@ -380 +389 @@
   };
 
-  typedef StaticMappableUGraphExtender<
-    IterableUGraphExtender<
-    AlterableUGraphExtender<
-    UGraphExtender<FullUGraphBase> > > > ExtendedFullUGraphBase;
+  typedef UGraphExtender<UGraphBaseExtender<FullUGraphBase> > 
+  ExtendedFullUGraphBase;
 
   /// \ingroup graphs
@@ -402 +409 @@
   class FullUGraph : public ExtendedFullUGraphBase {
   public:
+
+    typedef ExtendedFullUGraphBase Parent;
+
+    /// \brief Constructor
     FullUGraph(int n) { construct(n); }
+
+    /// \brief Resize the graph
+    ///
+    void resize(int n) {
+      Parent::getNotifier(Edge()).clear();
+      Parent::getNotifier(UEdge()).clear();
+      Parent::getNotifier(Node()).clear();
+      construct(n);
+      Parent::getNotifier(Node()).build();
+      Parent::getNotifier(UEdge()).build();
+      Parent::getNotifier(Edge()).build();
+    }
   };
 
@@ -578 +601 @@
 
 
-  typedef StaticMappableBpUGraphExtender<
-    IterableBpUGraphExtender<
-    AlterableBpUGraphExtender<
-    BpUGraphExtender <
-    FullBpUGraphBase> > > >
-  ExtendedFullBpUGraphBase;
+  typedef BpUGraphExtender< BpUGraphBaseExtender<
+    FullBpUGraphBase> > ExtendedFullBpUGraphBase;
 
 
@@ -600 +619 @@
     public ExtendedFullBpUGraphBase {
   public:
+
     typedef ExtendedFullBpUGraphBase Parent;
+
     FullBpUGraph(int aNodeNum, int bNodeNum) {
       Parent::construct(aNodeNum, bNodeNum);
     }
+    /// \brief Resize the graph
+    ///
+    void resize(int n, int m) {
+      Parent::getNotifier(Edge()).clear();
+      Parent::getNotifier(UEdge()).clear();
+      Parent::getNotifier(Node()).clear();
+      construct(n, m);
+      Parent::getNotifier(Node()).build();
+      Parent::getNotifier(UEdge()).build();
+      Parent::getNotifier(Edge()).build();
+    }
   };