Changeset 2384:805c5a2a36dd in lemon-0.x for lemon/bits/array_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/array_map.h (modified) (13 diffs)

lemon/bits/array_map.h

@@ -80 +80 @@
     /// Graph initialized map constructor.
     explicit ArrayMap(const Graph& graph) {
-      Parent::attach(graph.getNotifier(Item()));
+      Parent::attach(graph.notifier(Item()));
       allocate_memory();
-      Notifier* notifier = Parent::getNotifier();
+      Notifier* notifier = Parent::notifier();
       Item it;
       for (notifier->first(it); it != INVALID; notifier->next(it)) {
@@ -94 +94 @@
     /// It constructs a map and initialize all of the the map. 
     ArrayMap(const Graph& graph, const Value& value) {
-      Parent::attach(graph.getNotifier(Item()));
+      Parent::attach(graph.notifier(Item()));
       allocate_memory();
-      Notifier* notifier = Parent::getNotifier();
+      Notifier* notifier = Parent::notifier();
       Item it;
       for (notifier->first(it); it != INVALID; notifier->next(it)) {
@@ -109 +109 @@
     ArrayMap(const ArrayMap& copy) : Parent() {
       if (copy.attached()) {
-        attach(*copy.getNotifier());
+        attach(*copy.notifier());
       }
       capacity = copy.capacity;
       if (capacity == 0) return;
       values = allocator.allocate(capacity);
-      Notifier* notifier = Parent::getNotifier();
+      Notifier* notifier = Parent::notifier();
       Item it;
       for (notifier->first(it); it != INVALID; notifier->next(it)) {
@@ -143 +143 @@
     ArrayMap& 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)) {
@@ -174 +174 @@
     /// actual keys of the graph. 
     Value& operator[](const Key& key) {
-      int id = Parent::getNotifier()->id(key);
+      int id = Parent::notifier()->id(key);
       return values[id];
     } 
@@ -183 +183 @@
     /// actual keys of the graph. 
     const Value& operator[](const Key& key) const {
-      int id = Parent::getNotifier()->id(key);
+      int id = Parent::notifier()->id(key);
       return values[id];
     }
@@ -202 +202 @@
     /// and it overrides the add() member function of the observer base.     
     virtual void add(const Key& key) {
-      Notifier* notifier = Parent::getNotifier();
+      Notifier* notifier = Parent::notifier();
       int id = notifier->id(key);
       if (id >= capacity) {
@@ -230 +230 @@
     /// and it overrides the add() member function of the observer base.     
     virtual void add(const std::vector<Key>& keys) {
-      Notifier* notifier = Parent::getNotifier();
+      Notifier* notifier = Parent::notifier();
       int max_id = -1;
       for (int i = 0; i < (int)keys.size(); ++i) {
@@ -274 +274 @@
     /// and it overrides the erase() member function of the observer base.     
     virtual void erase(const Key& key) {
-      int id = Parent::getNotifier()->id(key);
+      int id = Parent::notifier()->id(key);
       allocator.destroy(&(values[id]));
     }
@@ -284 +284 @@
     virtual void erase(const std::vector<Key>& keys) {
       for (int i = 0; i < (int)keys.size(); ++i) {
-        int id = Parent::getNotifier()->id(keys[i]);
+        int id = Parent::notifier()->id(keys[i]);
         allocator.destroy(&(values[id]));
       }
@@ -294 +294 @@
     /// and it overrides the build() member function of the observer base. 
     virtual void build() {
-      Notifier* notifier = Parent::getNotifier();
+      Notifier* notifier = Parent::notifier();
       allocate_memory();
       Item it;
@@ -308 +308 @@
     /// and it overrides the clear() member function of the observer base.     
     virtual void clear() {      
-      Notifier* notifier = Parent::getNotifier();
+      Notifier* notifier = Parent::notifier();
       if (capacity != 0) {
         Item it;
@@ -323 +323 @@
       
     void allocate_memory() {
-      int max_id = Parent::getNotifier()->maxId();
+      int max_id = Parent::notifier()->maxId();
       if (max_id == -1) {
         capacity = 0;