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

lemon/matrix_maps.h

@@ -271 +271 @@
     DynamicMatrixMap(const Graph& _graph) 
       : values(size(_graph.maxId(Key()) + 1)) {
-      Parent::attach(_graph.getNotifier(Key()));
+      Parent::attach(_graph.notifier(Key()));
     }
 
@@ -280 +280 @@
     DynamicMatrixMap(const Graph& _graph, const Value& _val) 
       : values(size(_graph.maxId(Key()) + 1), _val) {
-      Parent::attach(_graph.getNotifier(Key()));
+      Parent::attach(_graph.notifier(Key()));
     }
 
@@ -297 +297 @@
     DynamicMatrixMap& operator=(const CMap& _cmap){
       checkConcept<concepts::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
-      typename Parent::Notifier* notifier = Parent::getNotifier();
+      typename Parent::Notifier* notifier = Parent::notifier();
       Key first, second;
       for(notifier->first(first); first != INVALID; 
@@ -314 +314 @@
     /// Gives back the value assigned to the \c first - \c second ordered pair.
     ConstReference operator()(const Key& first, const Key& second) const {
-      return values[index(Parent::getNotifier()->id(first), 
-                          Parent::getNotifier()->id(second))];
+      return values[index(Parent::notifier()->id(first), 
+                          Parent::notifier()->id(second))];
     }
     
@@ -323 +323 @@
     /// Gives back the value assigned to the \c first - \c second ordered pair.
     Reference operator()(const Key& first, const Key& second) {
-      return values[index(Parent::getNotifier()->id(first), 
-                          Parent::getNotifier()->id(second))];
+      return values[index(Parent::notifier()->id(first), 
+                          Parent::notifier()->id(second))];
     }
 
@@ -331 +331 @@
     /// Setter function for the matrix map.
     void set(const Key& first, const Key& second, const Value& val) {
-      values[index(Parent::getNotifier()->id(first), 
-                   Parent::getNotifier()->id(second))] = val;
+      values[index(Parent::notifier()->id(first), 
+                   Parent::notifier()->id(second))] = val;
     }
 
@@ -350 +350 @@
 
     virtual void add(const Key& key) {
-      if (size(Parent::getNotifier()->id(key) + 1) >= (int)values.size()) {
-        values.resize(size(Parent::getNotifier()->id(key) + 1));        
+      if (size(Parent::notifier()->id(key) + 1) >= (int)values.size()) {
+        values.resize(size(Parent::notifier()->id(key) + 1));   
       }
     }
@@ -358 +358 @@
       int new_size = 0;
       for (int i = 0; i < (int)keys.size(); ++i) {
-        if (size(Parent::getNotifier()->id(keys[i]) + 1) >= new_size) {
-          new_size = size(Parent::getNotifier()->id(keys[i]) + 1);      
+        if (size(Parent::notifier()->id(keys[i]) + 1) >= new_size) {
+          new_size = size(Parent::notifier()->id(keys[i]) + 1); 
         }
       }
@@ -372 +372 @@
 
     virtual void build() {
-      values.resize(size(Parent::getNotifier()->maxId() + 1));
+      values.resize(size(Parent::notifier()->maxId() + 1));
     }
 
@@ -420 +420 @@
     DynamicSymMatrixMap(const Graph& _graph) 
       : values(size(_graph.maxId(Key()) + 1)) {
-      Parent::attach(_graph.getNotifier(Key()));
+      Parent::attach(_graph.notifier(Key()));
     }
 
@@ -429 +429 @@
     DynamicSymMatrixMap(const Graph& _graph, const Value& _val) 
       : values(size(_graph.maxId(Key()) + 1), _val) {
-      Parent::attach(_graph.getNotifier(Key()));
+      Parent::attach(_graph.notifier(Key()));
     }
 
@@ -448 +448 @@
     DynamicSymMatrixMap& operator=(const CMap& _cmap){
       checkConcept<concepts::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
-      typename Parent::Notifier* notifier = Parent::getNotifier();
+      typename Parent::Notifier* notifier = Parent::notifier();
       Key first, second;
       for(notifier->first(first); first != INVALID; 
@@ -467 +467 @@
     /// pair.
     ConstReference operator()(const Key& first, const Key& second) const {
-      return values[index(Parent::getNotifier()->id(first), 
-                          Parent::getNotifier()->id(second))];
+      return values[index(Parent::notifier()->id(first), 
+                          Parent::notifier()->id(second))];
     }
     
@@ -477 +477 @@
     /// pair.
     Reference operator()(const Key& first, const Key& second) {
-      return values[index(Parent::getNotifier()->id(first), 
-                          Parent::getNotifier()->id(second))];
+      return values[index(Parent::notifier()->id(first), 
+                          Parent::notifier()->id(second))];
     }
 
@@ -486 +486 @@
     ///
     void set(const Key& first, const Key& second, const Value& val) {
-      values[index(Parent::getNotifier()->id(first), 
-                   Parent::getNotifier()->id(second))] = val;
+      values[index(Parent::notifier()->id(first), 
+                   Parent::notifier()->id(second))] = val;
     }
 
@@ -505 +505 @@
 
     virtual void add(const Key& key) {
-      if (size(Parent::getNotifier()->id(key) + 1) >= (int)values.size()) {
-        values.resize(size(Parent::getNotifier()->id(key) + 1));        
+      if (size(Parent::notifier()->id(key) + 1) >= (int)values.size()) {
+        values.resize(size(Parent::notifier()->id(key) + 1));   
       }
     }
@@ -513 +513 @@
       int new_size = 0;
       for (int i = 0; i < (int)keys.size(); ++i) {
-        if (size(Parent::getNotifier()->id(keys[i]) + 1) >= new_size) {
-          new_size = size(Parent::getNotifier()->id(keys[i]) + 1);      
+        if (size(Parent::notifier()->id(keys[i]) + 1) >= new_size) {
+          new_size = size(Parent::notifier()->id(keys[i]) + 1); 
         }
       }
@@ -527 +527 @@
 
     virtual void build() {
-      values.resize(size(Parent::getNotifier()->maxId() + 1));
+      values.resize(size(Parent::notifier()->maxId() + 1));
     }
 
@@ -802 +802 @@
         _second_key_proxy(*this)
     {
-      _first_key_proxy.attach(_firstContainer.getNotifier(FirstKey()));
-      _second_key_proxy.attach(_secondContainer.getNotifier(SecondKey()));
+      _first_key_proxy.attach(_firstContainer.notifier(FirstKey()));
+      _second_key_proxy.attach(_secondContainer.notifier(SecondKey()));
     }
 
@@ -818 +818 @@
         _second_key_proxy(*this)
     {
-      _first_key_proxy.attach(_firstContainer.getNotifier(FirstKey()));
-      _second_key_proxy.attach(_secondContainer.getNotifier(SecondKey()));
+      _first_key_proxy.attach(_firstContainer.notifier(FirstKey()));
+      _second_key_proxy.attach(_secondContainer.notifier(SecondKey()));
     }
       
@@ -829 +829 @@
       if(_copy._first_key_proxy.attached() && 
          _copy._second_key_proxy.attached()){
-        _first_key_proxy.attach(*_copy._first_key_proxy.getNotifier());
-        _second_key_proxy.attach(*_copy._second_key_proxy.getNotifier());
+        _first_key_proxy.attach(*_copy._first_key_proxy.notifier());
+        _second_key_proxy.attach(*_copy._second_key_proxy.notifier());
         values = _copy.values;
       }
@@ -855 +855 @@
     ///ordered pair.
     Reference operator()(const FirstKey& _first, const SecondKey& _second) {
-      return values[_first_key_proxy.getNotifier()->id(_first)]
-        [_second_key_proxy.getNotifier()->id(_second)];
+      return values[_first_key_proxy.notifier()->id(_first)]
+        [_second_key_proxy.notifier()->id(_second)];
     }
 
@@ -866 +866 @@
     ConstReference operator()(const FirstKey& _first, 
                               const SecondKey& _second) const {
-      return values[_first_key_proxy.getNotifier()->id(_first)]
-        [_second_key_proxy.getNotifier()->id(_second)];
+      return values[_first_key_proxy.notifier()->id(_first)]
+        [_second_key_proxy.notifier()->id(_second)];
     }
 
@@ -875 +875 @@
     void set(const FirstKey& first, const SecondKey& second, 
              const Value& value){
-      values[_first_key_proxy.getNotifier()->id(first)]
-        [_second_key_proxy.getNotifier()->id(second)] = value;
+      values[_first_key_proxy.notifier()->id(first)]
+        [_second_key_proxy.notifier()->id(second)] = value;
     }
 
@@ -894 +894 @@
       checkConcept<concepts::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
       const typename FirstKeyProxy::Notifier* notifierFirstKey = 
-        _first_key_proxy.getNotifier();
+        _first_key_proxy.notifier();
       const typename SecondKeyProxy::Notifier* notifierSecondKey = 
-        _second_key_proxy.getNotifier();
+        _second_key_proxy.notifier();
       FirstKey itemFirst;
       SecondKey itemSecond;
@@ -917 +917 @@
     void addFirstKey(const FirstKey& firstKey) {
       int size = (int)values.size();
-      if( _first_key_proxy.getNotifier()->id(firstKey)+1 >= size ){
-        values.resize(_first_key_proxy.getNotifier()->id(firstKey)+1);
+      if( _first_key_proxy.notifier()->id(firstKey)+1 >= size ){
+        values.resize(_first_key_proxy.notifier()->id(firstKey)+1);
         if( (int)values[0].size() != 0 ){
           int innersize = (int)values[0].size();
@@ -924 +924 @@
             (values[i]).resize(innersize);
           }
-        }else if(_second_key_proxy.getNotifier()->maxId() >= 0){
-          int innersize = _second_key_proxy.getNotifier()->maxId();
+        }else if(_second_key_proxy.notifier()->maxId() >= 0){
+          int innersize = _second_key_proxy.notifier()->maxId();
           for(int i = 0; i != (int)values.size(); ++i){
             values[0].resize(innersize);
@@ -940 +940 @@
       int max = values.size() - 1;
       for(int i=0; i != (int)firstKeys.size(); ++i){
-        int id = _first_key_proxy.getNotifier()->id(firstKeys[i]);
+        int id = _first_key_proxy.notifier()->id(firstKeys[i]);
         if(max < id){
           max = id;
@@ -953 +953 @@
             values[i].resize(innersize);
           }
-        }else if(_second_key_proxy.getNotifier()->maxId() >= 0){
-          int innersize = _second_key_proxy.getNotifier()->maxId();
+        }else if(_second_key_proxy.notifier()->maxId() >= 0){
+          int innersize = _second_key_proxy.notifier()->maxId();
           for(int i = 0; i != (int)values.size(); ++i){
             values[i].resize(innersize);
@@ -970 +970 @@
         return;
       }
-      int id = _second_key_proxy.getNotifier()->id(secondKey);
+      int id = _second_key_proxy.notifier()->id(secondKey);
       if(id >= (int)values[0].size()){
         for(int i=0;i!=(int)values.size();++i){
@@ -988 +988 @@
       int max = values[0].size();
       for(int i = 0; i != (int)secondKeys.size(); ++i){
-        int id = _second_key_proxy.getNotifier()->id(secondKeys[i]);
+        int id = _second_key_proxy.notifier()->id(secondKeys[i]);
         if(max < id){
           max = id;
@@ -1005 +1005 @@
     ///class belongs to the FirstKey type.
     void eraseFirstKey(const FirstKey& first) {
-      int id = _first_key_proxy.getNotifier()->id(first);
+      int id = _first_key_proxy.notifier()->id(first);
       for(int i = 0; i != (int)values[id].size(); ++i){
         values[id][i] = Value();
@@ -1017 +1017 @@
     void eraseFirstKeys(const std::vector<FirstKey>& firstKeys) {
       for(int j = 0; j != (int)firstKeys.size(); ++j){
-        int id = _first_key_proxy.getNotifier()->id(firstKeys[j]);
+        int id = _first_key_proxy.notifier()->id(firstKeys[j]);
         for(int i = 0; i != (int)values[id].size(); ++i){
           values[id][i] = Value();
@@ -1032 +1032 @@
         return;
       }
-      int id = _second_key_proxy.getNotifier()->id(second);
+      int id = _second_key_proxy.notifier()->id(second);
       for(int i = 0; i != (int)values.size(); ++i){
         values[i][id] = Value();
@@ -1047 +1047 @@
       }
       for(int j = 0; j != (int)secondKeys.size(); ++j){
-        int id = _second_key_proxy.getNotifier()->id(secondKeys[j]);
+        int id = _second_key_proxy.notifier()->id(secondKeys[j]);
         for(int i = 0; i != (int)values.size(); ++i){
           values[i][id] = Value();
@@ -1059 +1059 @@
     ///to the FirstKey or SecondKey type.
     void build() {
-      values.resize(_first_key_proxy.getNotifier()->maxId());
+      values.resize(_first_key_proxy.notifier()->maxId());
       for(int i=0; i!=(int)values.size(); ++i){
-        values[i].resize(_second_key_proxy.getNotifier()->maxId());
+        values[i].resize(_second_key_proxy.notifier()->maxId());
       }
     }