UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-24 16:20:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/probability] Fix bug in authorized parameters

Browse Source 
Change-Id: I53cccb0995af7b4a6b066218185f35e96d4ae835
This commit is contained in:
Émilie Feral
2017-08-16 11:06:16 +02:00
parent 43401829cb
commit 48c0cf2d8d
11 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/probability/law/binomial_law.cpp
View File

@@ -68,14 +68,14 @@ float BinomialLaw::yMax() {
}
bool BinomialLaw::authorizedValueAtIndex(double x, int index) const {
bool BinomialLaw::authorizedValueAtIndex(float x, int index) const {
if (index == 0) {
if (x != (int)x || x < 0.0 || x > 999.0) {
if (x != (int)x || x < 0.0f || x > 999.0f) {
return false;
}
return true;
}
if (x < 0.0 || x > 1.0) {
if (x < 0.0f || x > 1.0f) {
return false;
}
return true;

2
apps/probability/law/binomial_law.h
View File

@@ -20,7 +20,7 @@ public:
float evaluateAtAbscissa(float x) const override {
return templatedEvaluateAtAbscissa(x);
}
bool authorizedValueAtIndex(double x, int index) const override;
bool authorizedValueAtIndex(float x, int index) const override;
double cumulativeDistributiveInverseForProbability(double * probability) override;
double rightIntegralInverseForProbability(double * probability) override;
protected:

4
apps/probability/law/exponential_law.cpp
View File

@@ -69,8 +69,8 @@ float ExponentialLaw::evaluateAtAbscissa(float x) const {
return m_parameter1*std::exp(-m_parameter1*x);
}
bool ExponentialLaw::authorizedValueAtIndex(double x, int index) const {
if (x <= 0.0 || x > 7500.0) {
bool ExponentialLaw::authorizedValueAtIndex(float x, int index) const {
if (x <= 0.0f || x > 7500.0f) {
return false;
}
return true;

2
apps/probability/law/exponential_law.h
View File

@@ -18,7 +18,7 @@ public:
I18n::Message parameterNameAtIndex(int index) override;
I18n::Message parameterDefinitionAtIndex(int index) override;
float evaluateAtAbscissa(float x) const override;
bool authorizedValueAtIndex(double x, int index) const override;
bool authorizedValueAtIndex(float x, int index) const override;
double cumulativeDistributiveFunctionAtAbscissa(double x) const override;
double cumulativeDistributiveInverseForProbability(double * probability) override;
};

2
apps/probability/law/law.h
View File

@@ -29,7 +29,7 @@ public:
virtual I18n::Message parameterDefinitionAtIndex(int index) = 0;
virtual void setParameterAtIndex(float f, int index) = 0;
virtual float evaluateAtAbscissa(float x) const = 0;
virtual bool authorizedValueAtIndex(double x, int index) const = 0;
virtual bool authorizedValueAtIndex(float x, int index) const = 0;
virtual double cumulativeDistributiveFunctionAtAbscissa(double x) const;
double rightIntegralFromAbscissa(double x) const;
double finiteIntegralBetweenAbscissas(double a, double b) const;

2
apps/probability/law/normal_law.cpp
View File

@@ -75,7 +75,7 @@ float NormalLaw::evaluateAtAbscissa(float x) const {
return (1.0f/(std::fabs(m_parameter2)*std::sqrt(2.0f*M_PI)))*std::exp(-0.5f*std::pow((x-m_parameter1)/m_parameter2,2));
}
bool NormalLaw::authorizedValueAtIndex(double x, int index) const {
bool NormalLaw::authorizedValueAtIndex(float x, int index) const {
if (index == 0) {
return true;
}

2
apps/probability/law/normal_law.h
View File

@@ -18,7 +18,7 @@ public:
I18n::Message parameterNameAtIndex(int index) override;
I18n::Message parameterDefinitionAtIndex(int index) override;
float evaluateAtAbscissa(float x) const override;
bool authorizedValueAtIndex(double x, int index) const override;
bool authorizedValueAtIndex(float x, int index) const override;
void setParameterAtIndex(float f, int index) override;
double cumulativeDistributiveFunctionAtAbscissa(double x) const override;
double cumulativeDistributiveInverseForProbability(double * probability) override;

4
apps/probability/law/poisson_law.cpp
View File

@@ -63,8 +63,8 @@ float PoissonLaw::evaluateAtAbscissa(float x) const {
return std::exp(lResult);
}
bool PoissonLaw::authorizedValueAtIndex(double x, int index) const {
if (x <= 0.0 || x > 999.0) {
bool PoissonLaw::authorizedValueAtIndex(float x, int index) const {
if (x <= 0.0f || x > 999.0f) {
return false;
}
return true;

2
apps/probability/law/poisson_law.h
View File

@@ -18,7 +18,7 @@ public:
I18n::Message parameterNameAtIndex(int index) override;
I18n::Message parameterDefinitionAtIndex(int index) override;
float evaluateAtAbscissa(float x) const override;
bool authorizedValueAtIndex(double x, int index) const override;
bool authorizedValueAtIndex(float x, int index) const override;
};
}

2
apps/probability/law/uniform_law.cpp
View File

@@ -78,7 +78,7 @@ float UniformLaw::evaluateAtAbscissa(float t) const {
return 0.0f;
}
bool UniformLaw::authorizedValueAtIndex(double x, int index) const {
bool UniformLaw::authorizedValueAtIndex(float x, int index) const {
if (index == 0) {
return true;
}

2
apps/probability/law/uniform_law.h
View File

@@ -18,7 +18,7 @@ public:
I18n::Message parameterNameAtIndex(int index) override;
I18n::Message parameterDefinitionAtIndex(int index) override;
float evaluateAtAbscissa(float x) const override;
bool authorizedValueAtIndex(double x, int index) const override;
bool authorizedValueAtIndex(float x, int index) const override;
void setParameterAtIndex(float f, int index) override;
double cumulativeDistributiveFunctionAtAbscissa(double x) const override;
double cumulativeDistributiveInverseForProbability(double * probability) override;