get hll ready for merging

This commit is contained in:
Bernhard Amann 2013-07-30 16:47:26 -07:00
parent 5b9d80e50d
commit 18c10f3cb5
9 changed files with 240 additions and 218 deletions

View file

@ -15,22 +15,6 @@ namespace probabilistic {
class CardinalityCounter;
}
class CardinalityVal: public OpaqueVal {
public:
CardinalityVal();
~CardinalityVal();
bool Init(probabilistic::CardinalityCounter*);
bool IsValid() const { return valid; };
probabilistic::CardinalityCounter* Get() { return c; };
private:
bool valid;
probabilistic::CardinalityCounter* c;
DECLARE_SERIAL(CardinalityVal);
};
class HashVal : public OpaqueVal {
public:
virtual bool IsValid() const;
@ -164,4 +148,26 @@ private:
probabilistic::BloomFilter* bloom_filter;
};
class CardinalityVal: public OpaqueVal {
public:
explicit CardinalityVal(probabilistic::CardinalityCounter*);
virtual ~CardinalityVal();
BroType* Type() const;
bool Typify(BroType* type);
probabilistic::CardinalityCounter* Get() { return c; };
protected:
CardinalityVal();
private:
BroType* type;
CompositeHash* hash;
probabilistic::CardinalityCounter* c;
DECLARE_SERIAL(CardinalityVal);
};
#endif