[Lemon-commits] [lemon_svn] klao: r1424 - in hugo/trunk/src: lemon test

[Lemon SVN]

Author: klao
Date: Thu Dec  9 16:30:12 2004
New Revision: 1424

Modified:
   hugo/trunk/src/lemon/list_graph.h
   hugo/trunk/src/lemon/smart_graph.h
   hugo/trunk/src/test/undir_graph_test.cc

Log:
Undir list and smart graph


Modified: hugo/trunk/src/lemon/list_graph.h
==============================================================================
--- hugo/trunk/src/lemon/list_graph.h	(original)
+++ hugo/trunk/src/lemon/list_graph.h	Thu Dec  9 16:30:12 2004
@@ -24,13 +24,12 @@
 #include <lemon/erasable_graph_extender.h>
 #include <lemon/clearable_graph_extender.h>
 #include <lemon/extendable_graph_extender.h>
-
 #include <lemon/iterable_graph_extender.h>
-
 #include <lemon/alteration_observer_registry.h>
-
 #include <lemon/default_map.h>
 
+#include <lemon/undir_graph_extender.h>
+
 #include <list>
 
 namespace lemon {
@@ -501,6 +500,21 @@
     };
     
   };
+
+
+  /**************** Undirected List Graph ****************/
+
+  typedef ErasableUndirGraphExtender<
+    ClearableUndirGraphExtender<
+    ExtendableUndirGraphExtender<
+    MappableUndirGraphExtender<
+    IterableUndirGraphExtender<
+    AlterableUndirGraphExtender<
+    UndirGraphExtender<ListGraphBase> > > > > > > ErasableUndirListGraphBase;
+
+  class UndirListGraph : public ErasableUndirListGraphBase {
+  };
+
   
   /// @}  
 } //namespace lemon

Modified: hugo/trunk/src/lemon/smart_graph.h
==============================================================================
--- hugo/trunk/src/lemon/smart_graph.h	(original)
+++ hugo/trunk/src/lemon/smart_graph.h	Thu Dec  9 16:30:12 2004
@@ -31,6 +31,8 @@
 #include <lemon/alteration_observer_registry.h>
 #include <lemon/default_map.h>
 
+#include <lemon/undir_graph_extender.h>
+
 #include <lemon/utility.h>
 
 namespace lemon {
@@ -345,6 +347,20 @@
       }
     };
   };
+
+
+  /**************** Undirected List Graph ****************/
+
+  typedef ClearableUndirGraphExtender<
+    ExtendableUndirGraphExtender<
+    MappableUndirGraphExtender<
+    IterableUndirGraphExtender<
+    AlterableUndirGraphExtender<
+    UndirGraphExtender<SmartGraphBase> > > > > > UndirSmartGraphBase;
+
+  class UndirSmartGraph : public UndirSmartGraphBase {
+  };
+
   
   /// @}  
 } //namespace lemon

Modified: hugo/trunk/src/test/undir_graph_test.cc
==============================================================================
--- hugo/trunk/src/test/undir_graph_test.cc	(original)
+++ hugo/trunk/src/test/undir_graph_test.cc	Thu Dec  9 16:30:12 2004
@@ -33,6 +33,12 @@
   checkConcept<UndirGraph, Graph>();
   checkConcept<ErasableUndirGraph, Graph>();
 
+  checkConcept<UndirGraph, UndirListGraph>();
+  checkConcept<ErasableUndirGraph, UndirListGraph>();
+
+  checkConcept<UndirGraph, UndirSmartGraph>();
+  checkConcept<ExtendableUndirGraph, UndirSmartGraph>();
+
   checkConcept<UndirGraph, UndirGraph>();
 
   return 0;