1.1 --- a/lemon/bits/alteration_notifier.h Thu Mar 01 16:50:12 2007 +0000
1.2 +++ b/lemon/bits/alteration_notifier.h Thu Mar 01 17:14:24 2007 +0000
1.3 @@ -143,13 +143,13 @@
1.4 ///
1.5 /// Default constructor for ObserverBase.
1.6 ///
1.7 - ObserverBase() : notifier(0) {}
1.8 + ObserverBase() : _notifier(0) {}
1.9
1.10 /// \brief Constructor which attach the observer into notifier.
1.11 ///
1.12 /// Constructor which attach the observer into notifier.
1.13 - ObserverBase(AlterationNotifier& _notifier) {
1.14 - attach(_notifier);
1.15 + ObserverBase(AlterationNotifier& notifier) {
1.16 + attach(notifier);
1.17 }
1.18
1.19 /// \brief Constructor which attach the obserever to the same notifier.
1.20 @@ -158,7 +158,7 @@
1.21 /// the other observer is attached to.
1.22 ObserverBase(const ObserverBase& copy) {
1.23 if (copy.attached()) {
1.24 - attach(*copy.getNotifier());
1.25 + attach(*copy._notifier());
1.26 }
1.27 }
1.28
1.29 @@ -173,8 +173,8 @@
1.30 ///
1.31 /// This member attaches the observer into an AlterationNotifier.
1.32 ///
1.33 - void attach(AlterationNotifier& _notifier) {
1.34 - _notifier.attach(*this);
1.35 + void attach(AlterationNotifier& notifier) {
1.36 + notifier.attach(*this);
1.37 }
1.38
1.39 /// \brief Detaches the observer into an AlterationNotifier.
1.40 @@ -182,7 +182,7 @@
1.41 /// This member detaches the observer from an AlterationNotifier.
1.42 ///
1.43 void detach() {
1.44 - notifier->detach(*this);
1.45 + _notifier->detach(*this);
1.46 }
1.47
1.48 /// \brief Gives back a pointer to the notifier which the map
1.49 @@ -191,10 +191,10 @@
1.50 /// This function gives back a pointer to the notifier which the map
1.51 /// attached into.
1.52 ///
1.53 - Notifier* getNotifier() const { return const_cast<Notifier*>(notifier); }
1.54 + Notifier* notifier() const { return const_cast<Notifier*>(_notifier); }
1.55
1.56 /// Gives back true when the observer is attached into a notifier.
1.57 - bool attached() const { return notifier != 0; }
1.58 + bool attached() const { return _notifier != 0; }
1.59
1.60 private:
1.61
1.62 @@ -202,8 +202,8 @@
1.63
1.64 protected:
1.65
1.66 - Notifier* notifier;
1.67 - typename std::list<ObserverBase*>::iterator index;
1.68 + Notifier* _notifier;
1.69 + typename std::list<ObserverBase*>::iterator _index;
1.70
1.71 /// \brief The member function to notificate the observer about an
1.72 /// item is added to the container.
1.73 @@ -261,7 +261,7 @@
1.74 const Container* container;
1.75
1.76 typedef std::list<ObserverBase*> Observers;
1.77 - Observers observers;
1.78 + Observers _observers;
1.79
1.80
1.81 public:
1.82 @@ -293,8 +293,8 @@
1.83 ///
1.84 ~AlterationNotifier() {
1.85 typename Observers::iterator it;
1.86 - for (it = observers.begin(); it != observers.end(); ++it) {
1.87 - (*it)->notifier = 0;
1.88 + for (it = _observers.begin(); it != _observers.end(); ++it) {
1.89 + (*it)->_notifier = 0;
1.90 }
1.91 }
1.92
1.93 @@ -346,14 +346,14 @@
1.94 protected:
1.95
1.96 void attach(ObserverBase& observer) {
1.97 - observer.index = observers.insert(observers.begin(), &observer);
1.98 - observer.notifier = this;
1.99 + observer._index = _observers.insert(_observers.begin(), &observer);
1.100 + observer._notifier = this;
1.101 }
1.102
1.103 void detach(ObserverBase& observer) {
1.104 - observers.erase(observer.index);
1.105 - observer.index = observers.end();
1.106 - observer.notifier = 0;
1.107 + _observers.erase(observer._index);
1.108 + observer._index = _observers.end();
1.109 + observer._notifier = 0;
1.110 }
1.111
1.112 public:
1.113 @@ -367,12 +367,12 @@
1.114 void add(const Item& item) {
1.115 typename Observers::reverse_iterator it;
1.116 try {
1.117 - for (it = observers.rbegin(); it != observers.rend(); ++it) {
1.118 + for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
1.119 (*it)->add(item);
1.120 }
1.121 } catch (...) {
1.122 typename Observers::iterator jt;
1.123 - for (jt = it.base(); jt != observers.end(); ++jt) {
1.124 + for (jt = it.base(); jt != _observers.end(); ++jt) {
1.125 (*jt)->erase(item);
1.126 }
1.127 throw;
1.128 @@ -388,12 +388,12 @@
1.129 void add(const std::vector<Item>& items) {
1.130 typename Observers::reverse_iterator it;
1.131 try {
1.132 - for (it = observers.rbegin(); it != observers.rend(); ++it) {
1.133 + for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
1.134 (*it)->add(items);
1.135 }
1.136 } catch (...) {
1.137 typename Observers::iterator jt;
1.138 - for (jt = it.base(); jt != observers.end(); ++jt) {
1.139 + for (jt = it.base(); jt != _observers.end(); ++jt) {
1.140 (*jt)->erase(items);
1.141 }
1.142 throw;
1.143 @@ -407,15 +407,15 @@
1.144 /// the container.
1.145 ///
1.146 void erase(const Item& item) throw() {
1.147 - typename Observers::iterator it = observers.begin();
1.148 - while (it != observers.end()) {
1.149 + typename Observers::iterator it = _observers.begin();
1.150 + while (it != _observers.end()) {
1.151 try {
1.152 (*it)->erase(item);
1.153 ++it;
1.154 } catch (const ImmediateDetach&) {
1.155 - it = observers.erase(it);
1.156 - (*it)->index = observers.end();
1.157 - (*it)->notifier = 0;
1.158 + it = _observers.erase(it);
1.159 + (*it)->_index = _observers.end();
1.160 + (*it)->_notifier = 0;
1.161 }
1.162 }
1.163 }
1.164 @@ -427,15 +427,15 @@
1.165 /// the container.
1.166 ///
1.167 void erase(const std::vector<Item>& items) {
1.168 - typename Observers::iterator it = observers.begin();
1.169 - while (it != observers.end()) {
1.170 + typename Observers::iterator it = _observers.begin();
1.171 + while (it != _observers.end()) {
1.172 try {
1.173 (*it)->erase(items);
1.174 ++it;
1.175 } catch (const ImmediateDetach&) {
1.176 - it = observers.erase(it);
1.177 - (*it)->index = observers.end();
1.178 - (*it)->notifier = 0;
1.179 + it = _observers.erase(it);
1.180 + (*it)->_index = _observers.end();
1.181 + (*it)->_notifier = 0;
1.182 }
1.183 }
1.184 }
1.185 @@ -448,12 +448,12 @@
1.186 void build() {
1.187 typename Observers::reverse_iterator it;
1.188 try {
1.189 - for (it = observers.rbegin(); it != observers.rend(); ++it) {
1.190 + for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
1.191 (*it)->build();
1.192 }
1.193 } catch (...) {
1.194 typename Observers::iterator jt;
1.195 - for (jt = it.base(); jt != observers.end(); ++jt) {
1.196 + for (jt = it.base(); jt != _observers.end(); ++jt) {
1.197 (*jt)->clear();
1.198 }
1.199 throw;
1.200 @@ -466,15 +466,15 @@
1.201 /// Notifies all the registed observers about all items are erased
1.202 /// from the container.
1.203 void clear() {
1.204 - typename Observers::iterator it = observers.begin();
1.205 - while (it != observers.end()) {
1.206 + typename Observers::iterator it = _observers.begin();
1.207 + while (it != _observers.end()) {
1.208 try {
1.209 (*it)->clear();
1.210 ++it;
1.211 } catch (const ImmediateDetach&) {
1.212 - it = observers.erase(it);
1.213 - (*it)->index = observers.end();
1.214 - (*it)->notifier = 0;
1.215 + it = _observers.erase(it);
1.216 + (*it)->_index = _observers.end();
1.217 + (*it)->_notifier = 0;
1.218 }
1.219 }
1.220 }
2.1 --- a/lemon/bits/array_map.h Thu Mar 01 16:50:12 2007 +0000
2.2 +++ b/lemon/bits/array_map.h Thu Mar 01 17:14:24 2007 +0000
2.3 @@ -79,9 +79,9 @@
2.4 ///
2.5 /// Graph initialized map constructor.
2.6 explicit ArrayMap(const Graph& graph) {
2.7 - Parent::attach(graph.getNotifier(Item()));
2.8 + Parent::attach(graph.notifier(Item()));
2.9 allocate_memory();
2.10 - Notifier* notifier = Parent::getNotifier();
2.11 + Notifier* notifier = Parent::notifier();
2.12 Item it;
2.13 for (notifier->first(it); it != INVALID; notifier->next(it)) {
2.14 int id = notifier->id(it);;
2.15 @@ -93,9 +93,9 @@
2.16 ///
2.17 /// It constructs a map and initialize all of the the map.
2.18 ArrayMap(const Graph& graph, const Value& value) {
2.19 - Parent::attach(graph.getNotifier(Item()));
2.20 + Parent::attach(graph.notifier(Item()));
2.21 allocate_memory();
2.22 - Notifier* notifier = Parent::getNotifier();
2.23 + Notifier* notifier = Parent::notifier();
2.24 Item it;
2.25 for (notifier->first(it); it != INVALID; notifier->next(it)) {
2.26 int id = notifier->id(it);;
2.27 @@ -108,12 +108,12 @@
2.28 /// Constructor to copy a map of the same map type.
2.29 ArrayMap(const ArrayMap& copy) : Parent() {
2.30 if (copy.attached()) {
2.31 - attach(*copy.getNotifier());
2.32 + attach(*copy.notifier());
2.33 }
2.34 capacity = copy.capacity;
2.35 if (capacity == 0) return;
2.36 values = allocator.allocate(capacity);
2.37 - Notifier* notifier = Parent::getNotifier();
2.38 + Notifier* notifier = Parent::notifier();
2.39 Item it;
2.40 for (notifier->first(it); it != INVALID; notifier->next(it)) {
2.41 int id = notifier->id(it);;
2.42 @@ -142,7 +142,7 @@
2.43 template <typename CMap>
2.44 ArrayMap& operator=(const CMap& cmap) {
2.45 checkConcept<concepts::ReadMap<Key, _Value>, CMap>();
2.46 - const typename Parent::Notifier* notifier = Parent::getNotifier();
2.47 + const typename Parent::Notifier* notifier = Parent::notifier();
2.48 Item it;
2.49 for (notifier->first(it); it != INVALID; notifier->next(it)) {
2.50 set(it, cmap[it]);
2.51 @@ -173,7 +173,7 @@
2.52 /// The subscript operator. The map can be subscripted by the
2.53 /// actual keys of the graph.
2.54 Value& operator[](const Key& key) {
2.55 - int id = Parent::getNotifier()->id(key);
2.56 + int id = Parent::notifier()->id(key);
2.57 return values[id];
2.58 }
2.59
2.60 @@ -182,7 +182,7 @@
2.61 /// The const subscript operator. The map can be subscripted by the
2.62 /// actual keys of the graph.
2.63 const Value& operator[](const Key& key) const {
2.64 - int id = Parent::getNotifier()->id(key);
2.65 + int id = Parent::notifier()->id(key);
2.66 return values[id];
2.67 }
2.68
2.69 @@ -201,7 +201,7 @@
2.70 /// It adds a new key to the map. It called by the observer notifier
2.71 /// and it overrides the add() member function of the observer base.
2.72 virtual void add(const Key& key) {
2.73 - Notifier* notifier = Parent::getNotifier();
2.74 + Notifier* notifier = Parent::notifier();
2.75 int id = notifier->id(key);
2.76 if (id >= capacity) {
2.77 int new_capacity = (capacity == 0 ? 1 : capacity);
2.78 @@ -229,7 +229,7 @@
2.79 /// It adds more new keys to the map. It called by the observer notifier
2.80 /// and it overrides the add() member function of the observer base.
2.81 virtual void add(const std::vector<Key>& keys) {
2.82 - Notifier* notifier = Parent::getNotifier();
2.83 + Notifier* notifier = Parent::notifier();
2.84 int max_id = -1;
2.85 for (int i = 0; i < (int)keys.size(); ++i) {
2.86 int id = notifier->id(keys[i]);
2.87 @@ -273,7 +273,7 @@
2.88 /// Erase a key from the map. It called by the observer notifier
2.89 /// and it overrides the erase() member function of the observer base.
2.90 virtual void erase(const Key& key) {
2.91 - int id = Parent::getNotifier()->id(key);
2.92 + int id = Parent::notifier()->id(key);
2.93 allocator.destroy(&(values[id]));
2.94 }
2.95
2.96 @@ -283,7 +283,7 @@
2.97 /// and it overrides the erase() member function of the observer base.
2.98 virtual void erase(const std::vector<Key>& keys) {
2.99 for (int i = 0; i < (int)keys.size(); ++i) {
2.100 - int id = Parent::getNotifier()->id(keys[i]);
2.101 + int id = Parent::notifier()->id(keys[i]);
2.102 allocator.destroy(&(values[id]));
2.103 }
2.104 }
2.105 @@ -293,7 +293,7 @@
2.106 /// It buildes the map. It called by the observer notifier
2.107 /// and it overrides the build() member function of the observer base.
2.108 virtual void build() {
2.109 - Notifier* notifier = Parent::getNotifier();
2.110 + Notifier* notifier = Parent::notifier();
2.111 allocate_memory();
2.112 Item it;
2.113 for (notifier->first(it); it != INVALID; notifier->next(it)) {
2.114 @@ -307,7 +307,7 @@
2.115 /// It erase all items from the map. It called by the observer notifier
2.116 /// and it overrides the clear() member function of the observer base.
2.117 virtual void clear() {
2.118 - Notifier* notifier = Parent::getNotifier();
2.119 + Notifier* notifier = Parent::notifier();
2.120 if (capacity != 0) {
2.121 Item it;
2.122 for (notifier->first(it); it != INVALID; notifier->next(it)) {
2.123 @@ -322,7 +322,7 @@
2.124 private:
2.125
2.126 void allocate_memory() {
2.127 - int max_id = Parent::getNotifier()->maxId();
2.128 + int max_id = Parent::notifier()->maxId();
2.129 if (max_id == -1) {
2.130 capacity = 0;
2.131 values = 0;
3.1 --- a/lemon/bits/debug_map.h Thu Mar 01 16:50:12 2007 +0000
3.2 +++ b/lemon/bits/debug_map.h Thu Mar 01 17:14:24 2007 +0000
3.3 @@ -111,13 +111,13 @@
3.4 /// It constructs a map and attachs it into the notifier.
3.5 /// It adds all the items of the graph to the map.
3.6 DebugMap(const Graph& graph) {
3.7 - Parent::attach(graph.getNotifier(Item()));
3.8 - container.resize(Parent::getNotifier()->maxId() + 1);
3.9 - flag.resize(Parent::getNotifier()->maxId() + 1, false);
3.10 - const typename Parent::Notifier* notifier = Parent::getNotifier();
3.11 + Parent::attach(graph.notifier(Item()));
3.12 + container.resize(Parent::notifier()->maxId() + 1);
3.13 + flag.resize(Parent::notifier()->maxId() + 1, false);
3.14 + const typename Parent::Notifier* notifier = Parent::notifier();
3.15 Item it;
3.16 for (notifier->first(it); it != INVALID; notifier->next(it)) {
3.17 - flag[Parent::getNotifier()->id(it)] = true;
3.18 + flag[Parent::notifier()->id(it)] = true;
3.19 }
3.20 }
3.21
3.22 @@ -126,13 +126,13 @@
3.23 /// It constructs a map uses a given value to initialize the map.
3.24 /// It adds all the items of the graph to the map.
3.25 DebugMap(const Graph& graph, const Value& value) {
3.26 - Parent::attach(graph.getNotifier(Item()));
3.27 - container.resize(Parent::getNotifier()->maxId() + 1, value);
3.28 - flag.resize(Parent::getNotifier()->maxId() + 1, false);
3.29 - const typename Parent::Notifier* notifier = Parent::getNotifier();
3.30 + Parent::attach(graph.notifier(Item()));
3.31 + container.resize(Parent::notifier()->maxId() + 1, value);
3.32 + flag.resize(Parent::notifier()->maxId() + 1, false);
3.33 + const typename Parent::Notifier* notifier = Parent::notifier();
3.34 Item it;
3.35 for (notifier->first(it); it != INVALID; notifier->next(it)) {
3.36 - flag[Parent::getNotifier()->id(it)] = true;
3.37 + flag[Parent::notifier()->id(it)] = true;
3.38 }
3.39 }
3.40
3.41 @@ -141,15 +141,15 @@
3.42 /// Copy constructor.
3.43 DebugMap(const DebugMap& _copy) : Parent() {
3.44 if (_copy.attached()) {
3.45 - Parent::attach(*_copy.getNotifier());
3.46 + Parent::attach(*_copy.notifier());
3.47 container = _copy.container;
3.48 }
3.49 - flag.resize(Parent::getNotifier()->maxId() + 1, false);
3.50 - const typename Parent::Notifier* notifier = Parent::getNotifier();
3.51 + flag.resize(Parent::notifier()->maxId() + 1, false);
3.52 + const typename Parent::Notifier* notifier = Parent::notifier();
3.53 Item it;
3.54 for (notifier->first(it); it != INVALID; notifier->next(it)) {
3.55 - flag[Parent::getNotifier()->id(it)] = true;
3.56 - LEMON_ASSERT(_copy.flag[Parent::getNotifier()->id(it)], MapError());
3.57 + flag[Parent::notifier()->id(it)] = true;
3.58 + LEMON_ASSERT(_copy.flag[Parent::notifier()->id(it)], MapError());
3.59 }
3.60 }
3.61
3.62 @@ -157,12 +157,12 @@
3.63 ///
3.64 /// Destructor.
3.65 ~DebugMap() {
3.66 - const typename Parent::Notifier* notifier = Parent::getNotifier();
3.67 + const typename Parent::Notifier* notifier = Parent::notifier();
3.68 if (notifier != 0) {
3.69 Item it;
3.70 for (notifier->first(it); it != INVALID; notifier->next(it)) {
3.71 - LEMON_ASSERT(flag[Parent::getNotifier()->id(it)], MapError());
3.72 - flag[Parent::getNotifier()->id(it)] = false;
3.73 + LEMON_ASSERT(flag[Parent::notifier()->id(it)], MapError());
3.74 + flag[Parent::notifier()->id(it)] = false;
3.75 }
3.76 }
3.77 for (int i = 0; i < (int)flag.size(); ++i) {
3.78 @@ -191,7 +191,7 @@
3.79 template <typename CMap>
3.80 DebugMap& operator=(const CMap& cmap) {
3.81 checkConcept<concepts::ReadMap<Key, _Value>, CMap>();
3.82 - const typename Parent::Notifier* notifier = Parent::getNotifier();
3.83 + const typename Parent::Notifier* notifier = Parent::notifier();
3.84 Item it;
3.85 for (notifier->first(it); it != INVALID; notifier->next(it)) {
3.86 set(it, cmap[it]);
3.87 @@ -206,8 +206,8 @@
3.88 /// The subscript operator. The map can be subscripted by the
3.89 /// actual items of the graph.
3.90 Reference operator[](const Key& key) {
3.91 - LEMON_ASSERT(flag[Parent::getNotifier()->id(key)], MapError());
3.92 - return container[Parent::getNotifier()->id(key)];
3.93 + LEMON_ASSERT(flag[Parent::notifier()->id(key)], MapError());
3.94 + return container[Parent::notifier()->id(key)];
3.95 }
3.96
3.97 /// \brief The const subcript operator.
3.98 @@ -215,8 +215,8 @@
3.99 /// The const subscript operator. The map can be subscripted by the
3.100 /// actual items of the graph.
3.101 ConstReference operator[](const Key& key) const {
3.102 - LEMON_ASSERT(flag[Parent::getNotifier()->id(key)], MapError());
3.103 - return container[Parent::getNotifier()->id(key)];
3.104 + LEMON_ASSERT(flag[Parent::notifier()->id(key)], MapError());
3.105 + return container[Parent::notifier()->id(key)];
3.106 }
3.107
3.108
3.109 @@ -234,19 +234,19 @@
3.110 /// It adds a new key to the map. It called by the observer notifier
3.111 /// and it overrides the add() member function of the observer base.
3.112 virtual void add(const Key& key) {
3.113 - int id = Parent::getNotifier()->id(key);
3.114 + int id = Parent::notifier()->id(key);
3.115 if (id >= (int)container.size()) {
3.116 container.resize(id + 1);
3.117 flag.resize(id + 1, false);
3.118 }
3.119 - LEMON_ASSERT(!flag[Parent::getNotifier()->id(key)], MapError());
3.120 - flag[Parent::getNotifier()->id(key)] = true;
3.121 + LEMON_ASSERT(!flag[Parent::notifier()->id(key)], MapError());
3.122 + flag[Parent::notifier()->id(key)] = true;
3.123 if (strictCheck) {
3.124 std::vector<bool> fl(flag.size(), false);
3.125 - const typename Parent::Notifier* notifier = Parent::getNotifier();
3.126 + const typename Parent::Notifier* notifier = Parent::notifier();
3.127 Item it;
3.128 for (notifier->first(it); it != INVALID; notifier->next(it)) {
3.129 - int id = Parent::getNotifier()->id(it);
3.130 + int id = Parent::notifier()->id(it);
3.131 fl[id] = true;
3.132 }
3.133 LEMON_ASSERT(fl == flag, MapError());
3.134 @@ -260,7 +260,7 @@
3.135 virtual void add(const std::vector<Key>& keys) {
3.136 int max = container.size() - 1;
3.137 for (int i = 0; i < (int)keys.size(); ++i) {
3.138 - int id = Parent::getNotifier()->id(keys[i]);
3.139 + int id = Parent::notifier()->id(keys[i]);
3.140 if (id >= max) {
3.141 max = id;
3.142 }
3.143 @@ -268,15 +268,15 @@
3.144 container.resize(max + 1);
3.145 flag.resize(max + 1, false);
3.146 for (int i = 0; i < (int)keys.size(); ++i) {
3.147 - LEMON_ASSERT(!flag[Parent::getNotifier()->id(keys[i])], MapError());
3.148 - flag[Parent::getNotifier()->id(keys[i])] = true;
3.149 + LEMON_ASSERT(!flag[Parent::notifier()->id(keys[i])], MapError());
3.150 + flag[Parent::notifier()->id(keys[i])] = true;
3.151 }
3.152 if (strictCheck) {
3.153 std::vector<bool> fl(flag.size(), false);
3.154 - const typename Parent::Notifier* notifier = Parent::getNotifier();
3.155 + const typename Parent::Notifier* notifier = Parent::notifier();
3.156 Item it;
3.157 for (notifier->first(it); it != INVALID; notifier->next(it)) {
3.158 - int id = Parent::getNotifier()->id(it);
3.159 + int id = Parent::notifier()->id(it);
3.160 fl[id] = true;
3.161 }
3.162 LEMON_ASSERT(fl == flag, MapError());
3.163 @@ -290,17 +290,17 @@
3.164 virtual void erase(const Key& key) {
3.165 if (strictCheck) {
3.166 std::vector<bool> fl(flag.size(), false);
3.167 - const typename Parent::Notifier* notifier = Parent::getNotifier();
3.168 + const typename Parent::Notifier* notifier = Parent::notifier();
3.169 Item it;
3.170 for (notifier->first(it); it != INVALID; notifier->next(it)) {
3.171 - int id = Parent::getNotifier()->id(it);
3.172 + int id = Parent::notifier()->id(it);
3.173 fl[id] = true;
3.174 }
3.175 LEMON_ASSERT(fl == flag, MapError());
3.176 }
3.177 - container[Parent::getNotifier()->id(key)] = Value();
3.178 - LEMON_ASSERT(flag[Parent::getNotifier()->id(key)], MapError());
3.179 - flag[Parent::getNotifier()->id(key)] = false;
3.180 + container[Parent::notifier()->id(key)] = Value();
3.181 + LEMON_ASSERT(flag[Parent::notifier()->id(key)], MapError());
3.182 + flag[Parent::notifier()->id(key)] = false;
3.183 }
3.184
3.185 /// \brief Erase more keys from the map.
3.186 @@ -310,18 +310,18 @@
3.187 virtual void erase(const std::vector<Key>& keys) {
3.188 if (strictCheck) {
3.189 std::vector<bool> fl(flag.size(), false);
3.190 - const typename Parent::Notifier* notifier = Parent::getNotifier();
3.191 + const typename Parent::Notifier* notifier = Parent::notifier();
3.192 Item it;
3.193 for (notifier->first(it); it != INVALID; notifier->next(it)) {
3.194 - int id = Parent::getNotifier()->id(it);
3.195 + int id = Parent::notifier()->id(it);
3.196 fl[id] = true;
3.197 }
3.198 LEMON_ASSERT(fl == flag, MapError());
3.199 }
3.200 for (int i = 0; i < (int)keys.size(); ++i) {
3.201 - container[Parent::getNotifier()->id(keys[i])] = Value();
3.202 - LEMON_ASSERT(flag[Parent::getNotifier()->id(keys[i])], MapError());
3.203 - flag[Parent::getNotifier()->id(keys[i])] = false;
3.204 + container[Parent::notifier()->id(keys[i])] = Value();
3.205 + LEMON_ASSERT(flag[Parent::notifier()->id(keys[i])], MapError());
3.206 + flag[Parent::notifier()->id(keys[i])] = false;
3.207 }
3.208 }
3.209
3.210 @@ -335,15 +335,15 @@
3.211 LEMON_ASSERT(flag[i], MapError());
3.212 }
3.213 }
3.214 - int size = Parent::getNotifier()->maxId() + 1;
3.215 + int size = Parent::notifier()->maxId() + 1;
3.216 container.reserve(size);
3.217 container.resize(size);
3.218 flag.reserve(size);
3.219 flag.resize(size, false);
3.220 - const typename Parent::Notifier* notifier = Parent::getNotifier();
3.221 + const typename Parent::Notifier* notifier = Parent::notifier();
3.222 Item it;
3.223 for (notifier->first(it); it != INVALID; notifier->next(it)) {
3.224 - int id = Parent::getNotifier()->id(it);
3.225 + int id = Parent::notifier()->id(it);
3.226 LEMON_ASSERT(!flag[id], MapError());
3.227 flag[id] = true;
3.228 }
3.229 @@ -354,10 +354,10 @@
3.230 /// It erase all items from the map. It called by the observer notifier
3.231 /// and it overrides the clear() member function of the observer base.
3.232 virtual void clear() {
3.233 - const typename Parent::Notifier* notifier = Parent::getNotifier();
3.234 + const typename Parent::Notifier* notifier = Parent::notifier();
3.235 Item it;
3.236 for (notifier->first(it); it != INVALID; notifier->next(it)) {
3.237 - int id = Parent::getNotifier()->id(it);
3.238 + int id = Parent::notifier()->id(it);
3.239 LEMON_ASSERT(flag[id], MapError());
3.240 flag[id] = false;
3.241 }
4.1 --- a/lemon/bits/edge_set_extender.h Thu Mar 01 16:50:12 2007 +0000
4.2 +++ b/lemon/bits/edge_set_extender.h Thu Mar 01 17:14:24 2007 +0000
4.3 @@ -81,12 +81,12 @@
4.4
4.5 public:
4.6
4.7 - using Parent::getNotifier;
4.8 + using Parent::notifier;
4.9
4.10 /// \brief Gives back the edge alteration notifier.
4.11 ///
4.12 /// Gives back the edge alteration notifier.
4.13 - EdgeNotifier& getNotifier(Edge) const {
4.14 + EdgeNotifier& notifier(Edge) const {
4.15 return edge_notifier;
4.16 }
4.17
4.18 @@ -246,17 +246,17 @@
4.19
4.20 Edge addEdge(const Node& from, const Node& to) {
4.21 Edge edge = Parent::addEdge(from, to);
4.22 - getNotifier(Edge()).add(edge);
4.23 + notifier(Edge()).add(edge);
4.24 return edge;
4.25 }
4.26
4.27 void clear() {
4.28 - getNotifier(Edge()).clear();
4.29 + notifier(Edge()).clear();
4.30 Parent::clear();
4.31 }
4.32
4.33 void erase(const Edge& edge) {
4.34 - getNotifier(Edge()).erase(edge);
4.35 + notifier(Edge()).erase(edge);
4.36 Parent::erase(edge);
4.37 }
4.38
4.39 @@ -340,13 +340,13 @@
4.40
4.41 public:
4.42
4.43 - using Parent::getNotifier;
4.44 + using Parent::notifier;
4.45
4.46 - EdgeNotifier& getNotifier(Edge) const {
4.47 + EdgeNotifier& notifier(Edge) const {
4.48 return edge_notifier;
4.49 }
4.50
4.51 - UEdgeNotifier& getNotifier(UEdge) const {
4.52 + UEdgeNotifier& notifier(UEdge) const {
4.53 return uedge_notifier;
4.54 }
4.55
4.56 @@ -589,22 +589,22 @@
4.57
4.58 UEdge addEdge(const Node& from, const Node& to) {
4.59 UEdge uedge = Parent::addEdge(from, to);
4.60 - getNotifier(UEdge()).add(uedge);
4.61 - getNotifier(Edge()).add(Parent::direct(uedge, true));
4.62 - getNotifier(Edge()).add(Parent::direct(uedge, false));
4.63 + notifier(UEdge()).add(uedge);
4.64 + notifier(Edge()).add(Parent::direct(uedge, true));
4.65 + notifier(Edge()).add(Parent::direct(uedge, false));
4.66 return uedge;
4.67 }
4.68
4.69 void clear() {
4.70 - getNotifier(Edge()).clear();
4.71 - getNotifier(UEdge()).clear();
4.72 + notifier(Edge()).clear();
4.73 + notifier(UEdge()).clear();
4.74 Parent::clear();
4.75 }
4.76
4.77 void erase(const UEdge& uedge) {
4.78 - getNotifier(Edge()).erase(Parent::direct(uedge, true));
4.79 - getNotifier(Edge()).erase(Parent::direct(uedge, false));
4.80 - getNotifier(UEdge()).erase(uedge);
4.81 + notifier(Edge()).erase(Parent::direct(uedge, true));
4.82 + notifier(Edge()).erase(Parent::direct(uedge, false));
4.83 + notifier(UEdge()).erase(uedge);
4.84 Parent::erase(uedge);
4.85 }
4.86
5.1 --- a/lemon/bits/graph_extender.h Thu Mar 01 16:50:12 2007 +0000
5.2 +++ b/lemon/bits/graph_extender.h Thu Mar 01 17:14:24 2007 +0000
5.3 @@ -86,11 +86,11 @@
5.4
5.5 public:
5.6
5.7 - NodeNotifier& getNotifier(Node) const {
5.8 + NodeNotifier& notifier(Node) const {
5.9 return node_notifier;
5.10 }
5.11
5.12 - EdgeNotifier& getNotifier(Edge) const {
5.13 + EdgeNotifier& notifier(Edge) const {
5.14 return edge_notifier;
5.15 }
5.16
5.17 @@ -266,27 +266,27 @@
5.18
5.19 Node addNode() {
5.20 Node node = Parent::addNode();
5.21 - getNotifier(Node()).add(node);
5.22 + notifier(Node()).add(node);
5.23 return node;
5.24 }
5.25
5.26 Edge addEdge(const Node& from, const Node& to) {
5.27 Edge edge = Parent::addEdge(from, to);
5.28 - getNotifier(Edge()).add(edge);
5.29 + notifier(Edge()).add(edge);
5.30 return edge;
5.31 }
5.32
5.33 void clear() {
5.34 - getNotifier(Edge()).clear();
5.35 - getNotifier(Node()).clear();
5.36 + notifier(Edge()).clear();
5.37 + notifier(Node()).clear();
5.38 Parent::clear();
5.39 }
5.40
5.41 template <typename Graph, typename NodeRefMap, typename EdgeRefMap>
5.42 void build(const Graph& graph, NodeRefMap& nodeRef, EdgeRefMap& edgeRef) {
5.43 Parent::build(graph, nodeRef, edgeRef);
5.44 - getNotifier(Node()).build();
5.45 - getNotifier(Edge()).build();
5.46 + notifier(Node()).build();
5.47 + notifier(Edge()).build();
5.48 }
5.49
5.50 void erase(const Node& node) {
5.51 @@ -303,12 +303,12 @@
5.52 Parent::firstIn(edge, node);
5.53 }
5.54
5.55 - getNotifier(Node()).erase(node);
5.56 + notifier(Node()).erase(node);
5.57 Parent::erase(node);
5.58 }
5.59
5.60 void erase(const Edge& edge) {
5.61 - getNotifier(Edge()).erase(edge);
5.62 + notifier(Edge()).erase(edge);
5.63 Parent::erase(edge);
5.64 }
5.65
5.66 @@ -397,15 +397,15 @@
5.67
5.68 public:
5.69
5.70 - NodeNotifier& getNotifier(Node) const {
5.71 + NodeNotifier& notifier(Node) const {
5.72 return node_notifier;
5.73 }
5.74
5.75 - EdgeNotifier& getNotifier(Edge) const {
5.76 + EdgeNotifier& notifier(Edge) const {
5.77 return edge_notifier;
5.78 }
5.79
5.80 - UEdgeNotifier& getNotifier(UEdge) const {
5.81 + UEdgeNotifier& notifier(UEdge) const {
5.82 return uedge_notifier;
5.83 }
5.84
5.85 @@ -672,24 +672,24 @@
5.86
5.87 Node addNode() {
5.88 Node node = Parent::addNode();
5.89 - getNotifier(Node()).add(node);
5.90 + notifier(Node()).add(node);
5.91 return node;
5.92 }
5.93
5.94 UEdge addEdge(const Node& from, const Node& to) {
5.95 UEdge uedge = Parent::addEdge(from, to);
5.96 - getNotifier(UEdge()).add(uedge);
5.97 + notifier(UEdge()).add(uedge);
5.98 std::vector<Edge> edges;
5.99 edges.push_back(Parent::direct(uedge, true));
5.100 edges.push_back(Parent::direct(uedge, false));
5.101 - getNotifier(Edge()).add(edges);
5.102 + notifier(Edge()).add(edges);
5.103 return uedge;
5.104 }
5.105
5.106 void clear() {
5.107 - getNotifier(Edge()).clear();
5.108 - getNotifier(UEdge()).clear();
5.109 - getNotifier(Node()).clear();
5.110 + notifier(Edge()).clear();
5.111 + notifier(UEdge()).clear();
5.112 + notifier(Node()).clear();
5.113 Parent::clear();
5.114 }
5.115
5.116 @@ -697,9 +697,9 @@
5.117 void build(const Graph& graph, NodeRefMap& nodeRef,
5.118 UEdgeRefMap& uEdgeRef) {
5.119 Parent::build(graph, nodeRef, uEdgeRef);
5.120 - getNotifier(Node()).build();
5.121 - getNotifier(UEdge()).build();
5.122 - getNotifier(Edge()).build();
5.123 + notifier(Node()).build();
5.124 + notifier(UEdge()).build();
5.125 + notifier(Edge()).build();
5.126 }
5.127
5.128 void erase(const Node& node) {
5.129 @@ -716,7 +716,7 @@
5.130 Parent::firstIn(edge, node);
5.131 }
5.132
5.133 - getNotifier(Node()).erase(node);
5.134 + notifier(Node()).erase(node);
5.135 Parent::erase(node);
5.136 }
5.137
5.138 @@ -724,8 +724,8 @@
5.139 std::vector<Edge> edges;
5.140 edges.push_back(Parent::direct(uedge, true));
5.141 edges.push_back(Parent::direct(uedge, false));
5.142 - getNotifier(Edge()).erase(edges);
5.143 - getNotifier(UEdge()).erase(uedge);
5.144 + notifier(Edge()).erase(edges);
5.145 + notifier(UEdge()).erase(uedge);
5.146 Parent::erase(uedge);
5.147 }
5.148
5.149 @@ -823,23 +823,23 @@
5.150
5.151 public:
5.152
5.153 - NodeNotifier& getNotifier(Node) const {
5.154 + NodeNotifier& notifier(Node) const {
5.155 return node_notifier;
5.156 }
5.157
5.158 - ANodeNotifier& getNotifier(ANode) const {
5.159 + ANodeNotifier& notifier(ANode) const {
5.160 return anode_notifier;
5.161 }
5.162
5.163 - BNodeNotifier& getNotifier(BNode) const {
5.164 + BNodeNotifier& notifier(BNode) const {
5.165 return bnode_notifier;
5.166 }
5.167
5.168 - EdgeNotifier& getNotifier(Edge) const {
5.169 + EdgeNotifier& notifier(Edge) const {
5.170 return edge_notifier;
5.171 }
5.172
5.173 - UEdgeNotifier& getNotifier(UEdge) const {
5.174 + UEdgeNotifier& notifier(UEdge) const {
5.175 return uedge_notifier;
5.176 }
5.177
5.178 @@ -1283,36 +1283,36 @@
5.179
5.180 Node addANode() {
5.181 Node node = Parent::addANode();
5.182 - getNotifier(ANode()).add(node);
5.183 - getNotifier(Node()).add(node);
5.184 + notifier(ANode()).add(node);
5.185 + notifier(Node()).add(node);
5.186 return node;
5.187 }
5.188
5.189 Node addBNode() {
5.190 Node node = Parent::addBNode();
5.191 - getNotifier(BNode()).add(node);
5.192 - getNotifier(Node()).add(node);
5.193 + notifier(BNode()).add(node);
5.194 + notifier(Node()).add(node);
5.195 return node;
5.196 }
5.197
5.198 UEdge addEdge(const Node& source, const Node& target) {
5.199 UEdge uedge = Parent::addEdge(source, target);
5.200 - getNotifier(UEdge()).add(uedge);
5.201 + notifier(UEdge()).add(uedge);
5.202
5.203 std::vector<Edge> edges;
5.204 edges.push_back(Parent::direct(uedge, true));
5.205 edges.push_back(Parent::direct(uedge, false));
5.206 - getNotifier(Edge()).add(edges);
5.207 + notifier(Edge()).add(edges);
5.208
5.209 return uedge;
5.210 }
5.211
5.212 void clear() {
5.213 - getNotifier(Edge()).clear();
5.214 - getNotifier(UEdge()).clear();
5.215 - getNotifier(Node()).clear();
5.216 - getNotifier(BNode()).clear();
5.217 - getNotifier(ANode()).clear();
5.218 + notifier(Edge()).clear();
5.219 + notifier(UEdge()).clear();
5.220 + notifier(Node()).clear();
5.221 + notifier(BNode()).clear();
5.222 + notifier(ANode()).clear();
5.223 Parent::clear();
5.224 }
5.225
5.226 @@ -1321,11 +1321,11 @@
5.227 void build(const Graph& graph, ANodeRefMap& aNodeRef,
5.228 BNodeRefMap& bNodeRef, UEdgeRefMap& uEdgeRef) {
5.229 Parent::build(graph, aNodeRef, bNodeRef, uEdgeRef);
5.230 - getNotifier(ANode()).build();
5.231 - getNotifier(BNode()).build();
5.232 - getNotifier(Node()).build();
5.233 - getNotifier(UEdge()).build();
5.234 - getNotifier(Edge()).build();
5.235 + notifier(ANode()).build();
5.236 + notifier(BNode()).build();
5.237 + notifier(Node()).build();
5.238 + notifier(UEdge()).build();
5.239 + notifier(Edge()).build();
5.240 }
5.241
5.242 void erase(const Node& node) {
5.243 @@ -1336,17 +1336,17 @@
5.244 erase(uedge);
5.245 Parent::firstFromANode(uedge, node);
5.246 }
5.247 - getNotifier(ANode()).erase(node);
5.248 + notifier(ANode()).erase(node);
5.249 } else {
5.250 Parent::firstFromBNode(uedge, node);
5.251 while (uedge != INVALID) {
5.252 erase(uedge);
5.253 Parent::firstFromBNode(uedge, node);
5.254 }
5.255 - getNotifier(BNode()).erase(node);
5.256 + notifier(BNode()).erase(node);
5.257 }
5.258
5.259 - getNotifier(Node()).erase(node);
5.260 + notifier(Node()).erase(node);
5.261 Parent::erase(node);
5.262 }
5.263
5.264 @@ -1354,8 +1354,8 @@
5.265 std::vector<Edge> edges;
5.266 edges.push_back(Parent::direct(uedge, true));
5.267 edges.push_back(Parent::direct(uedge, false));
5.268 - getNotifier(Edge()).erase(edges);
5.269 - getNotifier(UEdge()).erase(uedge);
5.270 + notifier(Edge()).erase(edges);
5.271 + notifier(UEdge()).erase(uedge);
5.272 Parent::erase(uedge);
5.273 }
5.274
6.1 --- a/lemon/bits/map_extender.h Thu Mar 01 16:50:12 2007 +0000
6.2 +++ b/lemon/bits/map_extender.h Thu Mar 01 17:14:24 2007 +0000
6.3 @@ -83,14 +83,14 @@
6.4 MapIt(Invalid i) : Parent(i) { }
6.5
6.6 explicit MapIt(Map& _map) : map(_map) {
6.7 - map.getNotifier()->first(*this);
6.8 + map.notifier()->first(*this);
6.9 }
6.10
6.11 MapIt(const Map& _map, const Item& item)
6.12 : Parent(item), map(_map) {}
6.13
6.14 MapIt& operator++() {
6.15 - map.getNotifier()->next(*this);
6.16 + map.notifier()->next(*this);
6.17 return *this;
6.18 }
6.19
6.20 @@ -123,14 +123,14 @@
6.21 ConstMapIt(Invalid i) : Parent(i) { }
6.22
6.23 explicit ConstMapIt(Map& _map) : map(_map) {
6.24 - map.getNotifier()->first(*this);
6.25 + map.notifier()->first(*this);
6.26 }
6.27
6.28 ConstMapIt(const Map& _map, const Item& item)
6.29 : Parent(item), map(_map) {}
6.30
6.31 ConstMapIt& operator++() {
6.32 - map.getNotifier()->next(*this);
6.33 + map.notifier()->next(*this);
6.34 return *this;
6.35 }
6.36
6.37 @@ -152,14 +152,14 @@
6.38 ItemIt(Invalid i) : Parent(i) { }
6.39
6.40 explicit ItemIt(Map& _map) : map(_map) {
6.41 - map.getNotifier()->first(*this);
6.42 + map.notifier()->first(*this);
6.43 }
6.44
6.45 ItemIt(const Map& _map, const Item& item)
6.46 : Parent(item), map(_map) {}
6.47
6.48 ItemIt& operator++() {
6.49 - map.getNotifier()->next(*this);
6.50 + map.notifier()->next(*this);
6.51 return *this;
6.52 }
6.53
7.1 --- a/lemon/bits/vector_map.h Thu Mar 01 16:50:12 2007 +0000
7.2 +++ b/lemon/bits/vector_map.h Thu Mar 01 17:14:24 2007 +0000
7.3 @@ -90,8 +90,8 @@
7.4 /// It constructs a map and attachs it into the notifier.
7.5 /// It adds all the items of the graph to the map.
7.6 VectorMap(const Graph& graph) {
7.7 - Parent::attach(graph.getNotifier(Item()));
7.8 - container.resize(Parent::getNotifier()->maxId() + 1);
7.9 + Parent::attach(graph.notifier(Item()));
7.10 + container.resize(Parent::notifier()->maxId() + 1);
7.11 }
7.12
7.13 /// \brief Constructor uses given value to initialize the map.
7.14 @@ -99,8 +99,8 @@
7.15 /// It constructs a map uses a given value to initialize the map.
7.16 /// It adds all the items of the graph to the map.
7.17 VectorMap(const Graph& graph, const Value& value) {
7.18 - Parent::attach(graph.getNotifier(Item()));
7.19 - container.resize(Parent::getNotifier()->maxId() + 1, value);
7.20 + Parent::attach(graph.notifier(Item()));
7.21 + container.resize(Parent::notifier()->maxId() + 1, value);
7.22 }
7.23
7.24 /// \brief Copy constructor
7.25 @@ -108,7 +108,7 @@
7.26 /// Copy constructor.
7.27 VectorMap(const VectorMap& _copy) : Parent() {
7.28 if (_copy.attached()) {
7.29 - Parent::attach(*_copy.getNotifier());
7.30 + Parent::attach(*_copy.notifier());
7.31 container = _copy.container;
7.32 }
7.33 }
7.34 @@ -134,7 +134,7 @@
7.35 template <typename CMap>
7.36 VectorMap& operator=(const CMap& cmap) {
7.37 checkConcept<concepts::ReadMap<Key, _Value>, CMap>();
7.38 - const typename Parent::Notifier* notifier = Parent::getNotifier();
7.39 + const typename Parent::Notifier* notifier = Parent::notifier();
7.40 Item it;
7.41 for (notifier->first(it); it != INVALID; notifier->next(it)) {
7.42 set(it, cmap[it]);
7.43 @@ -149,7 +149,7 @@
7.44 /// The subscript operator. The map can be subscripted by the
7.45 /// actual items of the graph.
7.46 Reference operator[](const Key& key) {
7.47 - return container[Parent::getNotifier()->id(key)];
7.48 + return container[Parent::notifier()->id(key)];
7.49 }
7.50
7.51 /// \brief The const subcript operator.
7.52 @@ -157,7 +157,7 @@
7.53 /// The const subscript operator. The map can be subscripted by the
7.54 /// actual items of the graph.
7.55 ConstReference operator[](const Key& key) const {
7.56 - return container[Parent::getNotifier()->id(key)];
7.57 + return container[Parent::notifier()->id(key)];
7.58 }
7.59
7.60
7.61 @@ -175,7 +175,7 @@
7.62 /// It adds a new key to the map. It called by the observer notifier
7.63 /// and it overrides the add() member function of the observer base.
7.64 virtual void add(const Key& key) {
7.65 - int id = Parent::getNotifier()->id(key);
7.66 + int id = Parent::notifier()->id(key);
7.67 if (id >= (int)container.size()) {
7.68 container.resize(id + 1);
7.69 }
7.70 @@ -188,7 +188,7 @@
7.71 virtual void add(const std::vector<Key>& keys) {
7.72 int max = container.size() - 1;
7.73 for (int i = 0; i < (int)keys.size(); ++i) {
7.74 - int id = Parent::getNotifier()->id(keys[i]);
7.75 + int id = Parent::notifier()->id(keys[i]);
7.76 if (id >= max) {
7.77 max = id;
7.78 }
7.79 @@ -201,7 +201,7 @@
7.80 /// Erase a key from the map. It called by the observer notifier
7.81 /// and it overrides the erase() member function of the observer base.
7.82 virtual void erase(const Key& key) {
7.83 - container[Parent::getNotifier()->id(key)] = Value();
7.84 + container[Parent::notifier()->id(key)] = Value();
7.85 }
7.86
7.87 /// \brief Erase more keys from the map.
7.88 @@ -210,7 +210,7 @@
7.89 /// and it overrides the erase() member function of the observer base.
7.90 virtual void erase(const std::vector<Key>& keys) {
7.91 for (int i = 0; i < (int)keys.size(); ++i) {
7.92 - container[Parent::getNotifier()->id(keys[i])] = Value();
7.93 + container[Parent::notifier()->id(keys[i])] = Value();
7.94 }
7.95 }
7.96
7.97 @@ -219,7 +219,7 @@
7.98 /// It buildes the map. It called by the observer notifier
7.99 /// and it overrides the build() member function of the observer base.
7.100 virtual void build() {
7.101 - int size = Parent::getNotifier()->maxId() + 1;
7.102 + int size = Parent::notifier()->maxId() + 1;
7.103 container.reserve(size);
7.104 container.resize(size);
7.105 }
8.1 --- a/lemon/bpugraph_adaptor.h Thu Mar 01 16:50:12 2007 +0000
8.2 +++ b/lemon/bpugraph_adaptor.h Thu Mar 01 17:14:24 2007 +0000
8.3 @@ -169,28 +169,28 @@
8.4 int maxUEdgeId() const { return graph->maxEdgeId(); }
8.5
8.6 typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
8.7 - NodeNotifier& getNotifier(Node) const {
8.8 - return graph->getNotifier(Node());
8.9 + NodeNotifier& notifier(Node) const {
8.10 + return graph->notifier(Node());
8.11 }
8.12
8.13 typedef typename ItemSetTraits<Graph, ANode>::ItemNotifier ANodeNotifier;
8.14 - ANodeNotifier& getNotifier(ANode) const {
8.15 - return graph->getNotifier(ANode());
8.16 + ANodeNotifier& notifier(ANode) const {
8.17 + return graph->notifier(ANode());
8.18 }
8.19
8.20 typedef typename ItemSetTraits<Graph, BNode>::ItemNotifier BNodeNotifier;
8.21 - BNodeNotifier& getNotifier(BNode) const {
8.22 - return graph->getNotifier(BNode());
8.23 + BNodeNotifier& notifier(BNode) const {
8.24 + return graph->notifier(BNode());
8.25 }
8.26
8.27 typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
8.28 - EdgeNotifier& getNotifier(Edge) const {
8.29 - return graph->getNotifier(Edge());
8.30 + EdgeNotifier& notifier(Edge) const {
8.31 + return graph->notifier(Edge());
8.32 }
8.33
8.34 typedef typename ItemSetTraits<Graph, UEdge>::ItemNotifier UEdgeNotifier;
8.35 - UEdgeNotifier& getNotifier(UEdge) const {
8.36 - return graph->getNotifier(UEdge());
8.37 + UEdgeNotifier& notifier(UEdge) const {
8.38 + return graph->notifier(UEdge());
8.39 }
8.40
8.41 template <typename _Value>
8.42 @@ -371,13 +371,13 @@
8.43 int bNodeNum() const { return Parent::aNodeNum(); }
8.44
8.45 typedef typename Parent::BNodeNotifier ANodeNotifier;
8.46 - ANodeNotifier& getNotifier(ANode) const {
8.47 - return Parent::getNotifier(typename Parent::BNode());
8.48 + ANodeNotifier& notifier(ANode) const {
8.49 + return Parent::notifier(typename Parent::BNode());
8.50 }
8.51
8.52 typedef typename Parent::ANodeNotifier BNodeNotifier;
8.53 - BNodeNotifier& getNotifier(BNode) const {
8.54 - return Parent::getNotifier(typename Parent::ANode());
8.55 + BNodeNotifier& notifier(BNode) const {
8.56 + return Parent::notifier(typename Parent::ANode());
8.57 }
8.58
8.59 template <typename _Value>
9.1 --- a/lemon/concepts/graph_components.h Thu Mar 01 16:50:12 2007 +0000
9.2 +++ b/lemon/concepts/graph_components.h Thu Mar 01 17:14:24 2007 +0000
9.3 @@ -1262,14 +1262,14 @@
9.4 /// \brief Gives back the node alteration notifier.
9.5 ///
9.6 /// Gives back the node alteration notifier.
9.7 - NodeNotifier& getNotifier(Node) const {
9.8 + NodeNotifier& notifier(Node) const {
9.9 return NodeNotifier();
9.10 }
9.11
9.12 /// \brief Gives back the edge alteration notifier.
9.13 ///
9.14 /// Gives back the edge alteration notifier.
9.15 - EdgeNotifier& getNotifier(Edge) const {
9.16 + EdgeNotifier& notifier(Edge) const {
9.17 return EdgeNotifier();
9.18 }
9.19
9.20 @@ -1278,10 +1278,10 @@
9.21 void constraints() {
9.22 checkConcept<Base, _Graph>();
9.23 typename _Graph::NodeNotifier& nn
9.24 - = graph.getNotifier(typename _Graph::Node());
9.25 + = graph.notifier(typename _Graph::Node());
9.26
9.27 typename _Graph::EdgeNotifier& en
9.28 - = graph.getNotifier(typename _Graph::Edge());
9.29 + = graph.notifier(typename _Graph::Edge());
9.30
9.31 ignore_unused_variable_warning(nn);
9.32 ignore_unused_variable_warning(en);
9.33 @@ -1316,7 +1316,7 @@
9.34 /// \brief Gives back the edge alteration notifier.
9.35 ///
9.36 /// Gives back the edge alteration notifier.
9.37 - UEdgeNotifier& getNotifier(UEdge) const {
9.38 + UEdgeNotifier& notifier(UEdge) const {
9.39 return UEdgeNotifier();
9.40 }
9.41
9.42 @@ -1325,7 +1325,7 @@
9.43 void constraints() {
9.44 checkConcept<AlterableGraphComponent<Base>, _Graph>();
9.45 typename _Graph::UEdgeNotifier& uen
9.46 - = graph.getNotifier(typename _Graph::UEdge());
9.47 + = graph.notifier(typename _Graph::UEdge());
9.48 ignore_unused_variable_warning(uen);
9.49 }
9.50
9.51 @@ -1364,14 +1364,14 @@
9.52 /// \brief Gives back the A-node alteration notifier.
9.53 ///
9.54 /// Gives back the A-node alteration notifier.
9.55 - ANodeNotifier& getNotifier(ANode) const {
9.56 + ANodeNotifier& notifier(ANode) const {
9.57 return ANodeNotifier();
9.58 }
9.59
9.60 /// \brief Gives back the B-node alteration notifier.
9.61 ///
9.62 /// Gives back the B-node alteration notifier.
9.63 - BNodeNotifier& getNotifier(BNode) const {
9.64 + BNodeNotifier& notifier(BNode) const {
9.65 return BNodeNotifier();
9.66 }
9.67
9.68 @@ -1380,9 +1380,9 @@
9.69 void constraints() {
9.70 checkConcept<AlterableUGraphComponent<Base>, _Graph>();
9.71 typename _Graph::ANodeNotifier& ann
9.72 - = graph.getNotifier(typename _Graph::ANode());
9.73 + = graph.notifier(typename _Graph::ANode());
9.74 typename _Graph::BNodeNotifier& bnn
9.75 - = graph.getNotifier(typename _Graph::BNode());
9.76 + = graph.notifier(typename _Graph::BNode());
9.77 ignore_unused_variable_warning(ann);
9.78 ignore_unused_variable_warning(bnn);
9.79 }
10.1 --- a/lemon/edge_set.h Thu Mar 01 16:50:12 2007 +0000
10.2 +++ b/lemon/edge_set.h Thu Mar 01 17:14:24 2007 +0000
10.3 @@ -199,8 +199,8 @@
10.4
10.5 typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
10.6
10.7 - NodeNotifier& getNotifier(Node) const {
10.8 - return graph->getNotifier(Node());
10.9 + NodeNotifier& notifier(Node) const {
10.10 + return graph->notifier(Node());
10.11 }
10.12
10.13 template <typename _Value>
10.14 @@ -527,8 +527,8 @@
10.15
10.16 typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
10.17
10.18 - NodeNotifier& getNotifier(Node) const {
10.19 - return graph->getNotifier(Node());
10.20 + NodeNotifier& notifier(Node) const {
10.21 + return graph->notifier(Node());
10.22 }
10.23
10.24 template <typename _Value>
11.1 --- a/lemon/full_graph.h Thu Mar 01 16:50:12 2007 +0000
11.2 +++ b/lemon/full_graph.h Thu Mar 01 17:14:24 2007 +0000
11.3 @@ -194,11 +194,11 @@
11.4 /// This cause that the maps of the graph will reallocated
11.5 /// automatically and the previous values will be lost.
11.6 void resize(int n) {
11.7 - Parent::getNotifier(Edge()).clear();
11.8 - Parent::getNotifier(Node()).clear();
11.9 + Parent::notifier(Edge()).clear();
11.10 + Parent::notifier(Node()).clear();
11.11 construct(n);
11.12 - Parent::getNotifier(Node()).build();
11.13 - Parent::getNotifier(Edge()).build();
11.14 + Parent::notifier(Node()).build();
11.15 + Parent::notifier(Edge()).build();
11.16 }
11.17
11.18 /// \brief Returns the node with the given index.
11.19 @@ -406,13 +406,13 @@
11.20 /// This cause that the maps of the graph will reallocated
11.21 /// automatically and the previous values will be lost.
11.22 void resize(int n) {
11.23 - Parent::getNotifier(Edge()).clear();
11.24 - Parent::getNotifier(UEdge()).clear();
11.25 - Parent::getNotifier(Node()).clear();
11.26 + Parent::notifier(Edge()).clear();
11.27 + Parent::notifier(UEdge()).clear();
11.28 + Parent::notifier(Node()).clear();
11.29 construct(n);
11.30 - Parent::getNotifier(Node()).build();
11.31 - Parent::getNotifier(UEdge()).build();
11.32 - Parent::getNotifier(Edge()).build();
11.33 + Parent::notifier(Node()).build();
11.34 + Parent::notifier(UEdge()).build();
11.35 + Parent::notifier(Edge()).build();
11.36 }
11.37
11.38 /// \brief Returns the node with the given index.
11.39 @@ -703,17 +703,17 @@
11.40 ///
11.41 /// Resize the graph
11.42 void resize(int n, int m) {
11.43 - Parent::getNotifier(Edge()).clear();
11.44 - Parent::getNotifier(UEdge()).clear();
11.45 - Parent::getNotifier(Node()).clear();
11.46 - Parent::getNotifier(ANode()).clear();
11.47 - Parent::getNotifier(BNode()).clear();
11.48 + Parent::notifier(Edge()).clear();
11.49 + Parent::notifier(UEdge()).clear();
11.50 + Parent::notifier(Node()).clear();
11.51 + Parent::notifier(ANode()).clear();
11.52 + Parent::notifier(BNode()).clear();
11.53 construct(n, m);
11.54 - Parent::getNotifier(ANode()).build();
11.55 - Parent::getNotifier(BNode()).build();
11.56 - Parent::getNotifier(Node()).build();
11.57 - Parent::getNotifier(UEdge()).build();
11.58 - Parent::getNotifier(Edge()).build();
11.59 + Parent::notifier(ANode()).build();
11.60 + Parent::notifier(BNode()).build();
11.61 + Parent::notifier(Node()).build();
11.62 + Parent::notifier(UEdge()).build();
11.63 + Parent::notifier(Edge()).build();
11.64 }
11.65
11.66 /// \brief Number of nodes.
12.1 --- a/lemon/graph_adaptor.h Thu Mar 01 16:50:12 2007 +0000
12.2 +++ b/lemon/graph_adaptor.h Thu Mar 01 17:14:24 2007 +0000
12.3 @@ -132,14 +132,14 @@
12.4
12.5 typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
12.6
12.7 - NodeNotifier& getNotifier(Node) const {
12.8 - return graph->getNotifier(Node());
12.9 + NodeNotifier& notifier(Node) const {
12.10 + return graph->notifier(Node());
12.11 }
12.12
12.13 typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
12.14
12.15 - EdgeNotifier& getNotifier(Edge) const {
12.16 - return graph->getNotifier(Edge());
12.17 + EdgeNotifier& notifier(Edge) const {
12.18 + return graph->notifier(Edge());
12.19 }
12.20
12.21 template <typename _Value>
12.22 @@ -1182,7 +1182,7 @@
12.23
12.24 void setGraph(_Graph& graph) {
12.25 Parent::setGraph(graph);
12.26 - edge_notifier_proxy.setNotifier(graph.getNotifier(GraphEdge()));
12.27 + edge_notifier_proxy.setNotifier(graph.notifier(GraphEdge()));
12.28 }
12.29
12.30 public:
12.31 @@ -1196,11 +1196,11 @@
12.32
12.33 typedef typename Parent::EdgeNotifier UEdgeNotifier;
12.34
12.35 - using Parent::getNotifier;
12.36 + using Parent::notifier;
12.37
12.38 typedef AlterationNotifier<AlterableUndirGraphAdaptor,
12.39 Edge> EdgeNotifier;
12.40 - EdgeNotifier& getNotifier(Edge) const { return edge_notifier; }
12.41 + EdgeNotifier& notifier(Edge) const { return edge_notifier; }
12.42
12.43 protected:
12.44
12.45 @@ -1231,7 +1231,7 @@
12.46 std::vector<Edge> edges;
12.47 edges.push_back(AdaptorBase::Parent::direct(ge, true));
12.48 edges.push_back(AdaptorBase::Parent::direct(ge, false));
12.49 - adaptor->getNotifier(Edge()).add(edges);
12.50 + adaptor->notifier(Edge()).add(edges);
12.51 }
12.52 virtual void add(const std::vector<GraphEdge>& ge) {
12.53 std::vector<Edge> edges;
12.54 @@ -1239,13 +1239,13 @@
12.55 edges.push_back(AdaptorBase::Parent::direct(ge[i], true));
12.56 edges.push_back(AdaptorBase::Parent::direct(ge[i], false));
12.57 }
12.58 - adaptor->getNotifier(Edge()).add(edges);
12.59 + adaptor->notifier(Edge()).add(edges);
12.60 }
12.61 virtual void erase(const GraphEdge& ge) {
12.62 std::vector<Edge> edges;
12.63 edges.push_back(AdaptorBase::Parent::direct(ge, true));
12.64 edges.push_back(AdaptorBase::Parent::direct(ge, false));
12.65 - adaptor->getNotifier(Edge()).erase(edges);
12.66 + adaptor->notifier(Edge()).erase(edges);
12.67 }
12.68 virtual void erase(const std::vector<GraphEdge>& ge) {
12.69 std::vector<Edge> edges;
12.70 @@ -1253,13 +1253,13 @@
12.71 edges.push_back(AdaptorBase::Parent::direct(ge[i], true));
12.72 edges.push_back(AdaptorBase::Parent::direct(ge[i], false));
12.73 }
12.74 - adaptor->getNotifier(Edge()).erase(edges);
12.75 + adaptor->notifier(Edge()).erase(edges);
12.76 }
12.77 virtual void build() {
12.78 - adaptor->getNotifier(Edge()).build();
12.79 + adaptor->notifier(Edge()).build();
12.80 }
12.81 virtual void clear() {
12.82 - adaptor->getNotifier(Edge()).clear();
12.83 + adaptor->notifier(Edge()).clear();
12.84 }
12.85
12.86 const AdaptorBase* adaptor;
12.87 @@ -2143,7 +2143,7 @@
12.88
12.89 void setGraph(_Graph& graph) {
12.90 Parent::setGraph(graph);
12.91 - node_notifier_proxy.setNotifier(graph.getNotifier(GraphNode()));
12.92 + node_notifier_proxy.setNotifier(graph.notifier(GraphNode()));
12.93 }
12.94
12.95 public:
12.96 @@ -2155,7 +2155,7 @@
12.97 typedef AlterationNotifier<AlterableSplitGraphAdaptor, Node> NodeNotifier;
12.98 typedef InvalidType EdgeNotifier;
12.99
12.100 - NodeNotifier& getNotifier(Node) const { return node_notifier; }
12.101 + NodeNotifier& notifier(Node) const { return node_notifier; }
12.102
12.103 protected:
12.104
12.105 @@ -2186,7 +2186,7 @@
12.106 std::vector<Node> nodes;
12.107 nodes.push_back(AdaptorBase::Parent::inNode(gn));
12.108 nodes.push_back(AdaptorBase::Parent::outNode(gn));
12.109 - adaptor->getNotifier(Node()).add(nodes);
12.110 + adaptor->notifier(Node()).add(nodes);
12.111 }
12.112
12.113 virtual void add(const std::vector<GraphNode>& gn) {
12.114 @@ -2195,14 +2195,14 @@
12.115 nodes.push_back(AdaptorBase::Parent::inNode(gn[i]));
12.116 nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
12.117 }
12.118 - adaptor->getNotifier(Node()).add(nodes);
12.119 + adaptor->notifier(Node()).add(nodes);
12.120 }
12.121
12.122 virtual void erase(const GraphNode& gn) {
12.123 std::vector<Node> nodes;
12.124 nodes.push_back(AdaptorBase::Parent::inNode(gn));
12.125 nodes.push_back(AdaptorBase::Parent::outNode(gn));
12.126 - adaptor->getNotifier(Node()).erase(nodes);
12.127 + adaptor->notifier(Node()).erase(nodes);
12.128 }
12.129
12.130 virtual void erase(const std::vector<GraphNode>& gn) {
12.131 @@ -2211,13 +2211,13 @@
12.132 nodes.push_back(AdaptorBase::Parent::inNode(gn[i]));
12.133 nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
12.134 }
12.135 - adaptor->getNotifier(Node()).erase(nodes);
12.136 + adaptor->notifier(Node()).erase(nodes);
12.137 }
12.138 virtual void build() {
12.139 - adaptor->getNotifier(Node()).build();
12.140 + adaptor->notifier(Node()).build();
12.141 }
12.142 virtual void clear() {
12.143 - adaptor->getNotifier(Node()).clear();
12.144 + adaptor->notifier(Node()).clear();
12.145 }
12.146
12.147 const AdaptorBase* adaptor;
12.148 @@ -2255,8 +2255,8 @@
12.149
12.150 void setGraph(_Graph& graph) {
12.151 Parent::setGraph(graph);
12.152 - node_notifier_proxy.setNotifier(graph.getNotifier(GraphNode()));
12.153 - edge_notifier_proxy.setNotifier(graph.getNotifier(GraphEdge()));
12.154 + node_notifier_proxy.setNotifier(graph.notifier(GraphNode()));
12.155 + edge_notifier_proxy.setNotifier(graph.notifier(GraphEdge()));
12.156 }
12.157
12.158 public:
12.159 @@ -2269,8 +2269,8 @@
12.160 typedef AlterationNotifier<AlterableSplitGraphAdaptor, Node> NodeNotifier;
12.161 typedef AlterationNotifier<AlterableSplitGraphAdaptor, Edge> EdgeNotifier;
12.162
12.163 - NodeNotifier& getNotifier(Node) const { return node_notifier; }
12.164 - EdgeNotifier& getNotifier(Edge) const { return edge_notifier; }
12.165 + NodeNotifier& notifier(Node) const { return node_notifier; }
12.166 + EdgeNotifier& notifier(Edge) const { return edge_notifier; }
12.167
12.168 protected:
12.169
12.170 @@ -2301,8 +2301,8 @@
12.171 std::vector<Node> nodes;
12.172 nodes.push_back(AdaptorBase::Parent::inNode(gn));
12.173 nodes.push_back(AdaptorBase::Parent::outNode(gn));
12.174 - adaptor->getNotifier(Node()).add(nodes);
12.175 - adaptor->getNotifier(Edge()).add(AdaptorBase::Parent::edge(gn));
12.176 + adaptor->notifier(Node()).add(nodes);
12.177 + adaptor->notifier(Edge()).add(AdaptorBase::Parent::edge(gn));
12.178 }
12.179 virtual void add(const std::vector<GraphNode>& gn) {
12.180 std::vector<Node> nodes;
12.181 @@ -2312,15 +2312,15 @@
12.182 nodes.push_back(AdaptorBase::Parent::inNode(gn[i]));
12.183 nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
12.184 }
12.185 - adaptor->getNotifier(Node()).add(nodes);
12.186 - adaptor->getNotifier(Edge()).add(edges);
12.187 + adaptor->notifier(Node()).add(nodes);
12.188 + adaptor->notifier(Edge()).add(edges);
12.189 }
12.190 virtual void erase(const GraphNode& gn) {
12.191 - adaptor->getNotifier(Edge()).erase(AdaptorBase::Parent::edge(gn));
12.192 + adaptor->notifier(Edge()).erase(AdaptorBase::Parent::edge(gn));
12.193 std::vector<Node> nodes;
12.194 nodes.push_back(AdaptorBase::Parent::inNode(gn));
12.195 nodes.push_back(AdaptorBase::Parent::outNode(gn));
12.196 - adaptor->getNotifier(Node()).erase(nodes);
12.197 + adaptor->notifier(Node()).erase(nodes);
12.198 }
12.199 virtual void erase(const std::vector<GraphNode>& gn) {
12.200 std::vector<Node> nodes;
12.201 @@ -2330,28 +2330,28 @@
12.202 nodes.push_back(AdaptorBase::Parent::inNode(gn[i]));
12.203 nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
12.204 }
12.205 - adaptor->getNotifier(Edge()).erase(edges);
12.206 - adaptor->getNotifier(Node()).erase(nodes);
12.207 + adaptor->notifier(Edge()).erase(edges);
12.208 + adaptor->notifier(Node()).erase(nodes);
12.209 }
12.210 virtual void build() {
12.211 std::vector<Edge> edges;
12.212 - const typename Parent::Notifier* notifier = Parent::getNotifier();
12.213 + const typename Parent::Notifier* notifier = Parent::notifier();
12.214 GraphNode it;
12.215 for (notifier->first(it); it != INVALID; notifier->next(it)) {
12.216 edges.push_back(AdaptorBase::Parent::edge(it));
12.217 }
12.218 - adaptor->getNotifier(Node()).build();
12.219 - adaptor->getNotifier(Edge()).add(edges);
12.220 + adaptor->notifier(Node()).build();
12.221 + adaptor->notifier(Edge()).add(edges);
12.222 }
12.223 virtual void clear() {
12.224 std::vector<Edge> edges;
12.225 - const typename Parent::Notifier* notifier = Parent::getNotifier();
12.226 + const typename Parent::Notifier* notifier = Parent::notifier();
12.227 GraphNode it;
12.228 for (notifier->first(it); it != INVALID; notifier->next(it)) {
12.229 edges.push_back(AdaptorBase::Parent::edge(it));
12.230 }
12.231 - adaptor->getNotifier(Edge()).erase(edges);
12.232 - adaptor->getNotifier(Node()).clear();
12.233 + adaptor->notifier(Edge()).erase(edges);
12.234 + adaptor->notifier(Node()).clear();
12.235 }
12.236
12.237 const AdaptorBase* adaptor;
12.238 @@ -2381,42 +2381,42 @@
12.239 protected:
12.240
12.241 virtual void add(const GraphEdge& ge) {
12.242 - adaptor->getNotifier(Edge()).add(AdaptorBase::edge(ge));
12.243 + adaptor->notifier(Edge()).add(AdaptorBase::edge(ge));
12.244 }
12.245 virtual void add(const std::vector<GraphEdge>& ge) {
12.246 std::vector<Edge> edges;
12.247 for (int i = 0; i < (int)ge.size(); ++i) {
12.248 edges.push_back(AdaptorBase::edge(ge[i]));
12.249 }
12.250 - adaptor->getNotifier(Edge()).add(edges);
12.251 + adaptor->notifier(Edge()).add(edges);
12.252 }
12.253 virtual void erase(const GraphEdge& ge) {
12.254 - adaptor->getNotifier(Edge()).erase(AdaptorBase::edge(ge));
12.255 + adaptor->notifier(Edge()).erase(AdaptorBase::edge(ge));
12.256 }
12.257 virtual void erase(const std::vector<GraphEdge>& ge) {
12.258 std::vector<Edge> edges;
12.259 for (int i = 0; i < (int)ge.size(); ++i) {
12.260 edges.push_back(AdaptorBase::edge(ge[i]));
12.261 }
12.262 - adaptor->getNotifier(Edge()).erase(edges);
12.263 + adaptor->notifier(Edge()).erase(edges);
12.264 }
12.265 virtual void build() {
12.266 std::vector<Edge> edges;
12.267 - const typename Parent::Notifier* notifier = Parent::getNotifier();
12.268 + const typename Parent::Notifier* notifier = Parent::notifier();
12.269 GraphEdge it;
12.270 for (notifier->first(it); it != INVALID; notifier->next(it)) {
12.271 edges.push_back(AdaptorBase::Parent::edge(it));
12.272 }
12.273 - adaptor->getNotifier(Edge()).add(edges);
12.274 + adaptor->notifier(Edge()).add(edges);
12.275 }
12.276 virtual void clear() {
12.277 std::vector<Edge> edges;
12.278 - const typename Parent::Notifier* notifier = Parent::getNotifier();
12.279 + const typename Parent::Notifier* notifier = Parent::notifier();
12.280 GraphEdge it;
12.281 for (notifier->first(it); it != INVALID; notifier->next(it)) {
12.282 edges.push_back(AdaptorBase::Parent::edge(it));
12.283 }
12.284 - adaptor->getNotifier(Edge()).erase(edges);
12.285 + adaptor->notifier(Edge()).erase(edges);
12.286 }
12.287
12.288 const AdaptorBase* adaptor;
13.1 --- a/lemon/graph_utils.h Thu Mar 01 16:50:12 2007 +0000
13.2 +++ b/lemon/graph_utils.h Thu Mar 01 17:14:24 2007 +0000
13.3 @@ -1873,7 +1873,7 @@
13.4 /// Constructor for descriptor map.
13.5 explicit DescriptorMap(const Graph& _graph) : Map(_graph) {
13.6 Item it;
13.7 - const typename Map::Notifier* notifier = Map::getNotifier();
13.8 + const typename Map::Notifier* notifier = Map::notifier();
13.9 for (notifier->first(it); it != INVALID; notifier->next(it)) {
13.10 Map::set(it, invMap.size());
13.11 invMap.push_back(it);
13.12 @@ -1935,7 +1935,7 @@
13.13 virtual void build() {
13.14 Map::build();
13.15 Item it;
13.16 - const typename Map::Notifier* notifier = Map::getNotifier();
13.17 + const typename Map::Notifier* notifier = Map::notifier();
13.18 for (notifier->first(it); it != INVALID; notifier->next(it)) {
13.19 Map::set(it, invMap.size());
13.20 invMap.push_back(it);
13.21 @@ -2292,7 +2292,7 @@
13.22 ///
13.23 /// Constructor for creating in-degree map.
13.24 explicit InDegMap(const Graph& _graph) : graph(_graph), deg(_graph) {
13.25 - Parent::attach(graph.getNotifier(typename _Graph::Edge()));
13.26 + Parent::attach(graph.notifier(typename _Graph::Edge()));
13.27
13.28 for(typename _Graph::NodeIt it(graph); it != INVALID; ++it) {
13.29 deg[it] = countInEdges(graph, it);
13.30 @@ -2404,7 +2404,7 @@
13.31 ///
13.32 /// Constructor for creating out-degree map.
13.33 explicit OutDegMap(const Graph& _graph) : graph(_graph), deg(_graph) {
13.34 - Parent::attach(graph.getNotifier(typename _Graph::Edge()));
13.35 + Parent::attach(graph.notifier(typename _Graph::Edge()));
13.36
13.37 for(typename _Graph::NodeIt it(graph); it != INVALID; ++it) {
13.38 deg[it] = countOutEdges(graph, it);
14.1 --- a/lemon/grid_ugraph.h Thu Mar 01 16:50:12 2007 +0000
14.2 +++ b/lemon/grid_ugraph.h Thu Mar 01 17:14:24 2007 +0000
14.3 @@ -390,13 +390,13 @@
14.4 /// \brief Resize the graph
14.5 ///
14.6 void resize(int n, int m) {
14.7 - Parent::getNotifier(Edge()).clear();
14.8 - Parent::getNotifier(UEdge()).clear();
14.9 - Parent::getNotifier(Node()).clear();
14.10 + Parent::notifier(Edge()).clear();
14.11 + Parent::notifier(UEdge()).clear();
14.12 + Parent::notifier(Node()).clear();
14.13 construct(n, m);
14.14 - Parent::getNotifier(Node()).build();
14.15 - Parent::getNotifier(UEdge()).build();
14.16 - Parent::getNotifier(Edge()).build();
14.17 + Parent::notifier(Node()).build();
14.18 + Parent::notifier(UEdge()).build();
14.19 + Parent::notifier(Edge()).build();
14.20 }
14.21
14.22 /// \brief The node on the given position.
15.1 --- a/lemon/matrix_maps.h Thu Mar 01 16:50:12 2007 +0000
15.2 +++ b/lemon/matrix_maps.h Thu Mar 01 17:14:24 2007 +0000
15.3 @@ -270,7 +270,7 @@
15.4 /// Creates an item matrix for the given graph.
15.5 DynamicMatrixMap(const Graph& _graph)
15.6 : values(size(_graph.maxId(Key()) + 1)) {
15.7 - Parent::attach(_graph.getNotifier(Key()));
15.8 + Parent::attach(_graph.notifier(Key()));
15.9 }
15.10
15.11 /// \brief Creates an item matrix for the given graph
15.12 @@ -279,7 +279,7 @@
15.13 /// pairs of keys the given parameter.
15.14 DynamicMatrixMap(const Graph& _graph, const Value& _val)
15.15 : values(size(_graph.maxId(Key()) + 1), _val) {
15.16 - Parent::attach(_graph.getNotifier(Key()));
15.17 + Parent::attach(_graph.notifier(Key()));
15.18 }
15.19
15.20 ///\brief The assignement operator.
15.21 @@ -296,7 +296,7 @@
15.22 template <typename CMap>
15.23 DynamicMatrixMap& operator=(const CMap& _cmap){
15.24 checkConcept<concepts::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
15.25 - typename Parent::Notifier* notifier = Parent::getNotifier();
15.26 + typename Parent::Notifier* notifier = Parent::notifier();
15.27 Key first, second;
15.28 for(notifier->first(first); first != INVALID;
15.29 notifier->next(first)){
15.30 @@ -313,8 +313,8 @@
15.31 ///
15.32 /// Gives back the value assigned to the \c first - \c second ordered pair.
15.33 ConstReference operator()(const Key& first, const Key& second) const {
15.34 - return values[index(Parent::getNotifier()->id(first),
15.35 - Parent::getNotifier()->id(second))];
15.36 + return values[index(Parent::notifier()->id(first),
15.37 + Parent::notifier()->id(second))];
15.38 }
15.39
15.40 /// \brief Gives back the value assigned to the \c first - \c second
15.41 @@ -322,16 +322,16 @@
15.42 ///
15.43 /// Gives back the value assigned to the \c first - \c second ordered pair.
15.44 Reference operator()(const Key& first, const Key& second) {
15.45 - return values[index(Parent::getNotifier()->id(first),
15.46 - Parent::getNotifier()->id(second))];
15.47 + return values[index(Parent::notifier()->id(first),
15.48 + Parent::notifier()->id(second))];
15.49 }
15.50
15.51 /// \brief Setter function for the matrix map.
15.52 ///
15.53 /// Setter function for the matrix map.
15.54 void set(const Key& first, const Key& second, const Value& val) {
15.55 - values[index(Parent::getNotifier()->id(first),
15.56 - Parent::getNotifier()->id(second))] = val;
15.57 + values[index(Parent::notifier()->id(first),
15.58 + Parent::notifier()->id(second))] = val;
15.59 }
15.60
15.61 protected:
15.62 @@ -349,16 +349,16 @@
15.63 }
15.64
15.65 virtual void add(const Key& key) {
15.66 - if (size(Parent::getNotifier()->id(key) + 1) >= (int)values.size()) {
15.67 - values.resize(size(Parent::getNotifier()->id(key) + 1));
15.68 + if (size(Parent::notifier()->id(key) + 1) >= (int)values.size()) {
15.69 + values.resize(size(Parent::notifier()->id(key) + 1));
15.70 }
15.71 }
15.72
15.73 virtual void add(const std::vector<Key>& keys) {
15.74 int new_size = 0;
15.75 for (int i = 0; i < (int)keys.size(); ++i) {
15.76 - if (size(Parent::getNotifier()->id(keys[i]) + 1) >= new_size) {
15.77 - new_size = size(Parent::getNotifier()->id(keys[i]) + 1);
15.78 + if (size(Parent::notifier()->id(keys[i]) + 1) >= new_size) {
15.79 + new_size = size(Parent::notifier()->id(keys[i]) + 1);
15.80 }
15.81 }
15.82 if (new_size > (int)values.size()) {
15.83 @@ -371,7 +371,7 @@
15.84 virtual void erase(const std::vector<Key>&) {}
15.85
15.86 virtual void build() {
15.87 - values.resize(size(Parent::getNotifier()->maxId() + 1));
15.88 + values.resize(size(Parent::notifier()->maxId() + 1));
15.89 }
15.90
15.91 virtual void clear() {
15.92 @@ -419,7 +419,7 @@
15.93 /// Creates an item matrix for the given graph.
15.94 DynamicSymMatrixMap(const Graph& _graph)
15.95 : values(size(_graph.maxId(Key()) + 1)) {
15.96 - Parent::attach(_graph.getNotifier(Key()));
15.97 + Parent::attach(_graph.notifier(Key()));
15.98 }
15.99
15.100 /// \brief Creates an item matrix for the given graph
15.101 @@ -428,7 +428,7 @@
15.102 /// pairs of keys the given parameter.
15.103 DynamicSymMatrixMap(const Graph& _graph, const Value& _val)
15.104 : values(size(_graph.maxId(Key()) + 1), _val) {
15.105 - Parent::attach(_graph.getNotifier(Key()));
15.106 + Parent::attach(_graph.notifier(Key()));
15.107 }
15.108
15.109
15.110 @@ -447,7 +447,7 @@
15.111 template <typename CMap>
15.112 DynamicSymMatrixMap& operator=(const CMap& _cmap){
15.113 checkConcept<concepts::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
15.114 - typename Parent::Notifier* notifier = Parent::getNotifier();
15.115 + typename Parent::Notifier* notifier = Parent::notifier();
15.116 Key first, second;
15.117 for(notifier->first(first); first != INVALID;
15.118 notifier->next(first)){
15.119 @@ -466,8 +466,8 @@
15.120 /// Gives back the value assigned to the \c first - \c second unordered
15.121 /// pair.
15.122 ConstReference operator()(const Key& first, const Key& second) const {
15.123 - return values[index(Parent::getNotifier()->id(first),
15.124 - Parent::getNotifier()->id(second))];
15.125 + return values[index(Parent::notifier()->id(first),
15.126 + Parent::notifier()->id(second))];
15.127 }
15.128
15.129 /// \brief Gives back the value assigned to the \c first - \c second
15.130 @@ -476,8 +476,8 @@
15.131 /// Gives back the value assigned to the \c first - \c second unordered
15.132 /// pair.
15.133 Reference operator()(const Key& first, const Key& second) {
15.134 - return values[index(Parent::getNotifier()->id(first),
15.135 - Parent::getNotifier()->id(second))];
15.136 + return values[index(Parent::notifier()->id(first),
15.137 + Parent::notifier()->id(second))];
15.138 }
15.139
15.140 /// \brief Setter function for the matrix map.
15.141 @@ -485,8 +485,8 @@
15.142 /// Setter function for the matrix map.
15.143 ///
15.144 void set(const Key& first, const Key& second, const Value& val) {
15.145 - values[index(Parent::getNotifier()->id(first),
15.146 - Parent::getNotifier()->id(second))] = val;
15.147 + values[index(Parent::notifier()->id(first),
15.148 + Parent::notifier()->id(second))] = val;
15.149 }
15.150
15.151 protected:
15.152 @@ -504,16 +504,16 @@
15.153 }
15.154
15.155 virtual void add(const Key& key) {
15.156 - if (size(Parent::getNotifier()->id(key) + 1) >= (int)values.size()) {
15.157 - values.resize(size(Parent::getNotifier()->id(key) + 1));
15.158 + if (size(Parent::notifier()->id(key) + 1) >= (int)values.size()) {
15.159 + values.resize(size(Parent::notifier()->id(key) + 1));
15.160 }
15.161 }
15.162
15.163 virtual void add(const std::vector<Key>& keys) {
15.164 int new_size = 0;
15.165 for (int i = 0; i < (int)keys.size(); ++i) {
15.166 - if (size(Parent::getNotifier()->id(keys[i]) + 1) >= new_size) {
15.167 - new_size = size(Parent::getNotifier()->id(keys[i]) + 1);
15.168 + if (size(Parent::notifier()->id(keys[i]) + 1) >= new_size) {
15.169 + new_size = size(Parent::notifier()->id(keys[i]) + 1);
15.170 }
15.171 }
15.172 if (new_size > (int)values.size()) {
15.173 @@ -526,7 +526,7 @@
15.174 virtual void erase(const std::vector<Key>&) {}
15.175
15.176 virtual void build() {
15.177 - values.resize(size(Parent::getNotifier()->maxId() + 1));
15.178 + values.resize(size(Parent::notifier()->maxId() + 1));
15.179 }
15.180
15.181 virtual void clear() {
15.182 @@ -801,8 +801,8 @@
15.183 _first_key_proxy(*this),
15.184 _second_key_proxy(*this)
15.185 {
15.186 - _first_key_proxy.attach(_firstContainer.getNotifier(FirstKey()));
15.187 - _second_key_proxy.attach(_secondContainer.getNotifier(SecondKey()));
15.188 + _first_key_proxy.attach(_firstContainer.notifier(FirstKey()));
15.189 + _second_key_proxy.attach(_secondContainer.notifier(SecondKey()));
15.190 }
15.191
15.192 ///\brief Constructor what create the map for the two containers type.
15.193 @@ -817,8 +817,8 @@
15.194 _first_key_proxy(*this),
15.195 _second_key_proxy(*this)
15.196 {
15.197 - _first_key_proxy.attach(_firstContainer.getNotifier(FirstKey()));
15.198 - _second_key_proxy.attach(_secondContainer.getNotifier(SecondKey()));
15.199 + _first_key_proxy.attach(_firstContainer.notifier(FirstKey()));
15.200 + _second_key_proxy.attach(_secondContainer.notifier(SecondKey()));
15.201 }
15.202
15.203 ///\brief Copy constructor.
15.204 @@ -828,8 +828,8 @@
15.205 : _first_key_proxy(*this), _second_key_proxy(*this) {
15.206 if(_copy._first_key_proxy.attached() &&
15.207 _copy._second_key_proxy.attached()){
15.208 - _first_key_proxy.attach(*_copy._first_key_proxy.getNotifier());
15.209 - _second_key_proxy.attach(*_copy._second_key_proxy.getNotifier());
15.210 + _first_key_proxy.attach(*_copy._first_key_proxy.notifier());
15.211 + _second_key_proxy.attach(*_copy._second_key_proxy.notifier());
15.212 values = _copy.values;
15.213 }
15.214 }
15.215 @@ -854,8 +854,8 @@
15.216 ///Gives back the value assigned to the \c first - \c second
15.217 ///ordered pair.
15.218 Reference operator()(const FirstKey& _first, const SecondKey& _second) {
15.219 - return values[_first_key_proxy.getNotifier()->id(_first)]
15.220 - [_second_key_proxy.getNotifier()->id(_second)];
15.221 + return values[_first_key_proxy.notifier()->id(_first)]
15.222 + [_second_key_proxy.notifier()->id(_second)];
15.223 }
15.224
15.225 ///\brief Gives back the value assigned to the \c first - \c
15.226 @@ -865,8 +865,8 @@
15.227 ///ordered pair.
15.228 ConstReference operator()(const FirstKey& _first,
15.229 const SecondKey& _second) const {
15.230 - return values[_first_key_proxy.getNotifier()->id(_first)]
15.231 - [_second_key_proxy.getNotifier()->id(_second)];
15.232 + return values[_first_key_proxy.notifier()->id(_first)]
15.233 + [_second_key_proxy.notifier()->id(_second)];
15.234 }
15.235
15.236 ///\brief Setter function for this matrix map.
15.237 @@ -874,8 +874,8 @@
15.238 ///Setter function for this matrix map.
15.239 void set(const FirstKey& first, const SecondKey& second,
15.240 const Value& value){
15.241 - values[_first_key_proxy.getNotifier()->id(first)]
15.242 - [_second_key_proxy.getNotifier()->id(second)] = value;
15.243 + values[_first_key_proxy.notifier()->id(first)]
15.244 + [_second_key_proxy.notifier()->id(second)] = value;
15.245 }
15.246
15.247 ///\brief The assignement operator.
15.248 @@ -893,9 +893,9 @@
15.249 DynamicAsymMatrixMap& operator=(const CMap& _cdmap){
15.250 checkConcept<concepts::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
15.251 const typename FirstKeyProxy::Notifier* notifierFirstKey =
15.252 - _first_key_proxy.getNotifier();
15.253 + _first_key_proxy.notifier();
15.254 const typename SecondKeyProxy::Notifier* notifierSecondKey =
15.255 - _second_key_proxy.getNotifier();
15.256 + _second_key_proxy.notifier();
15.257 FirstKey itemFirst;
15.258 SecondKey itemSecond;
15.259 for(notifierFirstKey->first(itemFirst); itemFirst != INVALID;
15.260 @@ -916,15 +916,15 @@
15.261 ///class belongs to the FirstKey type.
15.262 void addFirstKey(const FirstKey& firstKey) {
15.263 int size = (int)values.size();
15.264 - if( _first_key_proxy.getNotifier()->id(firstKey)+1 >= size ){
15.265 - values.resize(_first_key_proxy.getNotifier()->id(firstKey)+1);
15.266 + if( _first_key_proxy.notifier()->id(firstKey)+1 >= size ){
15.267 + values.resize(_first_key_proxy.notifier()->id(firstKey)+1);
15.268 if( (int)values[0].size() != 0 ){
15.269 int innersize = (int)values[0].size();
15.270 for(int i=size; i!=(int)values.size();++i){
15.271 (values[i]).resize(innersize);
15.272 }
15.273 - }else if(_second_key_proxy.getNotifier()->maxId() >= 0){
15.274 - int innersize = _second_key_proxy.getNotifier()->maxId();
15.275 + }else if(_second_key_proxy.notifier()->maxId() >= 0){
15.276 + int innersize = _second_key_proxy.notifier()->maxId();
15.277 for(int i = 0; i != (int)values.size(); ++i){
15.278 values[0].resize(innersize);
15.279 }
15.280 @@ -939,7 +939,7 @@
15.281 void addFirstKeys(const std::vector<FirstKey>& firstKeys){
15.282 int max = values.size() - 1;
15.283 for(int i=0; i != (int)firstKeys.size(); ++i){
15.284 - int id = _first_key_proxy.getNotifier()->id(firstKeys[i]);
15.285 + int id = _first_key_proxy.notifier()->id(firstKeys[i]);
15.286 if(max < id){
15.287 max = id;
15.288 }
15.289 @@ -952,8 +952,8 @@
15.290 for(int i = size; i != (max + 1); ++i){
15.291 values[i].resize(innersize);
15.292 }
15.293 - }else if(_second_key_proxy.getNotifier()->maxId() >= 0){
15.294 - int innersize = _second_key_proxy.getNotifier()->maxId();
15.295 + }else if(_second_key_proxy.notifier()->maxId() >= 0){
15.296 + int innersize = _second_key_proxy.notifier()->maxId();
15.297 for(int i = 0; i != (int)values.size(); ++i){
15.298 values[i].resize(innersize);
15.299 }
15.300 @@ -969,7 +969,7 @@
15.301 if(values.size() == 0){
15.302 return;
15.303 }
15.304 - int id = _second_key_proxy.getNotifier()->id(secondKey);
15.305 + int id = _second_key_proxy.notifier()->id(secondKey);
15.306 if(id >= (int)values[0].size()){
15.307 for(int i=0;i!=(int)values.size();++i){
15.308 values[i].resize(id+1);
15.309 @@ -987,7 +987,7 @@
15.310 }
15.311 int max = values[0].size();
15.312 for(int i = 0; i != (int)secondKeys.size(); ++i){
15.313 - int id = _second_key_proxy.getNotifier()->id(secondKeys[i]);
15.314 + int id = _second_key_proxy.notifier()->id(secondKeys[i]);
15.315 if(max < id){
15.316 max = id;
15.317 }
15.318 @@ -1004,7 +1004,7 @@
15.319 ///Erase a FirstKey from the map. It called by the observer
15.320 ///class belongs to the FirstKey type.
15.321 void eraseFirstKey(const FirstKey& first) {
15.322 - int id = _first_key_proxy.getNotifier()->id(first);
15.323 + int id = _first_key_proxy.notifier()->id(first);
15.324 for(int i = 0; i != (int)values[id].size(); ++i){
15.325 values[id][i] = Value();
15.326 }
15.327 @@ -1016,7 +1016,7 @@
15.328 ///class belongs to the FirstKey type.
15.329 void eraseFirstKeys(const std::vector<FirstKey>& firstKeys) {
15.330 for(int j = 0; j != (int)firstKeys.size(); ++j){
15.331 - int id = _first_key_proxy.getNotifier()->id(firstKeys[j]);
15.332 + int id = _first_key_proxy.notifier()->id(firstKeys[j]);
15.333 for(int i = 0; i != (int)values[id].size(); ++i){
15.334 values[id][i] = Value();
15.335 }
15.336 @@ -1031,7 +1031,7 @@
15.337 if(values.size() == 0){
15.338 return;
15.339 }
15.340 - int id = _second_key_proxy.getNotifier()->id(second);
15.341 + int id = _second_key_proxy.notifier()->id(second);
15.342 for(int i = 0; i != (int)values.size(); ++i){
15.343 values[i][id] = Value();
15.344 }
15.345 @@ -1046,7 +1046,7 @@
15.346 return;
15.347 }
15.348 for(int j = 0; j != (int)secondKeys.size(); ++j){
15.349 - int id = _second_key_proxy.getNotifier()->id(secondKeys[j]);
15.350 + int id = _second_key_proxy.notifier()->id(secondKeys[j]);
15.351 for(int i = 0; i != (int)values.size(); ++i){
15.352 values[i][id] = Value();
15.353 }
15.354 @@ -1058,9 +1058,9 @@
15.355 ///It buildes the map. It is called by the observer class belongs
15.356 ///to the FirstKey or SecondKey type.
15.357 void build() {
15.358 - values.resize(_first_key_proxy.getNotifier()->maxId());
15.359 + values.resize(_first_key_proxy.notifier()->maxId());
15.360 for(int i=0; i!=(int)values.size(); ++i){
15.361 - values[i].resize(_second_key_proxy.getNotifier()->maxId());
15.362 + values[i].resize(_second_key_proxy.notifier()->maxId());
15.363 }
15.364 }
15.365