Changeset 1909:2d806130e700 in lemon-0.x for test/ugraph_test.cc

Timestamp:

01/26/06 16:42:13 (19 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

Undir -> U transition

File:

• test/ugraph_test.cc (moved) (moved from test/undir_graph_test.cc) (7 diffs)

test/ugraph_test.cc

@@ -2 +2 @@
 
 #include <lemon/bits/graph_extender.h>
-#include <lemon/concept/undir_graph.h>
+#include <lemon/concept/ugraph.h>
 #include <lemon/list_graph.h>
 #include <lemon/smart_graph.h>
@@ -17 +17 @@
 
 void check_concepts() {
-  typedef UndirGraphExtender<ListGraphBase> UndirListGraphBase;
-
-  typedef IterableUndirGraphExtender<
-    AlterableUndirGraphExtender<UndirListGraphBase> > IterableUndirListGraph;
-
-  typedef MappableUndirGraphExtender<IterableUndirListGraph>
-    MappableUndirListGraph;
-
-  typedef ErasableUndirGraphExtender<
-    ClearableUndirGraphExtender<
-    ExtendableUndirGraphExtender<MappableUndirListGraph> > > Graph;
-
-  checkConcept<BaseIterableUndirGraphConcept, Graph>();
-  checkConcept<IterableUndirGraphConcept, Graph>();
-  checkConcept<MappableUndirGraphConcept, Graph>();
-
-  checkConcept<UndirGraph, Graph>();
-  checkConcept<ErasableUndirGraph, Graph>();
-
-  checkConcept<UndirGraph, UndirListGraph>();
-  checkConcept<ErasableUndirGraph, UndirListGraph>();
-
-  checkConcept<UndirGraph, UndirSmartGraph>();
-  checkConcept<ExtendableUndirGraph, UndirSmartGraph>();
-
-  checkConcept<UndirGraph, UndirFullGraph>();
-
-  checkConcept<UndirGraph, UndirGraph>();
-
-  checkConcept<UndirGraph, GridGraph>();
+  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>();
+
+  checkConcept<UGraph, SmartUGraph>();
+  checkConcept<ExtendableUGraph, SmartUGraph>();
+
+  checkConcept<UGraph, FullUGraph>();
+
+  checkConcept<UGraph, UGraph>();
+
+  checkConcept<UGraph, GridGraph>();
 }
 
@@ -68 +68 @@
 
   int uee = 0;
-  for (typename Graph::UndirEdgeIt it(g); it != INVALID; ++it) {
+  for (typename Graph::UEdgeIt it(g); it != INVALID; ++it) {
     ++uee;
   }
 
-  check(uee == e, "Wrong undir edge number.");
-  check(countUndirEdges(g) == e, "Wrong undir edge number.");
+  check(uee == e, "Wrong uedge number.");
+  check(countUEdges(g) == e, "Wrong uedge number.");
 }
 
@@ -80 +80 @@
 
   typedef typename Graph::NodeIt NodeIt;
-  typedef typename Graph::UndirEdgeIt UEdgeIt;
+  typedef typename Graph::UEdgeIt UEdgeIt;
   typedef typename Graph::EdgeIt EdgeIt;
 
@@ -89 +89 @@
   }
 
-  std::cout << "UndirEdge" << std::endl;
+  std::cout << "UEdge" << std::endl;
   i=0;
   for(UEdgeIt it(g); it!=INVALID; ++it, ++i) {
@@ -111 +111 @@
 
   typedef typename Graph::Node Node;
-  typedef typename Graph::UndirEdge UEdge;
+  typedef typename Graph::UEdge UEdge;
   typedef typename Graph::Edge Edge;
   typedef typename Graph::NodeIt NodeIt;
-  typedef typename Graph::UndirEdgeIt UEdgeIt;
+  typedef typename Graph::UEdgeIt UEdgeIt;
   typedef typename Graph::EdgeIt EdgeIt;
 
@@ -182 +182 @@
   check_concepts();
 
-  check_graph<UndirListGraph>();
-  check_graph<UndirSmartGraph>();
+  check_graph<ListUGraph>();
+  check_graph<SmartUGraph>();
 
   {
-    UndirFullGraph g(5);
+    FullUGraph g(5);
     check_item_counts(g, 5, 10);
   }