mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-12 08:25:03 -05:00
#3151 Resampling. Use 0 value outside the defined time range, for weighted mean calcs. Update unit tests
This commit is contained in:
Bjørn Erik Jensen committed
1 parent
2b58e5e7cb
commit
3f1ad163ea
4 files changed
+268
-91
No files matched your search
@@ -4,6 +4,11 @@
|
||||
#include "RiaQDateTimeTools.h"
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Constants
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
static int SECS_PER_DAY = 60 * 60 * 24;
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Helpers
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -43,7 +48,8 @@ TEST(RiaTimeHistoryCurveResampler, Test_Resampling_NoPeriod)
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::MONTH);
|
||||
|
||||
EXPECT_EQ(0, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(1, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2018-03-01"), resampler.resampledTimeSteps()[0]);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -71,10 +77,11 @@ TEST(RiaTimeHistoryCurveResampler, Test_Resampling_Decade)
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::DECADE);
|
||||
|
||||
EXPECT_EQ(3, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(4, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("1990-01-01"), resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(toTime_t("2000-01-01"), resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(toTime_t("2010-01-01"), resampler.resampledTimeSteps()[2]);
|
||||
EXPECT_EQ(toTime_t("2020-01-01"), resampler.resampledTimeSteps()[3]);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -102,11 +109,12 @@ TEST(RiaTimeHistoryCurveResampler, Test_Resampling_Year)
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::YEAR);
|
||||
|
||||
EXPECT_EQ(4, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(5, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2015-01-01"), resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(toTime_t("2016-01-01"), resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(toTime_t("2017-01-01"), resampler.resampledTimeSteps()[2]);
|
||||
EXPECT_EQ(toTime_t("2018-01-01"), resampler.resampledTimeSteps()[3]);
|
||||
EXPECT_EQ(toTime_t("2019-01-01"), resampler.resampledTimeSteps()[4]);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -134,11 +142,12 @@ TEST(RiaTimeHistoryCurveResampler, Test_Resampling_HalfYear)
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::HALFYEAR);
|
||||
|
||||
EXPECT_EQ(4, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(5, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2016-07-01"), resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(toTime_t("2017-01-01"), resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(toTime_t("2017-07-01"), resampler.resampledTimeSteps()[2]);
|
||||
EXPECT_EQ(toTime_t("2018-01-01"), resampler.resampledTimeSteps()[3]);
|
||||
EXPECT_EQ(toTime_t("2018-07-01"), resampler.resampledTimeSteps()[4]);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -166,13 +175,14 @@ TEST(RiaTimeHistoryCurveResampler, Test_Resampling_Quarter)
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::QUARTER);
|
||||
|
||||
EXPECT_EQ(6, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(7, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2016-10-01"), resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(toTime_t("2017-01-01"), resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(toTime_t("2017-04-01"), resampler.resampledTimeSteps()[2]);
|
||||
EXPECT_EQ(toTime_t("2017-07-01"), resampler.resampledTimeSteps()[3]);
|
||||
EXPECT_EQ(toTime_t("2017-10-01"), resampler.resampledTimeSteps()[4]);
|
||||
EXPECT_EQ(toTime_t("2018-01-01"), resampler.resampledTimeSteps()[5]);
|
||||
EXPECT_EQ(toTime_t("2018-04-01"), resampler.resampledTimeSteps()[6]);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -200,12 +210,13 @@ TEST(RiaTimeHistoryCurveResampler, Test_Resampling_Month)
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::MONTH);
|
||||
|
||||
EXPECT_EQ(5, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(6, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2017-10-01"), resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(toTime_t("2017-11-01"), resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(toTime_t("2017-12-01"), resampler.resampledTimeSteps()[2]);
|
||||
EXPECT_EQ(toTime_t("2018-01-01"), resampler.resampledTimeSteps()[3]);
|
||||
EXPECT_EQ(toTime_t("2018-02-01"), resampler.resampledTimeSteps()[4]);
|
||||
EXPECT_EQ(toTime_t("2018-03-01"), resampler.resampledTimeSteps()[5]);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -233,7 +244,7 @@ TEST(RiaTimeHistoryCurveResampler, Test_Resampling_Week)
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::WEEK);
|
||||
|
||||
EXPECT_EQ(9, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(10, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2017-11-06"), resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(toTime_t("2017-11-13"), resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(toTime_t("2017-11-20"), resampler.resampledTimeSteps()[2]);
|
||||
@@ -243,6 +254,7 @@ TEST(RiaTimeHistoryCurveResampler, Test_Resampling_Week)
|
||||
EXPECT_EQ(toTime_t("2017-12-18"), resampler.resampledTimeSteps()[6]);
|
||||
EXPECT_EQ(toTime_t("2017-12-25"), resampler.resampledTimeSteps()[7]);
|
||||
EXPECT_EQ(toTime_t("2018-01-01"), resampler.resampledTimeSteps()[8]);
|
||||
EXPECT_EQ(toTime_t("2018-01-08"), resampler.resampledTimeSteps()[9]);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -270,7 +282,36 @@ TEST(RiaTimeHistoryCurveResampler, Test_Resampling_NoSampleCrossingPeriodBoundar
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::YEAR);
|
||||
|
||||
EXPECT_EQ(0, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(1, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2018-01-01"), resampler.resampledTimeSteps()[0]);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaTimeHistoryCurveResampler, Test_WeightedMean_SingleSample)
|
||||
{
|
||||
std::vector<QString> timeStrings(
|
||||
{
|
||||
"2018-02-07"
|
||||
}
|
||||
);
|
||||
|
||||
std::vector<double> dataValues(
|
||||
{
|
||||
3.0
|
||||
}
|
||||
);
|
||||
|
||||
RiaTimeHistoryCurveResampler resampler;
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::MONTH);
|
||||
|
||||
EXPECT_EQ(1, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2018-03-01"), resampler.resampledTimeSteps()[0]);
|
||||
|
||||
double value = 0.0;
|
||||
EXPECT_NEAR(value, resampler.resampledValues()[0], 1e-12);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -331,25 +372,29 @@ TEST(RiaTimeHistoryCurveResampler, Test_WeightedMean_Decade)
|
||||
}
|
||||
);
|
||||
|
||||
time_t t0 = toTime_t("1999-02-03");
|
||||
time_t t1 = toTime_t("2005-06-06");
|
||||
time_t t2 = toTime_t("2012-02-07");
|
||||
time_t tp0 = toTime_t("2000-01-01");
|
||||
time_t tp1 = toTime_t("2010-01-01");
|
||||
time_t tp2 = toTime_t("2020-01-01");
|
||||
|
||||
RiaTimeHistoryCurveResampler resampler;
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::DECADE);
|
||||
|
||||
EXPECT_EQ(2, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2000-01-01"), resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(toTime_t("2010-01-01"), resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(3, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(tp0, resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(tp1, resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(tp2, resampler.resampledTimeSteps()[2]);
|
||||
|
||||
time_t t1 = toTime_t("1999-02-03");
|
||||
time_t t2 = toTime_t("2005-06-06");
|
||||
time_t t3 = toTime_t("2012-02-07");
|
||||
time_t tp1 = toTime_t("2000-01-01");
|
||||
time_t tp2 = toTime_t("2010-01-01");
|
||||
double value0 = 5.0 * (tp0 - t0) / (tp0 - toTime_t("1990-01-01"));
|
||||
double value1 = (5.0 * (t1 - tp0) + 7.0 * (tp1 - t1)) / (tp1 - tp0);
|
||||
double value2 = 7.0 * (t2 - tp1) / (tp2 - tp1);
|
||||
|
||||
double value1 = 5.0;
|
||||
double value2 = (5.0 * (t2 - tp1) + 7.0 * (tp2 - t2)) / (tp2 - tp1);
|
||||
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value2, resampler.resampledValues()[1], 1e-12);
|
||||
EXPECT_NEAR(value0, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[1], 1e-12);
|
||||
EXPECT_NEAR(value2, resampler.resampledValues()[2], 1e-12);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -377,29 +422,33 @@ TEST(RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartBeforePeriod)
|
||||
}
|
||||
);
|
||||
|
||||
time_t tp0 = toTime_t("2018-02-01");
|
||||
time_t tp1 = toTime_t("2018-03-01");
|
||||
time_t tp2 = toTime_t("2018-04-01");
|
||||
|
||||
RiaTimeHistoryCurveResampler resampler;
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::MONTH);
|
||||
|
||||
EXPECT_EQ(2, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2018-02-01"), resampler.resampledTimeSteps().front());
|
||||
EXPECT_EQ(toTime_t("2018-03-01"), resampler.resampledTimeSteps().back());
|
||||
EXPECT_EQ(3, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(tp0, resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(tp1, resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(tp2, resampler.resampledTimeSteps()[2]);
|
||||
|
||||
time_t timePeriod1 = toTime_t("2018-02-01") - toTime_t("2018-01-20");
|
||||
time_t timePeriod2 = toTime_t("2018-03-01") - toTime_t("2018-02-01");
|
||||
int timeDay = 60 * 60 * 24;
|
||||
|
||||
double value1 =
|
||||
double value0 =
|
||||
(5.0 * 9 +
|
||||
7.0 * 3) * timeDay / timePeriod1;
|
||||
7.0 * 3) * SECS_PER_DAY / (tp0 - toTime_t("2018-01-01"));
|
||||
|
||||
double value2 =
|
||||
double value1 =
|
||||
(7.0 * 2 +
|
||||
11.0 * 24 +
|
||||
13.0 * 2) * timeDay / timePeriod2;
|
||||
13.0 * 2) * SECS_PER_DAY / (tp1 - tp0);
|
||||
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value2, resampler.resampledValues()[1], 1e-12);
|
||||
double value2 = 13.0 * 1 * SECS_PER_DAY / (tp2 - tp1);
|
||||
|
||||
EXPECT_NEAR(value0, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[1], 1e-12);
|
||||
EXPECT_NEAR(value2, resampler.resampledValues()[2], 1e-12);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -427,27 +476,31 @@ TEST(RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartBeforePeriod_Ti
|
||||
}
|
||||
);
|
||||
|
||||
time_t tp0 = toTime_t("2018-02-01");
|
||||
time_t tp1 = toTime_t("2018-03-01");
|
||||
time_t tp2 = toTime_t("2018-04-01");
|
||||
|
||||
RiaTimeHistoryCurveResampler resampler;
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::MONTH);
|
||||
|
||||
EXPECT_EQ(2, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2018-02-01"), resampler.resampledTimeSteps().front());
|
||||
EXPECT_EQ(toTime_t("2018-03-01"), resampler.resampledTimeSteps().back());
|
||||
EXPECT_EQ(3, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(tp0, resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(tp1, resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(tp2, resampler.resampledTimeSteps()[2]);
|
||||
|
||||
time_t timePeriod1 = toTime_t("2018-02-01") - toTime_t("2018-01-20");
|
||||
time_t timePeriod2 = toTime_t("2018-03-01") - toTime_t("2018-02-01");
|
||||
int timeDay = 60 * 60 * 24;
|
||||
double value0 =
|
||||
(5.0 * 12) * SECS_PER_DAY / (tp0 - toTime_t("2018-01-01"));
|
||||
|
||||
double value1 =
|
||||
(5.0 * 12) * timeDay / timePeriod1;
|
||||
|
||||
double value2 =
|
||||
(7.0 * 2 +
|
||||
11.0 * 26) * timeDay / timePeriod2;
|
||||
11.0 * 26) * SECS_PER_DAY / (tp1 - tp0);
|
||||
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value2, resampler.resampledValues()[1], 1e-12);
|
||||
double value2 = 13.0 * 1 * SECS_PER_DAY / (tp2 - tp1);
|
||||
|
||||
EXPECT_NEAR(value0, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[1], 1e-12);
|
||||
EXPECT_NEAR(value2, resampler.resampledValues()[2], 1e-12);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -480,12 +533,11 @@ TEST(RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartAndEndMatchPeri
|
||||
EXPECT_EQ(toTime_t("2018-03-01"), resampler.resampledTimeSteps().back());
|
||||
|
||||
time_t timePeriod = toTime_t("2018-03-01") - toTime_t("2018-02-01");
|
||||
int timeDay = 60 * 60 * 24;
|
||||
|
||||
double value1 = 3.0;
|
||||
double value2 =
|
||||
(5.0 * 9 +
|
||||
7.0 * 19) * timeDay / timePeriod;
|
||||
7.0 * 19) * SECS_PER_DAY / timePeriod;
|
||||
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value2, resampler.resampledValues()[1], 1e-12);
|
||||
@@ -514,24 +566,100 @@ TEST(RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartMatchPeriodStar
|
||||
}
|
||||
);
|
||||
|
||||
time_t tp0 = toTime_t("2018-02-01");
|
||||
time_t tp1 = toTime_t("2018-03-01");
|
||||
time_t tp2 = toTime_t("2018-04-01");
|
||||
|
||||
RiaTimeHistoryCurveResampler resampler;
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::MONTH);
|
||||
|
||||
EXPECT_EQ(3, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(tp0, resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(tp1, resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(tp2, resampler.resampledTimeSteps()[2]);
|
||||
|
||||
double value0 = 3.0;
|
||||
double value1 =
|
||||
(5.0 * 9 +
|
||||
7.0 * 19) * SECS_PER_DAY / (tp1 - tp0);
|
||||
double value2 = 11.0 * 1 * SECS_PER_DAY / (tp2 - tp1);
|
||||
|
||||
EXPECT_NEAR(value0, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[1], 1e-12);
|
||||
EXPECT_NEAR(value2, resampler.resampledValues()[2], 1e-12);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaTimeHistoryCurveResampler, Test_WeightedMean_MultipleSamplesInLastPeriod)
|
||||
{
|
||||
std::vector<QString> timeStrings(
|
||||
{
|
||||
"2018-02-10",
|
||||
"2018-03-02",
|
||||
"2018-03-05",
|
||||
"2018-03-15"
|
||||
}
|
||||
);
|
||||
|
||||
std::vector<double> dataValues(
|
||||
{
|
||||
3.0,
|
||||
5.0,
|
||||
7.0,
|
||||
11.0
|
||||
}
|
||||
);
|
||||
|
||||
time_t tp0 = toTime_t("2018-03-01");
|
||||
time_t tp1 = toTime_t("2018-04-01");
|
||||
|
||||
RiaTimeHistoryCurveResampler resampler;
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::MONTH);
|
||||
|
||||
EXPECT_EQ(2, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2018-02-01"), resampler.resampledTimeSteps().front());
|
||||
EXPECT_EQ(toTime_t("2018-03-01"), resampler.resampledTimeSteps().back());
|
||||
EXPECT_EQ(tp0, resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(tp1, resampler.resampledTimeSteps()[1]);
|
||||
|
||||
time_t timePeriod = toTime_t("2018-03-01") - toTime_t("2018-02-01");
|
||||
int timeDay = 60 * 60 * 24;
|
||||
double value0 = 5.0 * 19 * SECS_PER_DAY / (tp0 - toTime_t("2018-02-01"));
|
||||
double value1 =
|
||||
(0.0 * 17 +
|
||||
11.0 * 10 +
|
||||
7.0 * 3 +
|
||||
5.0 * 1) * SECS_PER_DAY / (tp1 - tp0);
|
||||
|
||||
double value1 = 3.0;
|
||||
double value2 =
|
||||
(5.0 * 9 +
|
||||
7.0 * 19) * timeDay / timePeriod;
|
||||
EXPECT_NEAR(value0, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[1], 1e-12);
|
||||
}
|
||||
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value2, resampler.resampledValues()[1], 1e-12);
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SingleSample)
|
||||
{
|
||||
std::vector<QString> timeStrings(
|
||||
{
|
||||
"2018-02-10"
|
||||
}
|
||||
);
|
||||
|
||||
std::vector<double> dataValues(
|
||||
{
|
||||
3.0
|
||||
}
|
||||
);
|
||||
|
||||
RiaTimeHistoryCurveResampler resampler;
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputePeriodEndValues(DateTimePeriod::MONTH);
|
||||
|
||||
EXPECT_EQ(1, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2018-03-01"), resampler.resampledTimeSteps()[0]);
|
||||
|
||||
EXPECT_NEAR(3.0, resampler.resampledValues()[0], 1e-12);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -557,26 +685,30 @@ TEST(RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SamplesStartBeforePeriod
|
||||
}
|
||||
);
|
||||
|
||||
time_t t0 = toTime_t("2018-01-30");
|
||||
time_t t1 = toTime_t("2018-02-10");
|
||||
time_t t2 = toTime_t("2018-03-05");
|
||||
time_t t3 = toTime_t("2018-03-02");
|
||||
time_t tp0 = toTime_t("2018-02-01");
|
||||
time_t tp1 = toTime_t("2018-03-01");
|
||||
time_t tp2 = toTime_t("2018-04-01");
|
||||
|
||||
RiaTimeHistoryCurveResampler resampler;
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputePeriodEndValues(DateTimePeriod::MONTH);
|
||||
|
||||
time_t t1 = toTime_t("2018-01-30");
|
||||
time_t t2 = toTime_t("2018-02-10");
|
||||
time_t t3 = toTime_t("2018-03-05");
|
||||
time_t t4 = toTime_t("2018-03-02");
|
||||
time_t tp1 = toTime_t("2018-02-01");
|
||||
time_t tp2 = toTime_t("2018-03-01");
|
||||
EXPECT_EQ(3, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(tp0, resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(tp1, resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(tp2, resampler.resampledTimeSteps()[2]);
|
||||
|
||||
EXPECT_EQ(2, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2018-02-01"), resampler.resampledTimeSteps().front());
|
||||
EXPECT_EQ(toTime_t("2018-03-01"), resampler.resampledTimeSteps().back());
|
||||
double value0 = (5.0 - 3.0) * (tp0 - t0) / (t1 - t0) + 3.0;
|
||||
double value1 = (7.0 - 5.0) * (tp1 - t1) / (t2 - t1) + 5.0;
|
||||
double value2 = 11.0;
|
||||
|
||||
double value1 = (5.0 - 3.0) * (tp1 - t1) / (t2 - t1) + 3.0;
|
||||
double value2 = (7.0 - 5.0) * (tp2 - t2) / (t3 - t2) + 5.0;
|
||||
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value2, resampler.resampledValues()[1], 1e-12);
|
||||
EXPECT_NEAR(value0, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(value1, resampler.resampledValues()[1], 1e-12);
|
||||
EXPECT_NEAR(value2, resampler.resampledValues()[2], 1e-12);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -606,12 +738,14 @@ TEST(RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SamplesStartMatchPeriod)
|
||||
resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
|
||||
resampler.resampleAndComputePeriodEndValues(DateTimePeriod::MONTH);
|
||||
|
||||
EXPECT_EQ(2, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2018-02-01"), resampler.resampledTimeSteps().front());
|
||||
EXPECT_EQ(toTime_t("2018-03-01"), resampler.resampledTimeSteps().back());
|
||||
EXPECT_EQ(3, (int)resampler.resampledTimeSteps().size());
|
||||
EXPECT_EQ(toTime_t("2018-02-01"), resampler.resampledTimeSteps()[0]);
|
||||
EXPECT_EQ(toTime_t("2018-03-01"), resampler.resampledTimeSteps()[1]);
|
||||
EXPECT_EQ(toTime_t("2018-04-01"), resampler.resampledTimeSteps()[2]);
|
||||
|
||||
EXPECT_NEAR(3.0, resampler.resampledValues()[0], 1e-12);
|
||||
EXPECT_NEAR(7.0, resampler.resampledValues()[1], 1e-12);
|
||||
EXPECT_NEAR(11.0, resampler.resampledValues()[2], 1e-12);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
Reference in new issue
Block a user