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

Make mean calculators more consistent and add an harmonic mean calculator.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-09-14 09:12:05 +02:00
parent 6f42d6ae1f
commit 9953c56c35
12 changed files with 224 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/UnitTests/CMakeLists_files.cmake
View File

@@ -47,8 +47,9 @@ ${CMAKE_CURRENT_LIST_DIR}/RiaTimeHistoryCurveTools-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/SolveSpaceSolver-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaPolyArcLineSampler-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RifEclipseDataTableFormatter-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaWeightedAverage-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaWeightedMean-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaWeightedGeometricMeanCalculator-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaWeightedHarmonicMeanCalculator-Test.cpp
)
list(APPEND CODE_HEADER_FILES

76
ApplicationCode/UnitTests/RiaWeightedHarmonicMeanCalculator-Test.cpp Normal file
View File

@@ -0,0 +1,76 @@
#include "gtest/gtest.h"
#include "RiaWeightedHarmonicMeanCalculator.h"
#include <cmath>
#include <numeric>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RiaWeightedHarmonicMeanCalculator, BasicUsage)
{
{
RiaWeightedHarmonicMeanCalculator calc;
EXPECT_DOUBLE_EQ(0.0, calc.aggregatedWeight());
EXPECT_FALSE(calc.validAggregatedWeight());
}
{
RiaWeightedHarmonicMeanCalculator calc;
std::vector<double> values {1, 4, 4};
std::vector<double> weights {1, 1, 1};
for (size_t i = 0; i< values.size(); i++)
{
calc.addValueAndWeight(values[i], weights[i]);
}
double expectedValue = 2.0;
EXPECT_DOUBLE_EQ(3.0, calc.aggregatedWeight());
EXPECT_NEAR(expectedValue, calc.weightedMean(), 1e-10);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RiaWeightedHarmonicMeanCalculator, WeightedValues)
{
{
RiaWeightedHarmonicMeanCalculator calc;
std::vector<double> values{ 10, 5, 4, 3 };
std::vector<double> weights{ 10, 5, 4, 3 };
for (size_t i = 0; i < values.size(); i++)
{
calc.addValueAndWeight(values[i], weights[i]);
}
double sumWeights = std::accumulate(weights.begin(), weights.end(), 0.0);
EXPECT_DOUBLE_EQ(sumWeights, calc.aggregatedWeight());
EXPECT_NEAR(sumWeights, calc.weightedMean(), 1e-8);
}
{
RiaWeightedHarmonicMeanCalculator calc;
std::vector<double> values{ 2.0, 3.0, 1.0, 4.0 };
std::vector<double> weights{ 1.0, 2.0, 7.0, 3.0 };
for (size_t i = 0; i < values.size(); i++)
{
calc.addValueAndWeight(values[i], weights[i]);
}
double sumWeights = std::accumulate(weights.begin(), weights.end(), 0.0);
double aggregatedWeightAndValues = 1.0 / 2.0 + 2.0 / 3.0 + 7.0 / 1.0 + 3.0 / 4.0;
double expectedValue = sumWeights / aggregatedWeightAndValues;
EXPECT_DOUBLE_EQ(sumWeights, calc.aggregatedWeight());
EXPECT_NEAR(expectedValue, calc.weightedMean(), 1.0e-8);
}
}

10
ApplicationCode/UnitTests/RiaWeightedAverage-Test.cpp → ApplicationCode/UnitTests/RiaWeightedMean-Test.cpp
View File

@@ -1,22 +1,22 @@
#include "gtest/gtest.h"
#include "RiaWeightedAverageCalculator.h"
#include "RiaWeightedMeanCalculator.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RiaWeightedAverageCalculator, BasicUsage)
TEST(RiaWeightedMeanCalculator, BasicUsage)
{
{
RiaWeightedAverageCalculator<double> calc;
RiaWeightedMeanCalculator<double> calc;
EXPECT_DOUBLE_EQ(0.0, calc.aggregatedWeight());
EXPECT_FALSE(calc.validAggregatedWeight());
}
{
RiaWeightedAverageCalculator<double> calc;
RiaWeightedMeanCalculator<double> calc;
std::vector<double> values {3.0, 6.0};
std::vector<double> weights {1.0, 2.0};
@@ -27,6 +27,6 @@ TEST(RiaWeightedAverageCalculator, BasicUsage)
}
EXPECT_TRUE(calc.validAggregatedWeight());
EXPECT_DOUBLE_EQ(3.0, calc.aggregatedWeight());
EXPECT_DOUBLE_EQ(5.0, calc.weightedAverage());
EXPECT_DOUBLE_EQ(5.0, calc.weightedMean());
}
}