equal
deleted
inserted
replaced
579 ad = e3; |
579 ad = e3; |
580 Adaptor::Edge ea = a1; |
580 Adaptor::Edge ea = a1; |
581 ea = a2; |
581 ea = a2; |
582 } |
582 } |
583 |
583 |
584 void checkResidual() { |
584 void checkResidualDigraph() { |
585 // Check concepts |
585 // Check concepts |
586 checkConcept<concepts::Digraph, Residual<concepts::Digraph> >(); |
586 checkConcept<concepts::Digraph, ResidualDigraph<concepts::Digraph> >(); |
587 checkConcept<concepts::Digraph, Residual<ListDigraph> >(); |
587 checkConcept<concepts::Digraph, ResidualDigraph<ListDigraph> >(); |
588 |
588 |
589 // Create a digraph and an adaptor |
589 // Create a digraph and an adaptor |
590 typedef ListDigraph Digraph; |
590 typedef ListDigraph Digraph; |
591 typedef Digraph::ArcMap<int> IntArcMap; |
591 typedef Digraph::ArcMap<int> IntArcMap; |
592 typedef Residual<Digraph, IntArcMap> Adaptor; |
592 typedef ResidualDigraph<Digraph, IntArcMap> Adaptor; |
593 |
593 |
594 Digraph digraph; |
594 Digraph digraph; |
595 IntArcMap capacity(digraph), flow(digraph); |
595 IntArcMap capacity(digraph), flow(digraph); |
596 Adaptor adaptor(digraph, capacity, flow); |
596 Adaptor adaptor(digraph, capacity, flow); |
597 |
597 |
1468 checkReverseDigraph(); |
1468 checkReverseDigraph(); |
1469 checkSubDigraph(); |
1469 checkSubDigraph(); |
1470 checkFilterNodes1(); |
1470 checkFilterNodes1(); |
1471 checkFilterArcs(); |
1471 checkFilterArcs(); |
1472 checkUndirector(); |
1472 checkUndirector(); |
1473 checkResidual(); |
1473 checkResidualDigraph(); |
1474 checkSplitNodes(); |
1474 checkSplitNodes(); |
1475 |
1475 |
1476 // Check the graph adaptors (using ListGraph) |
1476 // Check the graph adaptors (using ListGraph) |
1477 checkSubGraph(); |
1477 checkSubGraph(); |
1478 checkFilterNodes2(); |
1478 checkFilterNodes2(); |