0
2
0
... | ... |
@@ -476,150 +476,150 @@ |
476 | 476 |
|
477 | 477 |
IncEdgeIt(const Graph& _graph, const Node &n) : graph(&_graph) { |
478 | 478 |
_graph.firstInc(*this, direction, n); |
479 | 479 |
} |
480 | 480 |
|
481 | 481 |
IncEdgeIt(const Graph& _graph, const Edge &ue, const Node &n) |
482 | 482 |
: graph(&_graph), Edge(ue) { |
483 | 483 |
direction = (_graph.source(ue) == n); |
484 | 484 |
} |
485 | 485 |
|
486 | 486 |
IncEdgeIt& operator++() { |
487 | 487 |
graph->nextInc(*this, direction); |
488 | 488 |
return *this; |
489 | 489 |
} |
490 | 490 |
}; |
491 | 491 |
|
492 | 492 |
// \brief Base node of the iterator |
493 | 493 |
// |
494 | 494 |
// Returns the base node (ie. the source in this case) of the iterator |
495 | 495 |
Node baseNode(const OutArcIt &e) const { |
496 | 496 |
return Parent::source(static_cast<const Arc&>(e)); |
497 | 497 |
} |
498 | 498 |
// \brief Running node of the iterator |
499 | 499 |
// |
500 | 500 |
// Returns the running node (ie. the target in this case) of the |
501 | 501 |
// iterator |
502 | 502 |
Node runningNode(const OutArcIt &e) const { |
503 | 503 |
return Parent::target(static_cast<const Arc&>(e)); |
504 | 504 |
} |
505 | 505 |
|
506 | 506 |
// \brief Base node of the iterator |
507 | 507 |
// |
508 | 508 |
// Returns the base node (ie. the target in this case) of the iterator |
509 | 509 |
Node baseNode(const InArcIt &e) const { |
510 | 510 |
return Parent::target(static_cast<const Arc&>(e)); |
511 | 511 |
} |
512 | 512 |
// \brief Running node of the iterator |
513 | 513 |
// |
514 | 514 |
// Returns the running node (ie. the source in this case) of the |
515 | 515 |
// iterator |
516 | 516 |
Node runningNode(const InArcIt &e) const { |
517 | 517 |
return Parent::source(static_cast<const Arc&>(e)); |
518 | 518 |
} |
519 | 519 |
|
520 | 520 |
// Base node of the iterator |
521 | 521 |
// |
522 | 522 |
// Returns the base node of the iterator |
523 | 523 |
Node baseNode(const IncEdgeIt &e) const { |
524 | 524 |
return e.direction ? u(e) : v(e); |
525 | 525 |
} |
526 | 526 |
// Running node of the iterator |
527 | 527 |
// |
528 | 528 |
// Returns the running node of the iterator |
529 | 529 |
Node runningNode(const IncEdgeIt &e) const { |
530 | 530 |
return e.direction ? v(e) : u(e); |
531 | 531 |
} |
532 | 532 |
|
533 | 533 |
|
534 | 534 |
template <typename _Value> |
535 | 535 |
class ArcMap |
536 | 536 |
: public MapExtender<DefaultMap<Graph, Arc, _Value> > { |
537 | 537 |
typedef MapExtender<DefaultMap<Graph, Arc, _Value> > Parent; |
538 | 538 |
|
539 | 539 |
public: |
540 |
ArcMap(const Graph& _g) |
|
540 |
explicit ArcMap(const Graph& _g) |
|
541 | 541 |
: Parent(_g) {} |
542 | 542 |
ArcMap(const Graph& _g, const _Value& _v) |
543 | 543 |
: Parent(_g, _v) {} |
544 | 544 |
|
545 | 545 |
ArcMap& operator=(const ArcMap& cmap) { |
546 | 546 |
return operator=<ArcMap>(cmap); |
547 | 547 |
} |
548 | 548 |
|
549 | 549 |
template <typename CMap> |
550 | 550 |
ArcMap& operator=(const CMap& cmap) { |
551 | 551 |
Parent::operator=(cmap); |
552 | 552 |
return *this; |
553 | 553 |
} |
554 | 554 |
|
555 | 555 |
}; |
556 | 556 |
|
557 | 557 |
|
558 | 558 |
template <typename _Value> |
559 | 559 |
class EdgeMap |
560 | 560 |
: public MapExtender<DefaultMap<Graph, Edge, _Value> > { |
561 | 561 |
typedef MapExtender<DefaultMap<Graph, Edge, _Value> > Parent; |
562 | 562 |
|
563 | 563 |
public: |
564 |
EdgeMap(const Graph& _g) |
|
564 |
explicit EdgeMap(const Graph& _g) |
|
565 | 565 |
: Parent(_g) {} |
566 | 566 |
|
567 | 567 |
EdgeMap(const Graph& _g, const _Value& _v) |
568 | 568 |
: Parent(_g, _v) {} |
569 | 569 |
|
570 | 570 |
EdgeMap& operator=(const EdgeMap& cmap) { |
571 | 571 |
return operator=<EdgeMap>(cmap); |
572 | 572 |
} |
573 | 573 |
|
574 | 574 |
template <typename CMap> |
575 | 575 |
EdgeMap& operator=(const CMap& cmap) { |
576 | 576 |
Parent::operator=(cmap); |
577 | 577 |
return *this; |
578 | 578 |
} |
579 | 579 |
|
580 | 580 |
}; |
581 | 581 |
|
582 | 582 |
|
583 | 583 |
// Alteration extension |
584 | 584 |
|
585 | 585 |
Edge addEdge(const Node& from, const Node& to) { |
586 | 586 |
Edge edge = Parent::addEdge(from, to); |
587 | 587 |
notifier(Edge()).add(edge); |
588 | 588 |
std::vector<Arc> arcs; |
589 | 589 |
arcs.push_back(Parent::direct(edge, true)); |
590 | 590 |
arcs.push_back(Parent::direct(edge, false)); |
591 | 591 |
notifier(Arc()).add(arcs); |
592 | 592 |
return edge; |
593 | 593 |
} |
594 | 594 |
|
595 | 595 |
void clear() { |
596 | 596 |
notifier(Arc()).clear(); |
597 | 597 |
notifier(Edge()).clear(); |
598 | 598 |
Parent::clear(); |
599 | 599 |
} |
600 | 600 |
|
601 | 601 |
void erase(const Edge& edge) { |
602 | 602 |
std::vector<Arc> arcs; |
603 | 603 |
arcs.push_back(Parent::direct(edge, true)); |
604 | 604 |
arcs.push_back(Parent::direct(edge, false)); |
605 | 605 |
notifier(Arc()).erase(arcs); |
606 | 606 |
notifier(Edge()).erase(edge); |
607 | 607 |
Parent::erase(edge); |
608 | 608 |
} |
609 | 609 |
|
610 | 610 |
|
611 | 611 |
EdgeSetExtender() { |
612 | 612 |
arc_notifier.setContainer(*this); |
613 | 613 |
edge_notifier.setContainer(*this); |
614 | 614 |
} |
615 | 615 |
|
616 | 616 |
~EdgeSetExtender() { |
617 | 617 |
edge_notifier.clear(); |
618 | 618 |
arc_notifier.clear(); |
619 | 619 |
} |
620 | 620 |
|
621 | 621 |
}; |
622 | 622 |
|
623 | 623 |
} |
624 | 624 |
|
625 | 625 |
#endif |
... | ... |
@@ -543,177 +543,177 @@ |
543 | 543 |
IncEdgeIt(const Graph& graph, const Node &node) : _graph(&graph) { |
544 | 544 |
_graph->firstInc(*this, _direction, node); |
545 | 545 |
} |
546 | 546 |
|
547 | 547 |
IncEdgeIt(const Graph& graph, const Edge &edge, const Node &node) |
548 | 548 |
: _graph(&graph), Edge(edge) { |
549 | 549 |
_direction = (_graph->source(edge) == node); |
550 | 550 |
} |
551 | 551 |
|
552 | 552 |
IncEdgeIt& operator++() { |
553 | 553 |
_graph->nextInc(*this, _direction); |
554 | 554 |
return *this; |
555 | 555 |
} |
556 | 556 |
}; |
557 | 557 |
|
558 | 558 |
// \brief Base node of the iterator |
559 | 559 |
// |
560 | 560 |
// Returns the base node (ie. the source in this case) of the iterator |
561 | 561 |
Node baseNode(const OutArcIt &arc) const { |
562 | 562 |
return Parent::source(static_cast<const Arc&>(arc)); |
563 | 563 |
} |
564 | 564 |
// \brief Running node of the iterator |
565 | 565 |
// |
566 | 566 |
// Returns the running node (ie. the target in this case) of the |
567 | 567 |
// iterator |
568 | 568 |
Node runningNode(const OutArcIt &arc) const { |
569 | 569 |
return Parent::target(static_cast<const Arc&>(arc)); |
570 | 570 |
} |
571 | 571 |
|
572 | 572 |
// \brief Base node of the iterator |
573 | 573 |
// |
574 | 574 |
// Returns the base node (ie. the target in this case) of the iterator |
575 | 575 |
Node baseNode(const InArcIt &arc) const { |
576 | 576 |
return Parent::target(static_cast<const Arc&>(arc)); |
577 | 577 |
} |
578 | 578 |
// \brief Running node of the iterator |
579 | 579 |
// |
580 | 580 |
// Returns the running node (ie. the source in this case) of the |
581 | 581 |
// iterator |
582 | 582 |
Node runningNode(const InArcIt &arc) const { |
583 | 583 |
return Parent::source(static_cast<const Arc&>(arc)); |
584 | 584 |
} |
585 | 585 |
|
586 | 586 |
// Base node of the iterator |
587 | 587 |
// |
588 | 588 |
// Returns the base node of the iterator |
589 | 589 |
Node baseNode(const IncEdgeIt &edge) const { |
590 | 590 |
return edge._direction ? u(edge) : v(edge); |
591 | 591 |
} |
592 | 592 |
// Running node of the iterator |
593 | 593 |
// |
594 | 594 |
// Returns the running node of the iterator |
595 | 595 |
Node runningNode(const IncEdgeIt &edge) const { |
596 | 596 |
return edge._direction ? v(edge) : u(edge); |
597 | 597 |
} |
598 | 598 |
|
599 | 599 |
// Mappable extension |
600 | 600 |
|
601 | 601 |
template <typename _Value> |
602 | 602 |
class NodeMap |
603 | 603 |
: public MapExtender<DefaultMap<Graph, Node, _Value> > { |
604 | 604 |
typedef MapExtender<DefaultMap<Graph, Node, _Value> > Parent; |
605 | 605 |
|
606 | 606 |
public: |
607 |
NodeMap(const Graph& graph) |
|
607 |
explicit NodeMap(const Graph& graph) |
|
608 | 608 |
: Parent(graph) {} |
609 | 609 |
NodeMap(const Graph& graph, const _Value& value) |
610 | 610 |
: Parent(graph, value) {} |
611 | 611 |
|
612 | 612 |
private: |
613 | 613 |
NodeMap& operator=(const NodeMap& cmap) { |
614 | 614 |
return operator=<NodeMap>(cmap); |
615 | 615 |
} |
616 | 616 |
|
617 | 617 |
template <typename CMap> |
618 | 618 |
NodeMap& operator=(const CMap& cmap) { |
619 | 619 |
Parent::operator=(cmap); |
620 | 620 |
return *this; |
621 | 621 |
} |
622 | 622 |
|
623 | 623 |
}; |
624 | 624 |
|
625 | 625 |
template <typename _Value> |
626 | 626 |
class ArcMap |
627 | 627 |
: public MapExtender<DefaultMap<Graph, Arc, _Value> > { |
628 | 628 |
typedef MapExtender<DefaultMap<Graph, Arc, _Value> > Parent; |
629 | 629 |
|
630 | 630 |
public: |
631 |
ArcMap(const Graph& graph) |
|
631 |
explicit ArcMap(const Graph& graph) |
|
632 | 632 |
: Parent(graph) {} |
633 | 633 |
ArcMap(const Graph& graph, const _Value& value) |
634 | 634 |
: Parent(graph, value) {} |
635 | 635 |
|
636 | 636 |
private: |
637 | 637 |
ArcMap& operator=(const ArcMap& cmap) { |
638 | 638 |
return operator=<ArcMap>(cmap); |
639 | 639 |
} |
640 | 640 |
|
641 | 641 |
template <typename CMap> |
642 | 642 |
ArcMap& operator=(const CMap& cmap) { |
643 | 643 |
Parent::operator=(cmap); |
644 | 644 |
return *this; |
645 | 645 |
} |
646 | 646 |
}; |
647 | 647 |
|
648 | 648 |
|
649 | 649 |
template <typename _Value> |
650 | 650 |
class EdgeMap |
651 | 651 |
: public MapExtender<DefaultMap<Graph, Edge, _Value> > { |
652 | 652 |
typedef MapExtender<DefaultMap<Graph, Edge, _Value> > Parent; |
653 | 653 |
|
654 | 654 |
public: |
655 |
EdgeMap(const Graph& graph) |
|
655 |
explicit EdgeMap(const Graph& graph) |
|
656 | 656 |
: Parent(graph) {} |
657 | 657 |
|
658 | 658 |
EdgeMap(const Graph& graph, const _Value& value) |
659 | 659 |
: Parent(graph, value) {} |
660 | 660 |
|
661 | 661 |
private: |
662 | 662 |
EdgeMap& operator=(const EdgeMap& cmap) { |
663 | 663 |
return operator=<EdgeMap>(cmap); |
664 | 664 |
} |
665 | 665 |
|
666 | 666 |
template <typename CMap> |
667 | 667 |
EdgeMap& operator=(const CMap& cmap) { |
668 | 668 |
Parent::operator=(cmap); |
669 | 669 |
return *this; |
670 | 670 |
} |
671 | 671 |
|
672 | 672 |
}; |
673 | 673 |
|
674 | 674 |
// Alteration extension |
675 | 675 |
|
676 | 676 |
Node addNode() { |
677 | 677 |
Node node = Parent::addNode(); |
678 | 678 |
notifier(Node()).add(node); |
679 | 679 |
return node; |
680 | 680 |
} |
681 | 681 |
|
682 | 682 |
Edge addEdge(const Node& from, const Node& to) { |
683 | 683 |
Edge edge = Parent::addEdge(from, to); |
684 | 684 |
notifier(Edge()).add(edge); |
685 | 685 |
std::vector<Arc> ev; |
686 | 686 |
ev.push_back(Parent::direct(edge, true)); |
687 | 687 |
ev.push_back(Parent::direct(edge, false)); |
688 | 688 |
notifier(Arc()).add(ev); |
689 | 689 |
return edge; |
690 | 690 |
} |
691 | 691 |
|
692 | 692 |
void clear() { |
693 | 693 |
notifier(Arc()).clear(); |
694 | 694 |
notifier(Edge()).clear(); |
695 | 695 |
notifier(Node()).clear(); |
696 | 696 |
Parent::clear(); |
697 | 697 |
} |
698 | 698 |
|
699 | 699 |
template <typename Graph, typename NodeRefMap, typename EdgeRefMap> |
700 | 700 |
void build(const Graph& graph, NodeRefMap& nodeRef, |
701 | 701 |
EdgeRefMap& edgeRef) { |
702 | 702 |
Parent::build(graph, nodeRef, edgeRef); |
703 | 703 |
notifier(Node()).build(); |
704 | 704 |
notifier(Edge()).build(); |
705 | 705 |
notifier(Arc()).build(); |
706 | 706 |
} |
707 | 707 |
|
708 | 708 |
void erase(const Node& node) { |
709 | 709 |
Arc arc; |
710 | 710 |
Parent::firstOut(arc, node); |
711 | 711 |
while (arc != INVALID ) { |
712 | 712 |
erase(arc); |
713 | 713 |
Parent::firstOut(arc, node); |
714 | 714 |
} |
715 | 715 |
|
716 | 716 |
Parent::firstIn(arc, node); |
717 | 717 |
while (arc != INVALID ) { |
718 | 718 |
erase(arc); |
719 | 719 |
Parent::firstIn(arc, node); |
0 comments (0 inline)