diff --git a/apps/probability/law/binomial_law.cpp b/apps/probability/law/binomial_law.cpp index 82eeef682..dc7108c0c 100644 --- a/apps/probability/law/binomial_law.cpp +++ b/apps/probability/law/binomial_law.cpp @@ -37,10 +37,6 @@ float BinomialLaw::xMax() { return max + k_displayRightMarginRatio*(max - min); } -float BinomialLaw::yMin() { - return -k_displayBottomMarginRatio*yMax(); -} - float BinomialLaw::yMax() { int maxAbscissa = m_parameter2 < 1.0f ? (m_parameter1+1)*m_parameter2 : m_parameter1; float result = evaluateAtAbscissa(maxAbscissa); diff --git a/apps/probability/law/binomial_law.h b/apps/probability/law/binomial_law.h index ccd90e701..a92a1882a 100644 --- a/apps/probability/law/binomial_law.h +++ b/apps/probability/law/binomial_law.h @@ -12,7 +12,6 @@ public: Type type() const override { return Type::Binomial; } bool isContinuous() const override { return false; } float xMin() override; - float yMin() override; float xMax() override; float yMax() override; I18n::Message parameterNameAtIndex(int index) override; diff --git a/apps/probability/law/exponential_law.cpp b/apps/probability/law/exponential_law.cpp index 152c6554f..43da100f3 100644 --- a/apps/probability/law/exponential_law.cpp +++ b/apps/probability/law/exponential_law.cpp @@ -8,10 +8,6 @@ float ExponentialLaw::xMin() { return - k_displayLeftMarginRatio * xMax(); } -float ExponentialLaw::yMin() { - return -k_displayBottomMarginRatio * yMax(); -} - float ExponentialLaw::xMax() { assert(m_parameter1 != 0.0f); float result = 5.0f/m_parameter1; diff --git a/apps/probability/law/exponential_law.h b/apps/probability/law/exponential_law.h index 688070a71..0b9443d03 100644 --- a/apps/probability/law/exponential_law.h +++ b/apps/probability/law/exponential_law.h @@ -13,7 +13,6 @@ public: Type type() const override { return Type::Exponential; } bool isContinuous() const override { return true; } float xMin() override; - float yMin() override; float xMax() override; float yMax() override; I18n::Message parameterNameAtIndex(int index) override { diff --git a/apps/probability/law/law.cpp b/apps/probability/law/law.cpp index 241e2ae62..73404865b 100644 --- a/apps/probability/law/law.cpp +++ b/apps/probability/law/law.cpp @@ -130,4 +130,8 @@ double Law::evaluateAtDiscreteAbscissa(int k) const { return 0.0; } +float Law::yMin() { + return -k_displayBottomMarginRatio * yMax(); +} + } diff --git a/apps/probability/law/law.h b/apps/probability/law/law.h index 6ebd6f6f3..fefc8d23d 100644 --- a/apps/probability/law/law.h +++ b/apps/probability/law/law.h @@ -41,9 +41,11 @@ protected: static_assert(Constant::LargeNumberOfSignificantDigits == 7, "k_maxProbability is ill-defined compared to LargeNumberOfSignificantDigits"); constexpr static double k_maxProbability = 0.9999995; constexpr static float k_displayTopMarginRatio = 0.05f; - constexpr static float k_displayBottomMarginRatio = 0.2f; constexpr static float k_displayLeftMarginRatio = 0.05f; constexpr static float k_displayRightMarginRatio = 0.05f; +private: + constexpr static float k_displayBottomMarginRatio = 0.2f; + float yMin() override; }; } diff --git a/apps/probability/law/normal_law.cpp b/apps/probability/law/normal_law.cpp index 4e8a51d03..c02cbbcaf 100644 --- a/apps/probability/law/normal_law.cpp +++ b/apps/probability/law/normal_law.cpp @@ -7,10 +7,6 @@ namespace Probability { -float NormalLaw::yMin() { - return - k_displayBottomMarginRatio * yMax(); -} - float NormalLaw::yMax() { float maxAbscissa = m_parameter1; float result = evaluateAtAbscissa(maxAbscissa); diff --git a/apps/probability/law/normal_law.h b/apps/probability/law/normal_law.h index 77ebd4705..e75cae0db 100644 --- a/apps/probability/law/normal_law.h +++ b/apps/probability/law/normal_law.h @@ -12,7 +12,6 @@ public: Type type() const override { return Type::Normal; } bool isContinuous() const override { return true; } float xMin() override { return xExtremum(true); } - float yMin() override; float xMax() override { return xExtremum(false); } float yMax() override; I18n::Message parameterNameAtIndex(int index) override; diff --git a/apps/probability/law/poisson_law.cpp b/apps/probability/law/poisson_law.cpp index 02e801f76..30394ddbc 100644 --- a/apps/probability/law/poisson_law.cpp +++ b/apps/probability/law/poisson_law.cpp @@ -9,10 +9,6 @@ float PoissonLaw::xMin() { return -k_displayLeftMarginRatio * xMax(); } -float PoissonLaw::yMin() { - return - k_displayBottomMarginRatio * yMax(); -} - float PoissonLaw::xMax() { assert(m_parameter1 != 0); return (m_parameter1 + 5.0f * std::sqrt(m_parameter1)) * (1.0f + k_displayRightMarginRatio); diff --git a/apps/probability/law/poisson_law.h b/apps/probability/law/poisson_law.h index 6b8708c46..da995a8f7 100644 --- a/apps/probability/law/poisson_law.h +++ b/apps/probability/law/poisson_law.h @@ -12,7 +12,6 @@ public: Type type() const override { return Type::Poisson; } bool isContinuous() const override { return false; } float xMin() override; - float yMin() override; float xMax() override; float yMax() override; I18n::Message parameterNameAtIndex(int index) override { diff --git a/apps/probability/law/uniform_law.cpp b/apps/probability/law/uniform_law.cpp index 8a0e072c1..8f271fbc6 100644 --- a/apps/probability/law/uniform_law.cpp +++ b/apps/probability/law/uniform_law.cpp @@ -32,10 +32,6 @@ float UniformLaw::xMin() { return m_parameter1 - 0.6f * (m_parameter2 - m_parameter1); } -float UniformLaw::yMin() { - return -k_displayBottomMarginRatio * yMax(); -} - float UniformLaw::xMax() { if (m_parameter2 - m_parameter1 < FLT_EPSILON) { return m_parameter1 + 1.0f; diff --git a/apps/probability/law/uniform_law.h b/apps/probability/law/uniform_law.h index fc10786e4..a2ab7160c 100644 --- a/apps/probability/law/uniform_law.h +++ b/apps/probability/law/uniform_law.h @@ -12,7 +12,6 @@ public: Type type() const override { return Type::Uniform; } bool isContinuous() const override { return true; } float xMin() override; - float yMin() override; float xMax() override; float yMax() override; I18n::Message parameterNameAtIndex(int index) override;