Changes in / [201:9757e3d9bfeb:202:a5ee729dc1e1] in lemon-main

Files:

• lemon/graph_utils.h (modified) (3 diffs)
• test/CMakeLists.txt (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/graph_copy_test.cc (added)

lemon/graph_utils.h

@@ -603 +603 @@
         for (typename From::ArcIt it(from); it != INVALID; ++it) {
           arcRefMap[it] = to.addArc(nodeRefMap[from.source(it)], 
-                                          nodeRefMap[from.target(it)]);
+                                    nodeRefMap[from.target(it)]);
         }
       }
@@ -629 +629 @@
         }
         for (typename From::EdgeIt it(from); it != INVALID; ++it) {
-          edgeRefMap[it] = to.addArc(nodeRefMap[from.source(it)], 
-                                       nodeRefMap[from.target(it)]);
+          edgeRefMap[it] = to.addEdge(nodeRefMap[from.u(it)], 
+                                      nodeRefMap[from.v(it)]);
         }
       }
@@ -926 +926 @@
 
       Value operator[](const Key& key) const {
-        bool forward = 
-          (_from.direction(key) == 
-           (_node_ref[_from.source(key)] == _to.source(_edge_ref[key])));
+        bool forward = _from.u(key) != _from.v(key) ?
+          _node_ref[_from.source(key)] == 
+          _to.source(_to.direct(_edge_ref[key], true)) :
+          _from.direction(key);
         return _to.direct(_edge_ref[key], forward); 
       }

test/CMakeLists.txt

@@ -11 +11 @@
   dim_test
   error_test
+  graph_copy_test
   graph_test
   graph_utils_test

test/Makefile.am

@@ -16 +16 @@
         test/dim_test \
         test/error_test \
+        test/graph_copy_test \
         test/graph_test \
         test/graph_utils_test \
@@ -37 +38 @@
 test_dim_test_SOURCES = test/dim_test.cc
 test_error_test_SOURCES = test/error_test.cc
+test_graph_copy_test_SOURCES = test/graph_copy_test.cc
 test_graph_test_SOURCES = test/graph_test.cc
 test_graph_utils_test_SOURCES = test/graph_utils_test.cc