From 48c0cf2d8d6853afb1b309ea0b2bed2c1abff61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Wed, 16 Aug 2017 11:06:16 +0200 Subject: [PATCH] [apps/probability] Fix bug in authorized parameters Change-Id: I53cccb0995af7b4a6b066218185f35e96d4ae835 --- apps/probability/law/binomial_law.cpp | 6 +++--- apps/probability/law/binomial_law.h | 2 +- apps/probability/law/exponential_law.cpp | 4 ++-- apps/probability/law/exponential_law.h | 2 +- apps/probability/law/law.h | 2 +- apps/probability/law/normal_law.cpp | 2 +- apps/probability/law/normal_law.h | 2 +- apps/probability/law/poisson_law.cpp | 4 ++-- apps/probability/law/poisson_law.h | 2 +- apps/probability/law/uniform_law.cpp | 2 +- apps/probability/law/uniform_law.h | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/probability/law/binomial_law.cpp b/apps/probability/law/binomial_law.cpp index 8a65cfb93..24db54db3 100644 --- a/apps/probability/law/binomial_law.cpp +++ b/apps/probability/law/binomial_law.cpp @@ -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; diff --git a/apps/probability/law/binomial_law.h b/apps/probability/law/binomial_law.h index 0e8e3347a..2e81fa6cd 100644 --- a/apps/probability/law/binomial_law.h +++ b/apps/probability/law/binomial_law.h @@ -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: diff --git a/apps/probability/law/exponential_law.cpp b/apps/probability/law/exponential_law.cpp index 3c5b704ff..668d3eef7 100644 --- a/apps/probability/law/exponential_law.cpp +++ b/apps/probability/law/exponential_law.cpp @@ -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; diff --git a/apps/probability/law/exponential_law.h b/apps/probability/law/exponential_law.h index b8c23e79e..e9a6e206a 100644 --- a/apps/probability/law/exponential_law.h +++ b/apps/probability/law/exponential_law.h @@ -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; }; diff --git a/apps/probability/law/law.h b/apps/probability/law/law.h index 9a515a619..211d8d30d 100644 --- a/apps/probability/law/law.h +++ b/apps/probability/law/law.h @@ -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; diff --git a/apps/probability/law/normal_law.cpp b/apps/probability/law/normal_law.cpp index da41c2c69..f39ac9b91 100644 --- a/apps/probability/law/normal_law.cpp +++ b/apps/probability/law/normal_law.cpp @@ -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; } diff --git a/apps/probability/law/normal_law.h b/apps/probability/law/normal_law.h index 9887e7f94..662700349 100644 --- a/apps/probability/law/normal_law.h +++ b/apps/probability/law/normal_law.h @@ -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; diff --git a/apps/probability/law/poisson_law.cpp b/apps/probability/law/poisson_law.cpp index 396a39075..252f842de 100644 --- a/apps/probability/law/poisson_law.cpp +++ b/apps/probability/law/poisson_law.cpp @@ -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; diff --git a/apps/probability/law/poisson_law.h b/apps/probability/law/poisson_law.h index c9007dde6..607f3387e 100644 --- a/apps/probability/law/poisson_law.h +++ b/apps/probability/law/poisson_law.h @@ -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; }; } diff --git a/apps/probability/law/uniform_law.cpp b/apps/probability/law/uniform_law.cpp index 5655c5a1a..419ede400 100644 --- a/apps/probability/law/uniform_law.cpp +++ b/apps/probability/law/uniform_law.cpp @@ -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; } diff --git a/apps/probability/law/uniform_law.h b/apps/probability/law/uniform_law.h index 58a2eb328..33fe9c003 100644 --- a/apps/probability/law/uniform_law.h +++ b/apps/probability/law/uniform_law.h @@ -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;