Changeset 1054:6a62b1b4cf23 in lemon-0.x

Timestamp:

01/05/05 17:59:50 (18 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

countUndirEdges bugs fixed

Location:

src

Files:

• lemon/undir_graph_extender.h (modified) (1 diff)
• test/undir_graph_test.cc (modified) (4 diffs)

src/lemon/undir_graph_extender.h

@@ -238 +238 @@
     }
 
+
+    int edgeNum() const {
+      return 2 * Parent::edgeNum();
+    }
+    int undirEdgeNum() const {
+      return Parent::edgeNum();
+    }
+
   };
 

src/test/undir_graph_test.cc

@@ -44 +44 @@
 }
 
-typedef UndirListGraph Graph;
-typedef Graph::Node Node;
-typedef Graph::UndirEdge UEdge;
-typedef Graph::Edge Edge;
-typedef Graph::NodeIt NodeIt;
-typedef Graph::UndirEdgeIt UEdgeIt;
-typedef Graph::EdgeIt EdgeIt;
-
+template <typename Graph>
 void check_item_counts(Graph &g, int n, int e) {
   check(countNodes(g)==n, "Wrong node number.");
@@ -57 +50 @@
 }
 
+template <typename Graph>
 void print_items(Graph &g) {
+
+  typedef typename Graph::NodeIt NodeIt;
+  typedef typename Graph::UndirEdgeIt UEdgeIt;
+  typedef typename Graph::EdgeIt EdgeIt;
+
   cout << "Nodes" << endl;
   int i=0;
@@ -82 +81 @@
 }
 
-int main() {
-  check_concepts();
+template <typename Graph>
+void check_graph() {
 
+  typedef typename Graph::Node Node;
+  typedef typename Graph::UndirEdge UEdge;
+  typedef typename Graph::Edge Edge;
+  typedef typename Graph::NodeIt NodeIt;
+  typedef typename Graph::UndirEdgeIt UEdgeIt;
+  typedef typename Graph::EdgeIt EdgeIt;
 
   Graph g;
@@ -103 +108 @@
   check_item_counts(g,3,2);
 
+
+}
+
+int main() {
+  check_concepts();
+
+  check_graph<UndirListGraph>();
+  check_graph<UndirSmartGraph>();
+
   return 0;
 }