1.1 --- a/lemon/matrix_maps.h Fri Mar 02 17:56:22 2007 +0000
1.2 +++ b/lemon/matrix_maps.h Fri Mar 02 18:04:28 2007 +0000
1.3 @@ -349,19 +349,19 @@
1.4 }
1.5
1.6 virtual void add(const Key& key) {
1.7 - if (size(Parent::notifier()->id(key) + 1) >= (int)values.size()) {
1.8 + if (size(Parent::notifier()->id(key) + 1) >= int(values.size())) {
1.9 values.resize(size(Parent::notifier()->id(key) + 1));
1.10 }
1.11 }
1.12
1.13 virtual void add(const std::vector<Key>& keys) {
1.14 int new_size = 0;
1.15 - for (int i = 0; i < (int)keys.size(); ++i) {
1.16 + for (int i = 0; i < int(keys.size()); ++i) {
1.17 if (size(Parent::notifier()->id(keys[i]) + 1) >= new_size) {
1.18 new_size = size(Parent::notifier()->id(keys[i]) + 1);
1.19 }
1.20 }
1.21 - if (new_size > (int)values.size()) {
1.22 + if (new_size > int(values.size())) {
1.23 values.resize(new_size);
1.24 }
1.25 }
1.26 @@ -504,19 +504,19 @@
1.27 }
1.28
1.29 virtual void add(const Key& key) {
1.30 - if (size(Parent::notifier()->id(key) + 1) >= (int)values.size()) {
1.31 + if (size(Parent::notifier()->id(key) + 1) >= int(values.size())) {
1.32 values.resize(size(Parent::notifier()->id(key) + 1));
1.33 }
1.34 }
1.35
1.36 virtual void add(const std::vector<Key>& keys) {
1.37 int new_size = 0;
1.38 - for (int i = 0; i < (int)keys.size(); ++i) {
1.39 + for (int i = 0; i < int(keys.size()); ++i) {
1.40 if (size(Parent::notifier()->id(keys[i]) + 1) >= new_size) {
1.41 new_size = size(Parent::notifier()->id(keys[i]) + 1);
1.42 }
1.43 }
1.44 - if (new_size > (int)values.size()) {
1.45 + if (new_size > int(values.size())) {
1.46 values.resize(new_size);
1.47 }
1.48 }
1.49 @@ -915,17 +915,17 @@
1.50 ///It adds a new FirstKey to the map. It is called by the observer
1.51 ///class belongs to the FirstKey type.
1.52 void addFirstKey(const FirstKey& firstKey) {
1.53 - int size = (int)values.size();
1.54 + int size = int(values.size());
1.55 if( _first_key_proxy.notifier()->id(firstKey)+1 >= size ){
1.56 values.resize(_first_key_proxy.notifier()->id(firstKey)+1);
1.57 - if( (int)values[0].size() != 0 ){
1.58 - int innersize = (int)values[0].size();
1.59 - for(int i=size; i!=(int)values.size();++i){
1.60 + if( int(values[0].size()) != 0 ){
1.61 + int innersize = int(values[0].size());
1.62 + for(int i = size; i < int(values.size());++i){
1.63 (values[i]).resize(innersize);
1.64 }
1.65 }else if(_second_key_proxy.notifier()->maxId() >= 0){
1.66 int innersize = _second_key_proxy.notifier()->maxId();
1.67 - for(int i = 0; i != (int)values.size(); ++i){
1.68 + for(int i = 0; i < int(values.size()); ++i){
1.69 values[0].resize(innersize);
1.70 }
1.71 }
1.72 @@ -938,23 +938,23 @@
1.73 ///observer class belongs to the FirstKey type.
1.74 void addFirstKeys(const std::vector<FirstKey>& firstKeys){
1.75 int max = values.size() - 1;
1.76 - for(int i=0; i != (int)firstKeys.size(); ++i){
1.77 + for(int i = 0; i < int(firstKeys.size()); ++i){
1.78 int id = _first_key_proxy.notifier()->id(firstKeys[i]);
1.79 if(max < id){
1.80 max = id;
1.81 }
1.82 }
1.83 - int size = (int)values.size();
1.84 + int size = int(values.size());
1.85 if(max >= size){
1.86 values.resize(max + 1);
1.87 - if( (int)values[0].size() != 0){
1.88 - int innersize = (int)values[0].size();
1.89 - for(int i = size; i != (max + 1); ++i){
1.90 + if( int(values[0].size()) != 0){
1.91 + int innersize = int(values[0].size());
1.92 + for(int i = size; i < (max + 1); ++i){
1.93 values[i].resize(innersize);
1.94 }
1.95 }else if(_second_key_proxy.notifier()->maxId() >= 0){
1.96 int innersize = _second_key_proxy.notifier()->maxId();
1.97 - for(int i = 0; i != (int)values.size(); ++i){
1.98 + for(int i = 0; i < int(values.size()); ++i){
1.99 values[i].resize(innersize);
1.100 }
1.101 }
1.102 @@ -970,8 +970,8 @@
1.103 return;
1.104 }
1.105 int id = _second_key_proxy.notifier()->id(secondKey);
1.106 - if(id >= (int)values[0].size()){
1.107 - for(int i=0;i!=(int)values.size();++i){
1.108 + if(id >= int(values[0].size())){
1.109 + for(int i = 0; i < int(values.size());++i){
1.110 values[i].resize(id+1);
1.111 }
1.112 }
1.113 @@ -986,14 +986,14 @@
1.114 return;
1.115 }
1.116 int max = values[0].size();
1.117 - for(int i = 0; i != (int)secondKeys.size(); ++i){
1.118 + for(int i = 0; i < int(secondKeys.size()); ++i){
1.119 int id = _second_key_proxy.notifier()->id(secondKeys[i]);
1.120 if(max < id){
1.121 max = id;
1.122 }
1.123 }
1.124 - if(max > (int)values[0].size()){
1.125 - for(int i = 0; i != (int)values.size(); ++i){
1.126 + if(max > int(values[0].size())){
1.127 + for(int i = 0; i < int(values.size()); ++i){
1.128 values[i].resize(max + 1);
1.129 }
1.130 }
1.131 @@ -1005,7 +1005,7 @@
1.132 ///class belongs to the FirstKey type.
1.133 void eraseFirstKey(const FirstKey& first) {
1.134 int id = _first_key_proxy.notifier()->id(first);
1.135 - for(int i = 0; i != (int)values[id].size(); ++i){
1.136 + for(int i = 0; i < int(values[id].size()); ++i){
1.137 values[id][i] = Value();
1.138 }
1.139 }
1.140 @@ -1015,9 +1015,9 @@
1.141 ///Erase more FirstKey from the map. It called by the observer
1.142 ///class belongs to the FirstKey type.
1.143 void eraseFirstKeys(const std::vector<FirstKey>& firstKeys) {
1.144 - for(int j = 0; j != (int)firstKeys.size(); ++j){
1.145 + for(int j = 0; j < int(firstKeys.size()); ++j){
1.146 int id = _first_key_proxy.notifier()->id(firstKeys[j]);
1.147 - for(int i = 0; i != (int)values[id].size(); ++i){
1.148 + for(int i = 0; i < int(values[id].size()); ++i){
1.149 values[id][i] = Value();
1.150 }
1.151 }
1.152 @@ -1032,7 +1032,7 @@
1.153 return;
1.154 }
1.155 int id = _second_key_proxy.notifier()->id(second);
1.156 - for(int i = 0; i != (int)values.size(); ++i){
1.157 + for(int i = 0; i < int(values.size()); ++i){
1.158 values[i][id] = Value();
1.159 }
1.160 }
1.161 @@ -1045,9 +1045,9 @@
1.162 if(values.size() == 0){
1.163 return;
1.164 }
1.165 - for(int j = 0; j != (int)secondKeys.size(); ++j){
1.166 + for(int j = 0; j < int(secondKeys.size()); ++j){
1.167 int id = _second_key_proxy.notifier()->id(secondKeys[j]);
1.168 - for(int i = 0; i != (int)values.size(); ++i){
1.169 + for(int i = 0; i < int(values.size()); ++i){
1.170 values[i][id] = Value();
1.171 }
1.172 }
1.173 @@ -1059,7 +1059,7 @@
1.174 ///to the FirstKey or SecondKey type.
1.175 void build() {
1.176 values.resize(_first_key_proxy.notifier()->maxId());
1.177 - for(int i=0; i!=(int)values.size(); ++i){
1.178 + for(int i = 0; i< int(values.size()); ++i){
1.179 values[i].resize(_second_key_proxy.notifier()->maxId());
1.180 }
1.181 }
1.182 @@ -1069,7 +1069,7 @@
1.183 ///It erases all items from the map. It is called by the observer class
1.184 ///belongs to the FirstKey or SecondKey type.
1.185 void clear() {
1.186 - for(int i=0; i!=(int)values.size(); ++i) {
1.187 + for(int i = 0; i < int(values.size()); ++i) {
1.188 values[i].clear();
1.189 }
1.190 values.clear();