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

Timestamp:

04/21/04 18:09:42 (21 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 :)

Location:

src/work/klao

Files:

• iter_map.h (modified) (2 diffs)
• iter_map_test.cc (modified) (3 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);
     }
     

src/work/klao/iter_map_test.cc

@@ -120 +120 @@
 
   {
-    cout << "Testing the IterableBoolMap...\n";
+    cout << "\n\n\nTesting the IterableBoolMap...\n";
 
     BaseMap base(344);
-    TestBoolMap test(base);
+    TestBoolMap test(base,true);
 
 
@@ -158 +158 @@
     cout << " 42: " << test[42] << endl;
 
-    cout << "Inserting 21 to class 1...\n";
-    test.insert(21,1);
-    print(test,2);
-
-    cout << "Inserting 20 to class 1...\n";
-    test.insert(20,0);
-    print(test,2);
-
-    cout << "Testing some map values:\n";
-    cout << " 12: " << test[12] << endl;
-    cout << " 22: " << test[22] << endl;
-    cout << " 10: " << test[10] << endl;
-    cout << " 20: " << test[20] << endl;
-    cout << " 11: " << test[11] << endl;
-    cout << " 21: " << test[21] << endl;
-    cout << " 42: " << test[42] << endl;
-
-    cout << "Setting 20 to class 2...\n";
-    test.set(20,2);
+    cout << "Setting 10 to class true...\n";
+    test.set(10,true);
     print(test,2);
   
-    cout << "Setting 10 to class 1...\n";
-    test.set(10,1);
-    print(test,2);
-  
-    cout << "Setting 11 to class 1...\n";
+    cout << "Setting 11 to class true...\n";
     test.set(11,1);
     print(test,2);
   
-    cout << "Setting 12 to class 1...\n";
-    test.set(12,1);
+    cout << "Setting 12 to class false...\n";
+    test.set(12,false);
     print(test,2);
   
-    cout << "Setting 21 to class 2...\n";
-    test.set(21,2);
-    print(test,2);
-  
-    cout << "Setting 22 to class 2...\n";
-    test.set(22,2);
+    cout << "Setting 22 to class false...\n";
+    test.set(22,false);
     print(test,2);
   
@@ -203 +178 @@
     cout << " 22: " << test[22] << endl;
     cout << " 10: " << test[10] << endl;
-    cout << " 20: " << test[20] << endl;
     cout << " 11: " << test[11] << endl;
-    cout << " 21: " << test[21] << endl;
     cout << " 42: " << test[42] << endl;