Changeset 1979:c2992fd74dad in lemon-0.x for lemon/graph_adaptor.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/graph_adaptor.h (modified) (15 diffs)

lemon/graph_adaptor.h

@@ -30 +30 @@
 #include <lemon/invalid.h>
 #include <lemon/maps.h>
-#include <lemon/bits/erasable_graph_extender.h>
-#include <lemon/bits/clearable_graph_extender.h>
-#include <lemon/bits/extendable_graph_extender.h>
-#include <lemon/bits/iterable_graph_extender.h>
-#include <lemon/bits/alteration_notifier.h>
-#include <lemon/bits/default_map.h>
+
+#include <lemon/bits/graph_adaptor_extender.h>
 #include <lemon/bits/graph_extender.h>
+
 #include <iostream>
 
@@ -118 +115 @@
     int id(const Edge& e) const { return graph->id(e); }
     
-    Edge oppositeNode(const Edge& e) const { 
-      return Edge(graph->opposite(e)); 
-    }
-
     template <typename _Value>
     class NodeMap : public _Graph::template NodeMap<_Value> {
@@ -146 +139 @@
   template <typename _Graph>
   class GraphAdaptor :
-    public IterableGraphExtender<GraphAdaptorBase<_Graph> > { 
+    public GraphAdaptorExtender<GraphAdaptorBase<_Graph> > { 
   public:
     typedef _Graph Graph;
-    typedef IterableGraphExtender<GraphAdaptorBase<_Graph> > Parent;
+    typedef GraphAdaptorExtender<GraphAdaptorBase<_Graph> > Parent;
   protected:
     GraphAdaptor() : Parent() { }
@@ -199 +192 @@
   template<typename _Graph>
   class RevGraphAdaptor : 
-    public IterableGraphExtender<RevGraphAdaptorBase<_Graph> > {
+    public GraphAdaptorExtender<RevGraphAdaptorBase<_Graph> > {
   public:
     typedef _Graph Graph;
-    typedef IterableGraphExtender<
+    typedef GraphAdaptorExtender<
       RevGraphAdaptorBase<_Graph> > Parent;
   protected:
@@ -323 +316 @@
     bool hidden(const Edge& e) const { return !(*edge_filter_map)[e]; }
 
+    typedef False FindEdgeTag;
     typedef False NodeNumTag;
     typedef False EdgeNumTag;
@@ -429 +423 @@
     bool hidden(const Edge& e) const { return !(*edge_filter_map)[e]; }
 
+    typedef False FindEdgeTag;
     typedef False NodeNumTag;
     typedef False EdgeNumTag;
@@ -497 +492 @@
            typename EdgeFilterMap, bool checked = true>
   class SubGraphAdaptor : 
-    public IterableGraphExtender<
+    public GraphAdaptorExtender<
     SubGraphAdaptorBase<_Graph, NodeFilterMap, EdgeFilterMap, checked> > {
   public:
     typedef _Graph Graph;
-    typedef IterableGraphExtender<
+    typedef GraphAdaptorExtender<
       SubGraphAdaptorBase<_Graph, NodeFilterMap, EdgeFilterMap> > Parent;
   protected:
@@ -704 +699 @@
 
   template <typename _Graph>
-  class UGraphAdaptorBase : 
-    public UGraphExtender<GraphAdaptorBase<_Graph> > {
+  class UndirectGraphAdaptorBase : 
+    public UGraphBaseExtender<GraphAdaptorBase<_Graph> > {
   public:
     typedef _Graph Graph;
-    typedef UGraphExtender<GraphAdaptorBase<_Graph> > Parent;
+    typedef UGraphBaseExtender<GraphAdaptorBase<_Graph> > Parent;
   protected:
-    UGraphAdaptorBase() : Parent() { }
+    UndirectGraphAdaptorBase() : Parent() { }
   public:
     typedef typename Parent::UEdge UEdge;
@@ -718 +713 @@
     class EdgeMap {
     protected:
-      const UGraphAdaptorBase<_Graph>* g;
+      const UndirectGraphAdaptorBase<_Graph>* g;
       template <typename TT> friend class EdgeMap;
       typename _Graph::template EdgeMap<T> forward_map, backward_map; 
@@ -725 +720 @@
       typedef Edge Key;
       
-      EdgeMap(const UGraphAdaptorBase<_Graph>& _g) : g(&_g), 
+      EdgeMap(const UndirectGraphAdaptorBase<_Graph>& _g) : g(&_g), 
         forward_map(*(g->graph)), backward_map(*(g->graph)) { }
 
-      EdgeMap(const UGraphAdaptorBase<_Graph>& _g, T a) : g(&_g), 
+      EdgeMap(const UndirectGraphAdaptorBase<_Graph>& _g, T a) : g(&_g), 
         forward_map(*(g->graph), a), backward_map(*(g->graph), a) { }
       
@@ -754 +749 @@
       typedef UEdge Key;
       
-      UEdgeMap(const UGraphAdaptorBase<_Graph>& g) : 
+      UEdgeMap(const UndirectGraphAdaptorBase<_Graph>& g) : 
         map(*(g.graph)) { }
 
-      UEdgeMap(const UGraphAdaptorBase<_Graph>& g, T a) : 
+      UEdgeMap(const UndirectGraphAdaptorBase<_Graph>& g, T a) : 
         map(*(g.graph), a) { }
       
@@ -779 +774 @@
   /// \author Marton Makai
   template<typename _Graph>
-  class UGraphAdaptor : 
-    public IterableUGraphExtender<
-    UGraphAdaptorBase<_Graph> > {
+  class UndirectGraphAdaptor : 
+    public UGraphAdaptorExtender<
+    UndirectGraphAdaptorBase<_Graph> > {
   public:
     typedef _Graph Graph;
-    typedef IterableUGraphExtender<
-      UGraphAdaptorBase<_Graph> > Parent;
+    typedef UGraphAdaptorExtender<
+      UndirectGraphAdaptorBase<_Graph> > Parent;
   protected:
-    UGraphAdaptor() { }
-  public:
-    UGraphAdaptor(_Graph& _graph) { 
+    UndirectGraphAdaptor() { }
+  public:
+    UndirectGraphAdaptor(_Graph& _graph) { 
       setGraph(_graph);
     }
@@ -1084 +1079 @@
            typename ForwardFilterMap, typename BackwardFilterMap>
   class SubBidirGraphAdaptor : 
-    public IterableGraphExtender<
+    public GraphAdaptorExtender<
     SubBidirGraphAdaptorBase<_Graph, ForwardFilterMap, BackwardFilterMap> > {
   public:
     typedef _Graph Graph;
-    typedef IterableGraphExtender<
+    typedef GraphAdaptorExtender<
       SubBidirGraphAdaptorBase<
       _Graph, ForwardFilterMap, BackwardFilterMap> > Parent;
@@ -1342 +1337 @@
   template <typename _Graph, typename FirstOutEdgesMap>
   class ErasingFirstGraphAdaptor : 
-    public IterableGraphExtender<
+    public GraphAdaptorExtender<
     ErasingFirstGraphAdaptorBase<_Graph, FirstOutEdgesMap> > {
   public:
     typedef _Graph Graph;
-    typedef IterableGraphExtender<
+    typedef GraphAdaptorExtender<
       ErasingFirstGraphAdaptorBase<_Graph, FirstOutEdgesMap> > Parent;
     ErasingFirstGraphAdaptor(Graph& _graph, 
@@ -1712 +1707 @@
   template <typename _Graph>
   class SplitGraphAdaptor 
-    : public IterableGraphExtender<SplitGraphAdaptorBase<_Graph> > {
-  public:
-    typedef IterableGraphExtender<SplitGraphAdaptorBase<_Graph> > Parent;
+    : public GraphAdaptorExtender<SplitGraphAdaptorBase<_Graph> > {
+  public:
+    typedef GraphAdaptorExtender<SplitGraphAdaptorBase<_Graph> > Parent;
 
     SplitGraphAdaptor(_Graph& graph) {