diff -r 91fba31268d6 -r ab0899df30d2 src/work/klao/iter_map_test.cc
--- a/src/work/klao/iter_map_test.cc	Wed Apr 21 15:14:45 2004 +0000
+++ b/src/work/klao/iter_map_test.cc	Wed Apr 21 15:46:40 2004 +0000
@@ -10,14 +10,16 @@
 
 typedef StdMap<int,int> BaseMap;
 typedef IterableMap<BaseMap, N> TestMap;
+typedef IterableBoolMap<BaseMap> TestBoolMap;
 
 
-void print(TestMap const& m) {
+template<typename TM>
+void print(TM const& m, int N = 3) {
   cout << "Size of the map: " << m.size() << endl;
   for(int i=0; i<N; ++i) {
     cout << "  Class " << i << ". (size=" << m.size(i) << "): " << flush;
     cout << "    ";
-    for(TestMap::iterator j = m.begin(i); j!=m.end(i); ++j) {
+    for(typename TM::iterator j = m.begin(i); j!=m.end(i); ++j) {
       cout << " " << *j;
     }
     cout << endl;
@@ -28,90 +30,182 @@
 
 int main() {
 
-  BaseMap base(344);
-  TestMap test(base);
+  {
+    BaseMap base(344);
+    TestMap test(base);
 
 
-  print(test);
+    print(test);
 
-  cout << "Inserting 12 to class 2...\n";
-  test.insert(12,2);
-  print(test);
+    cout << "Inserting 12 to class 2...\n";
+    test.insert(12,2);
+    print(test);
 
 
-  cout << "Inserting 22 to class 2...\n";
-  test.insert(22,2);
-  print(test);
+    cout << "Inserting 22 to class 2...\n";
+    test.insert(22,2);
+    print(test);
 
-  cout << "Testing some map values:\n";
-  cout << " 12: " << int(test[12]) << endl;
+    cout << "Testing some map values:\n";
+    cout << " 12: " << int(test[12]) << endl;
 
-  cout << "Inserting 10 to class 0...\n";
-  test.insert(10,0);
-  print(test);
+    cout << "Inserting 10 to class 0...\n";
+    test.insert(10,0);
+    print(test);
 
-  cout << "Testing some map values:\n";
-  cout << " 12: " << int(test[12]) << endl;
+    cout << "Testing some map values:\n";
+    cout << " 12: " << int(test[12]) << endl;
 
-  cout << "Inserting 11 to class 1...\n";
-  test.insert(11,1);
-  print(test);
+    cout << "Inserting 11 to class 1...\n";
+    test.insert(11,1);
+    print(test);
 
-  cout << "Testing some map values:\n";
-  cout << " 12: " << int(test[12]) << endl;
-  cout << " 22: " << int(test[22]) << endl;
-  cout << " 10: " << int(test[10]) << endl;
-  cout << " 11: " << int(test[11]) << endl;
-  cout << " 42: " << int(test[42]) << endl;
+    cout << "Testing some map values:\n";
+    cout << " 12: " << int(test[12]) << endl;
+    cout << " 22: " << int(test[22]) << endl;
+    cout << " 10: " << int(test[10]) << endl;
+    cout << " 11: " << int(test[11]) << endl;
+    cout << " 42: " << int(test[42]) << endl;
 
-  cout << "Inserting 21 to class 1...\n";
-  test.insert(21,1);
-  print(test);
+    cout << "Inserting 21 to class 1...\n";
+    test.insert(21,1);
+    print(test);
 
-  cout << "Inserting 20 to class 1...\n";
-  test.insert(20,0);
-  print(test);
+    cout << "Inserting 20 to class 1...\n";
+    test.insert(20,0);
+    print(test);
 
-  cout << "Testing some map values:\n";
-  cout << " 12: " << int(test[12]) << endl;
-  cout << " 22: " << int(test[22]) << endl;
-  cout << " 10: " << int(test[10]) << endl;
-  cout << " 20: " << int(test[20]) << endl;
-  cout << " 11: " << int(test[11]) << endl;
-  cout << " 21: " << int(test[21]) << endl;
-  cout << " 42: " << int(test[42]) << endl;
+    cout << "Testing some map values:\n";
+    cout << " 12: " << int(test[12]) << endl;
+    cout << " 22: " << int(test[22]) << endl;
+    cout << " 10: " << int(test[10]) << endl;
+    cout << " 20: " << int(test[20]) << endl;
+    cout << " 11: " << int(test[11]) << endl;
+    cout << " 21: " << int(test[21]) << endl;
+    cout << " 42: " << int(test[42]) << endl;
 
-  cout << "Setting 20 to class 2...\n";
-  test.set(20,2);
-  print(test);
+    cout << "Setting 20 to class 2...\n";
+    test.set(20,2);
+    print(test);
   
-  cout << "Setting 10 to class 1...\n";
-  test.set(10,1);
-  print(test);
+    cout << "Setting 10 to class 1...\n";
+    test.set(10,1);
+    print(test);
   
-  cout << "Setting 11 to class 1...\n";
-  test.set(11,1);
-  print(test);
+    cout << "Setting 11 to class 1...\n";
+    test.set(11,1);
+    print(test);
   
-  cout << "Setting 12 to class 1...\n";
-  test.set(12,1);
-  print(test);
+    cout << "Setting 12 to class 1...\n";
+    test.set(12,1);
+    print(test);
   
-  cout << "Setting 21 to class 2...\n";
-  test.set(21,2);
-  print(test);
+    cout << "Setting 21 to class 2...\n";
+    test.set(21,2);
+    print(test);
   
-  cout << "Setting 22 to class 2...\n";
-  test.set(22,2);
-  print(test);
+    cout << "Setting 22 to class 2...\n";
+    test.set(22,2);
+    print(test);
   
-  cout << "Testing some map values:\n";
-  cout << " 12: " << int(test[12]) << endl;
-  cout << " 22: " << int(test[22]) << endl;
-  cout << " 10: " << int(test[10]) << endl;
-  cout << " 20: " << int(test[20]) << endl;
-  cout << " 11: " << int(test[11]) << endl;
-  cout << " 21: " << int(test[21]) << endl;
-  cout << " 42: " << int(test[42]) << endl;
+    cout << "Testing some map values:\n";
+    cout << " 12: " << int(test[12]) << endl;
+    cout << " 22: " << int(test[22]) << endl;
+    cout << " 10: " << int(test[10]) << endl;
+    cout << " 20: " << int(test[20]) << endl;
+    cout << " 11: " << int(test[11]) << endl;
+    cout << " 21: " << int(test[21]) << endl;
+    cout << " 42: " << int(test[42]) << endl;
+  }
 
+  {
+    cout << "Testing the IterableBoolMap...\n";
+
+    BaseMap base(344);
+    TestBoolMap test(base);
+
+
+    print(test,2);
+
+    cout << "Inserting 12 to class true...\n";
+    test.insert(12,true);
+    print(test,2);
+
+
+    cout << "Inserting 22 to class true...\n";
+    test.insert(22,true);
+    print(test,2);
+
+    cout << "Testing some map values:\n";
+    cout << " 12: " << test[12] << endl;
+
+    cout << "Inserting 10 to class false...\n";
+    test.insert(10,false);
+    print(test,2);
+
+    cout << "Testing some map values:\n";
+    cout << " 12: " << test[12] << endl;
+
+    cout << "Inserting 11 to class false...\n";
+    test.insert(11,false);
+    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 << " 11: " << test[11] << endl;
+    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);
+    print(test,2);
+  
+    cout << "Setting 10 to class 1...\n";
+    test.set(10,1);
+    print(test,2);
+  
+    cout << "Setting 11 to class 1...\n";
+    test.set(11,1);
+    print(test,2);
+  
+    cout << "Setting 12 to class 1...\n";
+    test.set(12,1);
+    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);
+    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;
+
+  }
 }