Changeset 2384:805c5a2a36dd in lemon-0.x for lemon/bits/vector_map.h

Timestamp:

03/01/07 18:14:24 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3215

Message:

getNotifier to notifier renaming

File:

• lemon/bits/vector_map.h (modified) (11 diffs)

lemon/bits/vector_map.h

@@ -91 +91 @@
     /// It adds all the items of the graph to the map.
     VectorMap(const Graph& graph) {
-      Parent::attach(graph.getNotifier(Item()));
-      container.resize(Parent::getNotifier()->maxId() + 1);
+      Parent::attach(graph.notifier(Item()));
+      container.resize(Parent::notifier()->maxId() + 1);
     }
 
@@ -100 +100 @@
     /// It adds all the items of the graph to the map.
     VectorMap(const Graph& graph, const Value& value) {
-      Parent::attach(graph.getNotifier(Item()));
-      container.resize(Parent::getNotifier()->maxId() + 1, value);
+      Parent::attach(graph.notifier(Item()));
+      container.resize(Parent::notifier()->maxId() + 1, value);
     }
 
@@ -109 +109 @@
     VectorMap(const VectorMap& _copy) : Parent() {
       if (_copy.attached()) {
-        Parent::attach(*_copy.getNotifier());
+        Parent::attach(*_copy.notifier());
         container = _copy.container;
       }
@@ -135 +135 @@
     VectorMap& operator=(const CMap& cmap) {
       checkConcept<concepts::ReadMap<Key, _Value>, CMap>();
-      const typename Parent::Notifier* notifier = Parent::getNotifier();
+      const typename Parent::Notifier* notifier = Parent::notifier();
       Item it;
       for (notifier->first(it); it != INVALID; notifier->next(it)) {
@@ -150 +150 @@
     /// actual items of the graph.      
     Reference operator[](const Key& key) {
-      return container[Parent::getNotifier()->id(key)];
+      return container[Parent::notifier()->id(key)];
     } 
                 
@@ -158 +158 @@
     /// actual items of the graph. 
     ConstReference operator[](const Key& key) const {
-      return container[Parent::getNotifier()->id(key)];
+      return container[Parent::notifier()->id(key)];
     }
 
@@ -176 +176 @@
     /// and it overrides the add() member function of the observer base.     
     virtual void add(const Key& key) {
-      int id = Parent::getNotifier()->id(key);
+      int id = Parent::notifier()->id(key);
       if (id >= (int)container.size()) {
         container.resize(id + 1);
@@ -189 +189 @@
       int max = container.size() - 1;
       for (int i = 0; i < (int)keys.size(); ++i) {
-        int id = Parent::getNotifier()->id(keys[i]);
+        int id = Parent::notifier()->id(keys[i]);
         if (id >= max) {
           max = id;
@@ -202 +202 @@
     /// and it overrides the erase() member function of the observer base.     
     virtual void erase(const Key& key) {
-      container[Parent::getNotifier()->id(key)] = Value();
+      container[Parent::notifier()->id(key)] = Value();
     }
 
@@ -211 +211 @@
     virtual void erase(const std::vector<Key>& keys) {
       for (int i = 0; i < (int)keys.size(); ++i) {
-        container[Parent::getNotifier()->id(keys[i])] = Value();
+        container[Parent::notifier()->id(keys[i])] = Value();
       }
     }
@@ -220 +220 @@
     /// and it overrides the build() member function of the observer base.
     virtual void build() { 
-      int size = Parent::getNotifier()->maxId() + 1;
+      int size = Parent::notifier()->maxId() + 1;
       container.reserve(size);
       container.resize(size);