Changeset 361:ab0899df30d2 in lemon-0.x for src/work/klao/iter_map.h

Timestamp:

04/21/04 17:46:40 (20 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

IterableMap? with template ValueType?. IterableBoolMap? as a specialization.
Range checking warnings...

File:

• src/work/klao/iter_map.h (modified) (7 diffs)

src/work/klao/iter_map.h

@@ -17 +17 @@
   /// \todo Decide whether we need all the range checkings!!!
 
-  template<typename KeyIntMap, uint8_t N>
+  template<typename KeyIntMap, uint8_t N, typename Val = uint8_t>
   class IterableMap {
   public:
 
     typedef typename KeyIntMap::KeyType KeyType;
-    typedef uint8_t ValueType;
+    typedef Val ValueType;
 
     typedef typename std::vector<KeyType>::const_iterator iterator;
@@ -30 +30 @@
     std::vector<KeyType> data;
     size_t bounds[N];
+    Val def_val;
 
-    uint8_t find(size_t a) const {
-      uint8_t n=0;
-      for(; n<N && bounds[n]<=a; ++n);
-      return n;
+    Val find(size_t a) const {
+      for(uint8_t n=0; n<N; ++n) {
+        if(bounds[n] > a)
+          return n;
+      }
+      return def_val;
     }
 
@@ -67 +70 @@
   public:
     
-    IterableMap(KeyIntMap &_base) : base(_base) {
+    IterableMap(KeyIntMap &_base, Val d = N+1) : base(_base), def_val(d) {
       memset(bounds, 0, sizeof(bounds));
       //    for(int i=0; i<N; ++i) { bounds[i]=0; }
     }
 
-    uint8_t operator[](const KeyType& k) const {
+    Val operator[](const KeyType& k) const {
       return find(base[k]);
     }
 
-    void set(const KeyType& k, uint8_t n) {
+    void set(const KeyType& k, Val n) {
+      // FIXME: n < N ???
       size_t a = base[k];
-      if(a < bounds[N-1]) {
+      if(a < bounds[N-1] && n < N) {
         base.set(k, move(a, find(a), n));
       }
     }
 
-    void insert(const KeyType& k, uint8_t n) {
-      if(n<N) {
+    void insert(const KeyType& k, Val n) {
+      if(n < N) {
         data.push_back(k);
         base.set(k, move(bounds[N-1]++, N-1, n));
@@ -90 +94 @@
     }
 
-    iterator begin(uint8_t n) const {
+    iterator begin(Val n) const {
       if(n < N)
         return data.begin() + (n ? bounds[n-1] : 0);
@@ -97 +101 @@
     }
 
-    iterator end(uint8_t n) const {
+    iterator end(Val n) const {
       if(n < N)
         return data.begin() + bounds[n];
@@ -104 +108 @@
     }
 
-    size_t size(uint8_t n) const {
+    size_t size(Val n) const {
       if(n < N)
         return bounds[n] - (n ? bounds[n-1] : 0);
@@ -118 +122 @@
   };
 
+
+
+
+  template<typename KeyIntMap>
+  class IterableBoolMap : public IterableMap<KeyIntMap, 2, bool> {
+    typedef IterableMap<KeyIntMap, 2, bool> Parent;
+
+  public:
+    IterableBoolMap(KeyIntMap &_base, bool d = false) : Parent(_base, d) {}
+  };
+
 }
 #endif