1.1 --- a/lemon/bits/alteration_notifier.h Thu Jan 26 06:44:22 2006 +0000
1.2 +++ b/lemon/bits/alteration_notifier.h Thu Jan 26 15:42:13 2006 +0000
1.3 @@ -442,83 +442,83 @@
1.4 /// enable_if boost technique?
1.5
1.6 template <typename _Base>
1.7 - class AlterableUndirGraphExtender
1.8 + class AlterableUGraphExtender
1.9 : public AlterableGraphExtender<_Base> {
1.10 public:
1.11
1.12 - typedef AlterableUndirGraphExtender Graph;
1.13 + typedef AlterableUGraphExtender Graph;
1.14 typedef AlterableGraphExtender<_Base> Parent;
1.15
1.16 - typedef typename Parent::UndirEdge UndirEdge;
1.17 + typedef typename Parent::UEdge UEdge;
1.18
1.19 /// The edge observer registry.
1.20 - typedef AlterationNotifier<UndirEdge> UndirEdgeNotifier;
1.21 + typedef AlterationNotifier<UEdge> UEdgeNotifier;
1.22
1.23 protected:
1.24
1.25 - mutable UndirEdgeNotifier undir_edge_notifier;
1.26 + mutable UEdgeNotifier u_edge_notifier;
1.27
1.28 public:
1.29
1.30 using Parent::getNotifier;
1.31 - UndirEdgeNotifier& getNotifier(UndirEdge) const {
1.32 - return undir_edge_notifier;
1.33 + UEdgeNotifier& getNotifier(UEdge) const {
1.34 + return u_edge_notifier;
1.35 }
1.36
1.37 - ~AlterableUndirGraphExtender() {
1.38 - undir_edge_notifier.clear();
1.39 + ~AlterableUGraphExtender() {
1.40 + u_edge_notifier.clear();
1.41 }
1.42 };
1.43
1.44 template <typename _Base>
1.45 - class AlterableUndirEdgeSetExtender
1.46 + class AlterableUEdgeSetExtender
1.47 : public AlterableEdgeSetExtender<_Base> {
1.48 public:
1.49
1.50 - typedef AlterableUndirEdgeSetExtender Graph;
1.51 + typedef AlterableUEdgeSetExtender Graph;
1.52 typedef AlterableEdgeSetExtender<_Base> Parent;
1.53
1.54 - typedef typename Parent::UndirEdge UndirEdge;
1.55 + typedef typename Parent::UEdge UEdge;
1.56
1.57 - typedef AlterationNotifier<UndirEdge> UndirEdgeNotifier;
1.58 + typedef AlterationNotifier<UEdge> UEdgeNotifier;
1.59
1.60 protected:
1.61
1.62 - mutable UndirEdgeNotifier undir_edge_notifier;
1.63 + mutable UEdgeNotifier u_edge_notifier;
1.64
1.65 public:
1.66
1.67 using Parent::getNotifier;
1.68 - UndirEdgeNotifier& getNotifier(UndirEdge) const {
1.69 - return undir_edge_notifier;
1.70 + UEdgeNotifier& getNotifier(UEdge) const {
1.71 + return u_edge_notifier;
1.72 }
1.73
1.74 - ~AlterableUndirEdgeSetExtender() {
1.75 - undir_edge_notifier.clear();
1.76 + ~AlterableUEdgeSetExtender() {
1.77 + u_edge_notifier.clear();
1.78 }
1.79 };
1.80
1.81
1.82
1.83 template <typename _Base>
1.84 - class AlterableUndirBipartiteGraphExtender : public _Base {
1.85 + class AlterableUBipartiteGraphExtender : public _Base {
1.86 public:
1.87
1.88 typedef _Base Parent;
1.89 - typedef AlterableUndirBipartiteGraphExtender Graph;
1.90 + typedef AlterableUBipartiteGraphExtender Graph;
1.91
1.92 typedef typename Parent::Node Node;
1.93 typedef typename Parent::LowerNode LowerNode;
1.94 typedef typename Parent::UpperNode UpperNode;
1.95 typedef typename Parent::Edge Edge;
1.96 - typedef typename Parent::UndirEdge UndirEdge;
1.97 + typedef typename Parent::UEdge UEdge;
1.98
1.99
1.100 typedef AlterationNotifier<Node> NodeNotifier;
1.101 typedef AlterationNotifier<LowerNode> LowerNodeNotifier;
1.102 typedef AlterationNotifier<UpperNode> UpperNodeNotifier;
1.103 typedef AlterationNotifier<Edge> EdgeNotifier;
1.104 - typedef AlterationNotifier<UndirEdge> UndirEdgeNotifier;
1.105 + typedef AlterationNotifier<UEdge> UEdgeNotifier;
1.106
1.107 protected:
1.108
1.109 @@ -526,7 +526,7 @@
1.110 mutable LowerNodeNotifier lowerNodeNotifier;
1.111 mutable UpperNodeNotifier upperNodeNotifier;
1.112 mutable EdgeNotifier edgeNotifier;
1.113 - mutable UndirEdgeNotifier undirEdgeNotifier;
1.114 + mutable UEdgeNotifier uEdgeNotifier;
1.115
1.116 public:
1.117
1.118 @@ -546,16 +546,16 @@
1.119 return edgeNotifier;
1.120 }
1.121
1.122 - UndirEdgeNotifier& getNotifier(UndirEdge) const {
1.123 - return undirEdgeNotifier;
1.124 + UEdgeNotifier& getNotifier(UEdge) const {
1.125 + return uEdgeNotifier;
1.126 }
1.127
1.128 - ~AlterableUndirBipartiteGraphExtender() {
1.129 + ~AlterableUBipartiteGraphExtender() {
1.130 nodeNotifier.clear();
1.131 lowerNodeNotifier.clear();
1.132 upperNodeNotifier.clear();
1.133 edgeNotifier.clear();
1.134 - undirEdgeNotifier.clear();
1.135 + uEdgeNotifier.clear();
1.136 }
1.137
1.138 };