Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-13 12:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

purely aesthetical - make whitespacing fit bro coding style.

Browse source 
Second step will be to change the bifs a bit...
This commit is contained in:
Bernhard Amann 2013-04-02 11:24:03 +02:00
parent b5cdf13469
commit fd51db1c89
2 changed files with 128 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

242
src/HyperLogLog.cc
View file

@ -1,3 +1,5 @@
// See the file "COPYING" in the main distribution directory for copyright.
#include <math.h> #include <math.h>
#include <stdint.h> #include <stdint.h>
#include "HyperLogLog.h" #include "HyperLogLog.h"
@ -5,129 +7,137 @@
using namespace std; using namespace std;
int CardinalityCounter::optimalB(double error){ int CardinalityCounter::optimalB(double error)
double initial_estimate = 2*(log(1.04)-log(error))/log(2); {
int answer = (int) floor(initial_estimate); double initial_estimate = 2*(log(1.04)-log(error))/log(2);
double k; int answer = (int) floor(initial_estimate);
double k;
do{ do
answer++; {
k = pow(2, (answer - initial_estimate)/2); answer++;
}while(erf(k/sqrt(2)) < conf); k = pow(2, (answer - initial_estimate)/2);
}
while (erf(k/sqrt(2)) < conf);
return answer; return answer;
} }
CardinalityCounter :: CardinalityCounter(uint64_t size){ CardinalityCounter::CardinalityCounter(uint64_t size)
m = size; {
buckets = new uint8_t[m]; m = size;
buckets = new uint8_t[m];
if(m == 16) if(m == 16)
alpha_m = 0.673; alpha_m = 0.673;
else if(m == 32) else if(m == 32)
alpha_m = 0.697; alpha_m = 0.697;
else if(m == 64) else if(m == 64)
alpha_m = 0.709; alpha_m = 0.709;
else else
alpha_m = 0.7213/(1+1.079/m); alpha_m = 0.7213/(1+1.079/m);
for(uint64_t i = 0; i < m; i++){ for (uint64_t i = 0; i < m; i++)
buckets[i] = 0; buckets[i] = 0;
}
V = m;
}
CardinalityCounter :: CardinalityCounter(double error_margin){
int b = optimalB(error_margin);
m = (uint64_t) pow(2, b);
buckets = new uint8_t[m];
if(m == 16)
alpha_m = 0.673;
else if(m == 32)
alpha_m = 0.697;
else if(m == 64)
alpha_m = 0.709;
else
alpha_m = 0.7213/(1+1.079/m);
for(uint64_t i = 0; i < m; i++){
buckets[i] = 0;
}
V = m;
}
CardinalityCounter :: ~CardinalityCounter(){
delete [] buckets;
delete &m;
delete &V;
delete &alpha_m;
}
uint8_t CardinalityCounter :: rank(uint64_t hash_modified){
uint8_t answer = 0;
hash_modified = (uint64_t)(hash_modified/m);
hash_modified *= 2;
do{
hash_modified = (uint64_t) (hash_modified/2);
answer++;
}while(hash_modified%2 == 0);
return answer;
}
void CardinalityCounter::addElement(uint64_t hash){
uint64_t index = hash % m;
hash = hash-index;
if(buckets[index] == 0)
V--;
uint8_t temp = rank(hash);
if(temp > buckets[index]){
buckets[index] = temp;
}
}
double CardinalityCounter::size(){ V = m;
double answer = 0; }
for(int i = 0; i < m; i++){
answer += pow(2, -(int)buckets[i]); CardinalityCounter :: CardinalityCounter(double error_margin)
} {
answer = 1/answer; int b = optimalB(error_margin);
answer = alpha_m*m*m*answer; m = (uint64_t) pow(2, b);
buckets = new uint8_t[m];
if(answer <= 5*(double)(m/2)){ if(m == 16)
return m*log((double) m/V); alpha_m = 0.673;
} else if(m == 32)
else if(answer <= pow(2,64)/30){ alpha_m = 0.697;
return answer; else if(m == 64)
} alpha_m = 0.709;
else{ else
return -pow(2,64)*log(1-answer/pow(2,64)); alpha_m = 0.7213/(1+1.079/m);
}
}
void CardinalityCounter::merge(CardinalityCounter* c){ for (uint64_t i = 0; i < m; i++)
uint8_t* temp = (*c).getBuckets(); buckets[i] = 0;
V = 0;
for(int i = 0; i < m; i++){
if(temp[i] > buckets[i]){
buckets[i] = temp[i];
}
if(buckets[i] == 0){
V += 1;
}
}
}
uint8_t* CardinalityCounter::getBuckets(){ V = m;
return buckets; }
}
uint64_t CardinalityCounter::getM(){ CardinalityCounter::~CardinalityCounter()
return m; {
} delete [] buckets;
delete &m;
delete &V;
delete &alpha_m;
}
uint8_t CardinalityCounter::rank(uint64_t hash_modified)
{
uint8_t answer = 0;
hash_modified = (uint64_t)(hash_modified/m);
hash_modified *= 2;
do
{
hash_modified = (uint64_t) (hash_modified/2);
answer++;
}
while (hash_modified%2 == 0);
return answer;
}
void CardinalityCounter::addElement(uint64_t hash)
{
uint64_t index = hash % m;
hash = hash-index;
if(buckets[index] == 0)
V--;
uint8_t temp = rank(hash);
if (temp > buckets[index])
buckets[index] = temp;
}
double CardinalityCounter::size()
{
double answer = 0;
for (int i = 0; i < m; i++)
answer += pow(2, -(int)buckets[i]);
answer = 1/answer;
answer = alpha_m*m*m*answer;
if (answer <= 5*(double)(m/2))
return m*log((double) m/V);
else if(answer <= pow(2,64)/30)
return answer;
else
return -pow(2,64)*log(1-answer/pow(2,64));
}
void CardinalityCounter::merge(CardinalityCounter* c)
{
uint8_t* temp = (*c).getBuckets();
V = 0;
for (int i = 0; i < m; i++)
{
if (temp[i] > buckets[i])
buckets[i] = temp[i];
if (buckets[i] == 0)
V += 1;
}
}
uint8_t* CardinalityCounter::getBuckets()
{
return buckets;
}
uint64_t CardinalityCounter::getM()
{
return m;
}

2
src/HyperLogLog.h
View file

@ -1,3 +1,5 @@
// See the file "COPYING" in the main distribution directory for copyright.
#include <stdint.h> #include <stdint.h>
/* /*