* Iterators.

This commit is contained in:
Eelco Dolstra 2006-05-04 09:22:29 +00:00
parent 6980544467
commit 9840368cad

View file

@ -9,7 +9,7 @@ using namespace std;
class ATermMap class ATermMap
{ {
private: public:
struct KeyValue struct KeyValue
{ {
@ -17,6 +17,8 @@ private:
ATerm value; ATerm value;
}; };
private:
/* Hash table for the map. We use open addressing, i.e., all /* Hash table for the map. We use open addressing, i.e., all
key/value pairs are stored directly in the table, and there are key/value pairs are stored directly in the table, and there are
no pointers. Collisions are resolved through probing. */ no pointers. Collisions are resolved through probing. */
@ -33,6 +35,7 @@ private:
unsigned int maxCount; unsigned int maxCount;
public: public:
/* Create a map. `expectedCount' is the number of elements the /* Create a map. `expectedCount' is the number of elements the
map is expected to hold. */ map is expected to hold. */
ATermMap(unsigned int expectedCount); ATermMap(unsigned int expectedCount);
@ -51,7 +54,50 @@ public:
unsigned int size(); unsigned int size();
struct const_iterator
{
const ATermMap & map;
unsigned int pos;
const_iterator(const ATermMap & map, int pos) : map(map)
{
this->pos = pos;
}
bool operator !=(const const_iterator & i)
{
return pos != i.pos;
}
void operator ++()
{
if (pos == map.capacity) return;
do { ++pos;
} while (pos < map.capacity && map.hashTable[pos].value == 0);
}
const KeyValue & operator *()
{
assert(pos < map.capacity);
return map.hashTable[pos];
}
const KeyValue * operator ->()
{
assert(pos < map.capacity);
return &map.hashTable[pos];
}
};
const_iterator begin() const
{
unsigned int i = 0;
while (i < capacity && hashTable[i].value == 0) ++i;
return const_iterator(*this, i);
}
const_iterator end() const
{
return const_iterator(*this, capacity);
}
private: private:
void init(unsigned int expectedCount); void init(unsigned int expectedCount);
void free(); void free();
@ -315,22 +361,43 @@ int main(int argc, char * * argv)
map.set(keys[i], values[i]); map.set(keys[i], values[i]);
//cerr << "INSERT: " << keys[i] << " " << values[i] << endl; //cerr << "INSERT: " << keys[i] << " " << values[i] << endl;
} }
unsigned int size = map.size(); unsigned int size = map.size();
assert(size <= n); assert(size <= n);
values[n - 1] = 0; values[n - 1] = 0;
map.remove(keys[n - 1]); map.remove(keys[n - 1]);
assert(map.size() == size - 1); assert(map.size() == size - 1);
unsigned int checksum;
unsigned int count = 0;
for (ATermMap::const_iterator i = map.begin(); i != map.end(); ++i, ++count) {
assert(i->key);
assert(i->value);
checksum += (unsigned int) (*i).key;
checksum += (unsigned int) (*i).value;
// cout << (*i).key << " " << (*i).value << endl;
}
assert(count == size - 1);
for (unsigned int i = 0; i < n; ++i) { for (unsigned int i = 0; i < n; ++i) {
if (map.get(keys[i]) != values[i]) {
for (unsigned int j = i + 1; j < n; ++j) for (unsigned int j = i + 1; j < n; ++j)
if (keys[i] == keys[j]) goto x; if (keys[i] == keys[j]) goto x;
if (map.get(keys[i]) != values[i]) {
cerr << "MISMATCH: " << keys[i] << " " << values[i] << " " << map.get(keys[i]) << " " << i << endl; cerr << "MISMATCH: " << keys[i] << " " << values[i] << " " << map.get(keys[i]) << " " << i << endl;
abort(); abort();
}
if (values[i] != 0) {
checksum -= (unsigned int) keys[i];
checksum -= (unsigned int) values[i];
}
x: ; x: ;
} }
}
assert(checksum == 0);
for (unsigned int i = 0; i < 100; ++i) for (unsigned int i = 0; i < 100; ++i)
map.get(someTerm()); map.get(someTerm());
} }
cout << "RESIZES: " << nrResizes << " " cout << "RESIZES: " << nrResizes << " "