Changeset 1979:c2992fd74dad in lemon-0.x for test/ugraph_test.cc

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:

• test/ugraph_test.cc (modified) (5 diffs)

test/ugraph_test.cc

@@ -22 +22 @@
 #include <lemon/smart_graph.h>
 #include <lemon/full_graph.h>
-#include <lemon/grid_graph.h>
+#include <lemon/grid_ugraph.h>
 
 #include <lemon/graph_utils.h>
@@ -33 +33 @@
 
 void check_concepts() {
-  typedef UGraphExtender<ListGraphBase> ListUGraphBase;
-
-  typedef IterableUGraphExtender<
-    AlterableUGraphExtender<ListUGraphBase> > IterableListUGraph;
-
-  typedef MappableUGraphExtender<IterableListUGraph>
-    MappableListUGraph;
-
-  typedef ErasableUGraphExtender<
-    ClearableUGraphExtender<
-    ExtendableUGraphExtender<MappableListUGraph> > > Graph;
-
-  checkConcept<BaseIterableUGraphConcept, Graph>();
-  checkConcept<IterableUGraphConcept, Graph>();
-  checkConcept<MappableUGraphConcept, Graph>();
-
-  checkConcept<UGraph, Graph>();
-  checkConcept<ErasableUGraph, Graph>();
-
   checkConcept<UGraph, ListUGraph>();
   checkConcept<ErasableUGraph, ListUGraph>();
@@ -62 +43 @@
   checkConcept<UGraph, UGraph>();
 
-  checkConcept<UGraph, GridGraph>();
+  checkConcept<UGraph, GridUGraph>();
 }
 
@@ -151 +132 @@
 }
 
-void checkGridGraph(const GridGraph& g, int w, int h) {
+void checkGridUGraph(const GridUGraph& g, int w, int h) {
   check(g.width() == w, "Wrong width");
   check(g.height() == h, "Wrong height");
@@ -207 +188 @@
 
   {
-    GridGraph g(5, 6);
+    GridUGraph g(5, 6);
     check_item_counts(g, 30, 49);
-    checkGridGraph(g, 5, 6);
+    checkGridUGraph(g, 5, 6);
   }