gravatar
kpeter (Peter Kovacs)
kpeter@inf.elte.hu
Added missing inheritances and map-creator functions.
0 1 0
default
1 file changed with 60 insertions and 8 deletions:
↑ Collapse diff ↑
Ignore white space 8 line context
... ...
@@ -162,23 +162,25 @@
162 162

	
163 163
  ///This is essentially a wrapper for \c std::map with addition that
164 164
  ///you can specify a default value different from \c Value().
165 165
  template <typename K, typename T, typename Compare = std::less<K> >
166
  class StdMap {
166
  class StdMap : public MapBase<K, T> {
167 167
    template <typename K1, typename T1, typename C1>
168 168
    friend class StdMap;
169 169
  public:
170 170

	
171
    typedef True ReferenceMapTag;
171
    typedef MapBase<K, T> Parent;
172 172
    ///\e
173
    typedef K Key;
173
    typedef typename Parent::Key Key;
174 174
    ///\e
175
    typedef T Value;
175
    typedef typename Parent::Value Value;
176 176
    ///\e
177 177
    typedef T& Reference;
178 178
    ///\e
179 179
    typedef const T& ConstReference;
180 180

	
181
    typedef True ReferenceMapTag;
182

	
181 183
  private:
182 184
    
183 185
    typedef std::map<K, T, Compare> Map;
184 186
    Value _value;
... ...
@@ -238,8 +240,29 @@
238 240
      _map.clear();
239 241
    }    
240 242

	
241 243
  };
244
  
245
  ///Returns a \ref StdMap class
246

	
247
  ///This function just returns a \ref StdMap class with specified 
248
  ///default value.
249
  ///\relates StdMap
250
  template<typename K, typename V, typename Compare = std::less<K> > 
251
  inline StdMap<K, V, Compare> stdMap(const V& value = V()) {
252
    return StdMap<K, V, Compare>(value);
253
  }
254

	
255
  ///Returns a \ref StdMap class created from an appropriate std::map
256

	
257
  ///This function just returns a \ref StdMap class created from an 
258
  ///appropriate std::map.
259
  ///\relates StdMap
260
  template<typename K, typename V, typename Compare = std::less<K> > 
261
  inline StdMap<K, V, Compare> stdMap( const std::map<K, V, Compare> &map, 
262
                                       const V& value = V() ) {
263
    return StdMap<K, V, Compare>(map, value);
264
  }
242 265

	
243 266
  /// \brief Map for storing values for keys from the range <tt>[0..size-1]</tt>
244 267
  ///
245 268
  /// The current map has the <tt>[0..size-1]</tt> keyset and the values
... ...
@@ -248,25 +271,27 @@
248 271
  /// the used items are small integer numbers. 
249 272
  ///
250 273
  /// \todo Revise its name
251 274
  template <typename T>
252
  class IntegerMap {
275
  class IntegerMap : public MapBase<int, T> {
253 276

	
254 277
    template <typename T1>
255 278
    friend class IntegerMap;
256 279

	
257 280
  public:
258 281

	
259
    typedef True ReferenceMapTag;
282
    typedef MapBase<int, T> Parent;
260 283
    ///\e
261
    typedef int Key;
284
    typedef typename Parent::Key Key;
262 285
    ///\e
263
    typedef T Value;
286
    typedef typename Parent::Value Value;
264 287
    ///\e
265 288
    typedef T& Reference;
266 289
    ///\e
267 290
    typedef const T& ConstReference;
268 291

	
292
    typedef True ReferenceMapTag;
293

	
269 294
  private:
270 295
    
271 296
    typedef std::vector<T> Vector;
272 297
    Vector _vector;
... ...
@@ -312,8 +337,17 @@
312 337
      _vector[k] = t;
313 338
    }
314 339

	
315 340
  };
341
  
342
  ///Returns an \ref IntegerMap class
343

	
344
  ///This function just returns an \ref IntegerMap class.
345
  ///\relates IntegerMap
346
  template<typename T>
347
  inline IntegerMap<T> integerMap(int size = 0, const T& value = T()) {
348
    return IntegerMap<T>(size, value);
349
  }
316 350

	
317 351
  /// @}
318 352

	
319 353
  /// \addtogroup map_adaptors
... ...
@@ -404,8 +438,17 @@
404 438
    SimpleMap(const M &_m) : m(_m) {};
405 439
    ///\e
406 440
    Value operator[](Key k) const {return m[k];}
407 441
  };
442
  
443
  ///Returns a \ref SimpleMap class
444

	
445
  ///This function just returns a \ref SimpleMap class.
446
  ///\relates SimpleMap
447
  template<typename M>
448
  inline SimpleMap<M> simpleMap(const M &m) {
449
    return SimpleMap<M>(m);
450
  }
408 451

	
409 452
  ///Simple writable wrapping of a map
410 453

	
411 454
  ///This \ref concepts::WriteMap "write map" returns the simple
... ...
@@ -432,8 +475,17 @@
432 475
    ///\e
433 476
    void set(Key k, const Value& c) { m.set(k, c); }
434 477
  };
435 478

	
479
  ///Returns a \ref SimpleWriteMap class
480

	
481
  ///This function just returns a \ref SimpleWriteMap class.
482
  ///\relates SimpleWriteMap
483
  template<typename M>
484
  inline SimpleWriteMap<M> simpleWriteMap(M &m) {
485
    return SimpleWriteMap<M>(m);
486
  }
487

	
436 488
  ///Sum of two maps
437 489

	
438 490
  ///This \c concepts::ReadMap "read only map" returns the sum of the two
439 491
  ///given maps.
0 comments (0 inline)