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 RiaWeightedAverageCalculator a template class.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-09-06 19:58:28 +02:00
parent 51434dd304
commit 11253f2dbd
5 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/UnitTests/RiaWeightedAverage-Test.cpp
View File

@@ -9,15 +9,14 @@
TEST(RiaWeightedAverageCalculator, BasicUsage)
{
{
RiaWeightedAverageCalculator calc;
RiaWeightedAverageCalculator<double> calc;
EXPECT_DOUBLE_EQ(0.0, calc.aggregatedWeight());
EXPECT_DOUBLE_EQ(0.0, calc.weightedAverage());
EXPECT_FALSE(calc.validAggregatedWeight());
}
{
RiaWeightedAverageCalculator calc;
RiaWeightedAverageCalculator<double> calc;
std::vector<double> values {3.0, 6.0};
std::vector<double> weights {1.0, 2.0};
@@ -26,7 +25,7 @@ TEST(RiaWeightedAverageCalculator, BasicUsage)
{
calc.addValueAndWeight(values[i], weights[i]);
}
EXPECT_TRUE(calc.validAggregatedWeight());
EXPECT_DOUBLE_EQ(3.0, calc.aggregatedWeight());
EXPECT_DOUBLE_EQ(5.0, calc.weightedAverage());
}