OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3302 Weighted Geometric Mean Calculator. Improved algorithm

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-09-03 09:56:06 +02:00
parent 26b3065974
commit 2c5c007048
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Application/Tools/RiaWeightedGeometricMeanCalculator.cpp
View File

@@ -26,7 +26,7 @@
///
//--------------------------------------------------------------------------------------------------
RiaWeightedGeometricMeanCalculator::RiaWeightedGeometricMeanCalculator()
: m_aggregatedWeightedValue(1.0)
: m_aggregatedWeightedValue(0.0)
, m_aggregatedWeight(0.0)
{
}
@@ -39,7 +39,7 @@ void RiaWeightedGeometricMeanCalculator::addValueAndWeight(double value, double
CVF_ASSERT(weight >= 0.0);
// This can be a very big number, consider other algorithms if that becomes a problem
m_aggregatedWeightedValue *= std::pow(value, weight);
m_aggregatedWeightedValue += (std::log(value) * weight);
m_aggregatedWeight += weight;
}
@@ -50,7 +50,7 @@ double RiaWeightedGeometricMeanCalculator::weightedMean() const
{
if (m_aggregatedWeight > 1e-7)
{
return std::pow(m_aggregatedWeightedValue, 1 / m_aggregatedWeight);
return std::exp(m_aggregatedWeightedValue / m_aggregatedWeight);
}
return 0.0;