removed some hacks

This commit is contained in:
toni
2017-04-19 14:59:04 +02:00
parent 99f282180e
commit 8e295e25af
3 changed files with 4 additions and 9 deletions

View File

@@ -93,11 +93,6 @@ namespace Distribution {
const Eigen::MatrixXd centered = data.rowwise() - mean.transpose();
Eigen::MatrixXd cov = (centered.adjoint() * centered) / double(data.rows() - 1);
//this is a hack
if(cov(2,2) < 0.1){
cov(2,2) = 0.1;
}
return NormalDistributionN(mean, cov);
}

View File

@@ -56,8 +56,8 @@ namespace Divergence {
// calc PQratio
if(Q[i] == 0.0){
//Assert::doThrow("Division by zero is not allowed ;).");
PQratio = P[i] / 0.00001;
Assert::doThrow("Division by zero is not allowed ;).");
//PQratio = P[i] / 0.00001;
} else {
PQratio = P[i] / Q[i];
}

View File

@@ -68,8 +68,8 @@ private:
const float stdDev = std::sqrt(avg2 - avg*avg);
// avg rssi score
const float minRSSI = -90;
const float maxRSSI = -65;
const float minRSSI = -90;
const float maxRSSI = -75;
float score1 = (avg-minRSSI) / (maxRSSI-minRSSI); // min = 0; max = 1
if (score1 > 1) {score1 = 1;}
if (score1 < 0) {score1 = 0;}