From a5572dd66f10ca653855483e0941da327b8422e4 Mon Sep 17 00:00:00 2001
From: Matthias Vallentin <vallentin@icir.org>
Date: Tue, 4 Jun 2013 14:31:39 -0700
Subject: [PATCH] Write CounterVector implementation scaffold.

---
 src/BloomFilter.cc | 36 ++++++++++++++++++++++++++++++++++++
 src/BloomFilter.h  | 10 +++++++---
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/BloomFilter.cc b/src/BloomFilter.cc
index 4787bef0f0..78048ee588 100644
--- a/src/BloomFilter.cc
+++ b/src/BloomFilter.cc
@@ -10,6 +10,42 @@ T round(double x) { return (x > 0.0) ? (x + 0.5) : (x - 0.5); }
 } // namespace <anonymous>
 
 
+CounterVector::CounterVector(size_t width, size_t cells)
+  : bits_(new BitVector(width * cells)), width_(width)
+  {
+  }
+
+CounterVector::~CounterVector()
+  {
+  delete bits_;
+  }
+
+bool CounterVector::Increment(size_type cell, count_type value)
+  {
+  // TODO
+  assert(! "not yet implemented");
+  return false;
+  }
+
+bool CounterVector::Decrement(size_type cell, count_type value)
+  {
+  // TODO
+  assert(! "not yet implemented");
+  return false;
+  }
+
+CounterVector::count_type CounterVector::Count(size_type cell) const
+  {
+  // TODO
+  assert(! "not yet implemented");
+  return 0;
+  }
+
+CounterVector::size_type CounterVector::Size() const
+  {
+  return bits_->Blocks() / width_;
+  }
+
 IMPLEMENT_SERIAL(CounterVector, SER_COUNTERVECTOR)
 
 bool CounterVector::DoSerialize(SerialInfo* info) const
diff --git a/src/BloomFilter.h b/src/BloomFilter.h
index 82948f30ec..b4f82efee9 100644
--- a/src/BloomFilter.h
+++ b/src/BloomFilter.h
@@ -9,7 +9,7 @@
 /**
  * A vector of counters, each of which have a fixed number of bits.
  */
-class CounterVector : SerialObj {
+class CounterVector : public SerialObj {
 public:
   typedef size_t size_type;
   typedef uint64 count_type;
@@ -18,8 +18,12 @@ public:
    * Constructs a counter vector having cells of a given width.
    *
    * @param width The number of bits that each cell occupies.
+   *
+   * @param cells The number of cells in the bitvector.
    */
-  explicit CounterVector(unsigned width);
+  CounterVector(size_t width, size_t cells = 1024);
+
+  ~CounterVector();
 
   /**
    * Increments a given cell.
@@ -68,7 +72,7 @@ protected:
   CounterVector() { }
 
 private:
-  BitVector bits_;
+  BitVector* bits_;
   unsigned width_;
 };