Changeset 1258:bdfc038f364c in lemon for test/adaptors_test.cc
- Timestamp:
- 08/07/13 06:31:47 (11 years ago)
- Branch:
- 1.1
- Parents:
- 1248:14394c9603c2 (diff), 1257:3e711ee55d31 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
test/adaptors_test.cc
r1158 r1258 66 66 Digraph::Arc a2 = digraph.addArc(n1, n3); 67 67 Digraph::Arc a3 = digraph.addArc(n2, n3); 68 ignore_unused_variable_warning(a3);68 ::lemon::ignore_unused_variable_warning(a3); 69 69 70 70 // Check the adaptor … … 101 101 Adaptor::Arc a7 = adaptor.addArc(n1, n4); 102 102 Adaptor::Arc a8 = adaptor.addArc(n1, n2); 103 ignore_unused_variable_warning(a6,a7,a8);103 ::lemon::ignore_unused_variable_warning(a6,a7,a8); 104 104 105 105 adaptor.erase(a1); … … 761 761 Digraph::Arc a2 = digraph.addArc(n1, n3); 762 762 Digraph::Arc a3 = digraph.addArc(n2, n3); 763 ignore_unused_variable_warning(a1,a2,a3);763 ::lemon::ignore_unused_variable_warning(a1,a2,a3); 764 764 765 765 checkGraphNodeList(adaptor, 6); -
test/adaptors_test.cc
r1257 r1258 1381 1381 1382 1382 // Apply several adaptors on the grid graph 1383 typedef SplitNodes< ReverseDigraph< const Orienter< 1384 const GridGraph, GridGraph::EdgeMap<bool> > > > 1385 RevSplitGridGraph; 1383 typedef Orienter<const GridGraph, GridGraph::EdgeMap<bool> > 1384 OrientedGridGraph; 1385 typedef ReverseDigraph<const OrientedGridGraph> RevOrientedGridGraph; 1386 typedef SplitNodes<RevOrientedGridGraph> RevSplitGridGraph; 1386 1387 typedef ReverseDigraph<const RevSplitGridGraph> SplitGridGraph; 1387 1388 typedef Undirector<const SplitGridGraph> USplitGridGraph; … … 1392 1393 checkConcept<concepts::Graph, UUSplitGridGraph>(); 1393 1394 1395 OrientedGridGraph ori_adaptor = orienter(graph, dir_map); 1396 RevOrientedGridGraph rev_ori_adaptor = reverseDigraph(ori_adaptor); 1394 1397 RevSplitGridGraph rev_adaptor = 1395 splitNodes(rev erseDigraph(orienter(graph, dir_map)));1398 splitNodes(rev_ori_adaptor); 1396 1399 SplitGridGraph adaptor = reverseDigraph(rev_adaptor); 1397 1400 USplitGridGraph uadaptor = undirector(adaptor);
Note: See TracChangeset
for help on using the changeset viewer.