Changeset 362:6c2e8a1f380a in lemon-0.x for src/work/klao/iter_map.h

Timestamp:

04/21/04 18:09:42 (20 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

IterableMap?: no range checking, no warning :)

File:

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

src/work/klao/iter_map.h

@@ -56 +56 @@
           half_swap(a, bounds[m]++);
         }
+        // FIXME: range check ide?
         while(m < n) {
           half_swap(a, --bounds[m]);
@@ -80 +81 @@
 
     void set(const KeyType& k, Val n) {
-      // FIXME: n < N ???
+      // FIXME: range check?
       size_t a = base[k];
-      if(a < bounds[N-1] && n < N) {
+      if(a < bounds[N-1]) {
         base.set(k, move(a, find(a), n));
+      }
+      else {
+        insert(k, 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));
-      }
+      data.push_back(k);
+      base.set(k, move(bounds[N-1]++, N-1, n));
     }
 
     iterator begin(Val n) const {
-      if(n < N)
-        return data.begin() + (n ? bounds[n-1] : 0);
-      else
-        return data.end();
+      return data.begin() + (n ? bounds[n-1] : 0);
     }
 
     iterator end(Val n) const {
-      if(n < N)
-        return data.begin() + bounds[n];
-      else
-        return data.end();
+      return data.begin() + bounds[n];
     }
 
     size_t size(Val n) const {
-      if(n < N)
-        return bounds[n] - (n ? bounds[n-1] : 0);
-      else
-        return 0;
+      return bounds[n] - (n ? bounds[n-1] : 0);
     }