diff --git a/apps/probability/calculation/left_integral_calculation.cpp b/apps/probability/calculation/left_integral_calculation.cpp index 45564cebe..2b245e747 100644 --- a/apps/probability/calculation/left_integral_calculation.cpp +++ b/apps/probability/calculation/left_integral_calculation.cpp @@ -6,7 +6,7 @@ namespace Probability { LeftIntegralCalculation::LeftIntegralCalculation() : Calculation(), - m_lowerBound(0.0f), + m_upperBound(0.0f), m_result(0.0f) { compute(0); @@ -27,7 +27,7 @@ const char * LeftIntegralCalculation::legendForParameterAtIndex(int index) { void LeftIntegralCalculation::setParameterAtIndex(float f, int index) { assert(index >= 0 && index < 2); if (index == 0) { - m_lowerBound = f; + m_upperBound = f; } if (index == 1) { m_result = f; @@ -39,13 +39,13 @@ void LeftIntegralCalculation::setParameterAtIndex(float f, int index) { float LeftIntegralCalculation::parameterAtIndex(int index) { assert(index >= 0 && index < 2); if (index == 0) { - return m_lowerBound; + return m_upperBound; } return m_result; } -float LeftIntegralCalculation::lowerBound() { - return m_lowerBound; +float LeftIntegralCalculation::upperBound() { + return m_upperBound; } void LeftIntegralCalculation::compute(int indexKnownElement) { @@ -53,9 +53,9 @@ void LeftIntegralCalculation::compute(int indexKnownElement) { return; } if (indexKnownElement == 0) { - m_result = m_law->cumulativeDistributiveFunctionAtAbscissa(m_lowerBound); + m_result = m_law->cumulativeDistributiveFunctionAtAbscissa(m_upperBound); } else { - m_lowerBound = m_law->cumulativeDistributiveInverseForProbability(&m_result); + m_upperBound = m_law->cumulativeDistributiveInverseForProbability(&m_result); } } diff --git a/apps/probability/calculation/left_integral_calculation.h b/apps/probability/calculation/left_integral_calculation.h index b4d512150..e4d401f6c 100644 --- a/apps/probability/calculation/left_integral_calculation.h +++ b/apps/probability/calculation/left_integral_calculation.h @@ -13,10 +13,10 @@ public: const char * legendForParameterAtIndex(int index) override; void setParameterAtIndex(float f, int index) override; float parameterAtIndex(int index) override; - float lowerBound() override; + float upperBound() override; private: void compute(int indexKnownElement) override; - float m_lowerBound; + float m_upperBound; float m_result; }; diff --git a/apps/probability/calculation/right_integral_calculation.cpp b/apps/probability/calculation/right_integral_calculation.cpp index dfb390f80..fbc5acb4f 100644 --- a/apps/probability/calculation/right_integral_calculation.cpp +++ b/apps/probability/calculation/right_integral_calculation.cpp @@ -6,7 +6,7 @@ namespace Probability { RightIntegralCalculation::RightIntegralCalculation() : Calculation(), - m_upperBound(0.0f), + m_lowerBound(0.0f), m_result(0.0f) { compute(0); @@ -27,7 +27,7 @@ const char * RightIntegralCalculation::legendForParameterAtIndex(int index) { void RightIntegralCalculation::setParameterAtIndex(float f, int index) { assert(index >= 0 && index < 2); if (index == 0) { - m_upperBound = f; + m_lowerBound = f; } if (index == 1) { m_result = f; @@ -39,13 +39,13 @@ void RightIntegralCalculation::setParameterAtIndex(float f, int index) { float RightIntegralCalculation::parameterAtIndex(int index) { assert(index >= 0 && index < 2); if (index == 0) { - return m_upperBound; + return m_lowerBound; } return m_result; } -float RightIntegralCalculation::upperBound() { - return m_upperBound; +float RightIntegralCalculation::lowerBound() { + return m_lowerBound; } void RightIntegralCalculation::compute(int indexKnownElement) { @@ -53,9 +53,9 @@ void RightIntegralCalculation::compute(int indexKnownElement) { return; } if (indexKnownElement == 0) { - m_result = m_law->rightIntegralFromAbscissa(m_upperBound); + m_result = m_law->rightIntegralFromAbscissa(m_lowerBound); } else { - m_upperBound = m_law->rightIntegralInverseForProbability(&m_result); + m_lowerBound = m_law->rightIntegralInverseForProbability(&m_result); } } diff --git a/apps/probability/calculation/right_integral_calculation.h b/apps/probability/calculation/right_integral_calculation.h index fdc6508f3..dfd2c83bb 100644 --- a/apps/probability/calculation/right_integral_calculation.h +++ b/apps/probability/calculation/right_integral_calculation.h @@ -13,10 +13,10 @@ public: const char * legendForParameterAtIndex(int index) override; void setParameterAtIndex(float f, int index) override; float parameterAtIndex(int index) override; - float upperBound() override; + float lowerBound() override; private: void compute(int indexKnownElement) override; - float m_upperBound; + float m_lowerBound; float m_result; };