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

#7403 Replace toTime_t with toSecsSinceEpoch

Browse Source
This commit is contained in:
Magne Sjaastad 2021-02-22 07:55:37 +01:00
parent 1b91e4d344
commit b29952e8a9
16 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp
View File

@ -113,10 +113,10 @@ std::vector<time_t> RiaTimeHistoryCurveResampler::timeStepsFromTimeRange( RiaQDa
std::vector<time_t> timeSteps;
while ( QDT::lessThan( currTimeStep, lastOriginalTimeStep ) )
{
timeSteps.push_back( currTimeStep.toTime_t() );
timeSteps.push_back( currTimeStep.toSecsSinceEpoch() );
currTimeStep = QDT::addPeriod( currTimeStep, period );
}
timeSteps.push_back( currTimeStep.toTime_t() );
timeSteps.push_back( currTimeStep.toSecsSinceEpoch() );
return timeSteps;
}
@ -143,7 +143,7 @@ void RiaTimeHistoryCurveResampler::computeWeightedMeanValues( RiaQDateTimeTools:
{
double wMean = 0.0;
time_t periodStart = i > 0 ? m_timeSteps[i - 1]
: QDT::subtractPeriod( QDT::fromTime_t( m_timeSteps[0] ), period ).toTime_t();
: QDT::subtractPeriod( QDT::fromTime_t( m_timeSteps[0] ), period ).toSecsSinceEpoch();
time_t periodEnd = m_timeSteps[i];
time_t periodLength = periodEnd - periodStart;
@ -258,12 +258,12 @@ void RiaTimeHistoryCurveResampler::computeResampledTimeSteps( RiaQDateTimeTools:
while ( QDT::lessThan( currTimeStep, lastOriginalTimeStep ) )
{
m_timeSteps.push_back( currTimeStep.toTime_t() );
m_timeSteps.push_back( currTimeStep.toSecsSinceEpoch() );
currTimeStep = QDT::addPeriod( currTimeStep, period );
}
// Add last time step
m_timeSteps.push_back( currTimeStep.toTime_t() );
m_timeSteps.push_back( currTimeStep.toSecsSinceEpoch() );
}
//--------------------------------------------------------------------------------------------------

8
ApplicationLibCode/FileInterface/RifColumnBasedUserData.cpp
View File

@ -231,7 +231,7 @@ std::vector<time_t> RifColumnBasedUserData::createTimeSteps( const TableData& ta
for ( const auto& timeStepValue : ci.values )
{
QDateTime dateTime = RiaQDateTimeTools::fromYears( timeStepValue );
tsVector.push_back( dateTime.toTime_t() );
tsVector.push_back( dateTime.toSecsSinceEpoch() );
}
}
@ -245,7 +245,7 @@ std::vector<time_t> RifColumnBasedUserData::createTimeSteps( const TableData& ta
for ( const auto& timeStepValue : ci.values )
{
QDateTime dateTime = RiaQDateTimeTools::addDays( simulationStartDate, timeStepValue );
tsVector.push_back( dateTime.toTime_t() );
tsVector.push_back( dateTime.toSecsSinceEpoch() );
}
}
@ -259,7 +259,7 @@ std::vector<time_t> RifColumnBasedUserData::createTimeSteps( const TableData& ta
for ( const auto& timeStepValue : ci.values )
{
QDateTime dateTime = RiaQDateTimeTools::addYears( simulationStartDate, timeStepValue );
tsVector.push_back( dateTime.toTime_t() );
tsVector.push_back( dateTime.toSecsSinceEpoch() );
}
}
@ -273,7 +273,7 @@ std::vector<time_t> RifColumnBasedUserData::createTimeSteps( const TableData& ta
{
QDateTime dt = RiaDateStringParser::parseDateString( s );
tsVector.push_back( dt.toTime_t() );
tsVector.push_back( dt.toSecsSinceEpoch() );
}
}

6
ApplicationLibCode/FileInterface/RifCsvUserDataParser.cpp
View File

@ -458,7 +458,7 @@ bool RifCsvUserDataParser::parseColumnBasedData( const AsciiDataParseOptions& pa
if ( m_errorText ) m_errorText->append( "CSV import: Failed to parse date time value" );
throw 0;
}
col.dateTimeValues.push_back( dt.toTime_t() );
col.dateTimeValues.push_back( dt.toSecsSinceEpoch() );
}
}
catch ( ... )
@ -579,7 +579,7 @@ bool RifCsvUserDataParser::parseLineBasedData()
}
auto& samples = addressesAndData[addr];
samples.push_back( std::make_pair( dateTime.toTime_t(), value ) );
samples.push_back( std::make_pair( dateTime.toSecsSinceEpoch(), value ) );
}
// ERROR VALUE
@ -592,7 +592,7 @@ bool RifCsvUserDataParser::parseLineBasedData()
if ( !parseOk ) value = DOUBLE_INF;
auto& samples = addressesAndData[errAddr];
samples.push_back( std::make_pair( dateTime.toTime_t(), value ) );
samples.push_back( std::make_pair( dateTime.toSecsSinceEpoch(), value ) );
}
}
}

4
ApplicationLibCode/FileInterface/RifKeywordVectorUserData.cpp
View File

@ -117,7 +117,7 @@ bool RifKeywordVectorUserData::parse( const QString& data, const QString& custom
for ( const auto& timeStepValue : m_parser->keywordBasedVectors()[i].values )
{
QDateTime dateTime = RiaQDateTimeTools::addDays( startDate, timeStepValue );
ts.push_back( dateTime.toTime_t() );
ts.push_back( dateTime.toSecsSinceEpoch() );
}
}
else if ( unitText == "YEAR" || unitText == "YEARS" )
@ -125,7 +125,7 @@ bool RifKeywordVectorUserData::parse( const QString& data, const QString& custom
for ( const auto& timeStepValue : m_parser->keywordBasedVectors()[i].values )
{
QDateTime dateTime = RiaQDateTimeTools::fromYears( timeStepValue );
ts.push_back( dateTime.toTime_t() );
ts.push_back( dateTime.toSecsSinceEpoch() );
}
}
}

10
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@ -321,7 +321,7 @@ void RimAnalysisPlot::maxMinValueFromAddress( const RifEclipseSummaryAddress&
{
for ( const QDateTime& dateTime : timeRangeOrSelection )
{
selectedTimesteps.push_back( dateTime.toTime_t() );
selectedTimesteps.push_back( dateTime.toSecsSinceEpoch() );
}
}
else if ( timeStepSourceType == RimPlotDataFilterItem::PLOT_SOURCE_TIMESTEPS )
@ -367,8 +367,8 @@ void RimAnalysisPlot::maxMinValueFromAddress( const RifEclipseSummaryAddress&
{
if ( timeRangeOrSelection.size() >= 2 )
{
time_t minTime = timeRangeOrSelection.front().toTime_t();
time_t maxTime = timeRangeOrSelection.back().toTime_t();
time_t minTime = timeRangeOrSelection.front().toSecsSinceEpoch();
time_t maxTime = timeRangeOrSelection.back().toSecsSinceEpoch();
for ( size_t tIdx = 0; tIdx < timesteps.size(); ++tIdx )
{
@ -430,7 +430,7 @@ std::vector<time_t> RimAnalysisPlot::selectedTimeSteps()
std::vector<time_t> selectedTimeTTimeSteps;
for ( const QDateTime& dateTime : m_selectedTimeSteps.v() )
{
selectedTimeTTimeSteps.push_back( dateTime.toTime_t() );
selectedTimeTTimeSteps.push_back( dateTime.toSecsSinceEpoch() );
}
return selectedTimeTTimeSteps;
@ -1445,7 +1445,7 @@ void RimAnalysisPlot::addDataToChartBuilder( RiuGroupedBarChartBuilder& chartBui
std::vector<time_t> selectedTimesteps;
for ( const QDateTime& dateTime : m_selectedTimeSteps.v() )
{
selectedTimesteps.push_back( dateTime.toTime_t() );
selectedTimesteps.push_back( dateTime.toSecsSinceEpoch() );
}
RifSummaryReaderInterface* referenceCaseReader = nullptr;

6
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp
View File

@ -209,8 +209,8 @@ std::pair<time_t, time_t> RimPlotDataFilterItem::timeRangeMinMax() const
if ( m_explicitlySelectedTimeSteps().size() >= 2 )
{
time_t minTime = m_explicitlySelectedTimeSteps().front().toTime_t();
time_t maxTime = m_explicitlySelectedTimeSteps().back().toTime_t();
time_t minTime = m_explicitlySelectedTimeSteps().front().toSecsSinceEpoch();
time_t maxTime = m_explicitlySelectedTimeSteps().back().toSecsSinceEpoch();
return std::make_pair( minTime, maxTime );
}
@ -228,7 +228,7 @@ std::vector<time_t> RimPlotDataFilterItem::explicitlySelectedTimeSteps() const
{
for ( const QDateTime& dateTime : m_explicitlySelectedTimeSteps() )
{
selectedTimesteps.push_back( dateTime.toTime_t() );
selectedTimesteps.push_back( dateTime.toSecsSinceEpoch() );
}
}

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
View File

@ -497,7 +497,7 @@ std::vector<CorrelationMatrixRowOrColumn<ValueType, KeyType>>
//--------------------------------------------------------------------------------------------------
void RimCorrelationMatrixPlot::createMatrix()
{
time_t selectedTimestep = m_timeStep().toTime_t();
time_t selectedTimestep = m_timeStep().toSecsSinceEpoch();
m_paramLabels.clear();
m_resultLabels.clear();

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp
View File

@ -238,7 +238,7 @@ void RimCorrelationPlot::updateAxes()
//--------------------------------------------------------------------------------------------------
void RimCorrelationPlot::addDataToChartBuilder( RiuGroupedBarChartBuilder& chartBuilder )
{
time_t selectedTimestep = m_timeStep().toTime_t();
time_t selectedTimestep = m_timeStep().toSecsSinceEpoch();
if ( ensembles().empty() ) return;
if ( addresses().empty() ) return;

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
View File

@ -298,7 +298,7 @@ void RimCorrelationReportPlot::onLoadDataAndUpdate()
updateMdiWindowVisibility();
if ( m_showWindow )
{
auto timeStep = m_correlationMatrixPlot->timeStep().toTime_t();
auto timeStep = m_correlationMatrixPlot->timeStep().toSecsSinceEpoch();
bool showOnlyTopNCorrelations = m_correlationMatrixPlot->showTopNCorrelations();
int topNFilterCount = m_correlationMatrixPlot->topNFilterCount();

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
View File

@ -231,7 +231,7 @@ void RimParameterResultCrossPlot::createPoints()
{
detachAllCurves();
time_t selectedTimestep = m_timeStep().toTime_t();
time_t selectedTimestep = m_timeStep().toSecsSinceEpoch();
caf::ColorTable colorTable = RiaColorTables::categoryPaletteColors();

8
ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
View File

@ -473,7 +473,7 @@ std::vector<time_t> RimGridTimeHistoryCurve::timeStepValues() const
for ( QDateTime dt : timeStepDates )
{
dateTimes.push_back( dt.toTime_t() );
dateTimes.push_back( dt.toSecsSinceEpoch() );
}
}
}
@ -491,7 +491,7 @@ std::vector<time_t> RimGridTimeHistoryCurve::timeStepValues() const
{
for ( QDateTime dt : dates )
{
dateTimes.push_back( dt.toTime_t() );
dateTimes.push_back( dt.toSecsSinceEpoch() );
}
}
else
@ -537,11 +537,11 @@ std::vector<double> RimGridTimeHistoryCurve::daysSinceSimulationStart() const
{
if ( !dates.empty() )
{
time_t startDate = dates[0].toTime_t();
time_t startDate = dates[0].toSecsSinceEpoch();
double secondsToDaysConversion = ( 24.0 * 60.0 * 60.0 );
for ( QDateTime dt : dates )
{
double timeDifference = static_cast<double>( dt.toTime_t() - startDate );
double timeDifference = static_cast<double>( dt.toSecsSinceEpoch() - startDate );
daysSinceSimulationStart.push_back( timeDifference / secondsToDaysConversion );
}
}

2
ApplicationLibCode/ProjectDataModel/RimSimWellInViewTools.cpp
View File

@ -171,7 +171,7 @@ double RimSimWellInViewTools::extractValueForTimeStep( RifSummaryReaderInterface
auto [resampledTimeSteps, resampledValues] =
RiaSummaryTools::resampledValuesForPeriod( addr, timeSteps, values, RiaQDateTimeTools::DateTimePeriod::DAY );
time_t currentTime_t = currentDate.toTime_t();
time_t currentTime_t = currentDate.toSecsSinceEpoch();
for ( unsigned int i = 0; i < resampledTimeSteps.size(); i++ )
{

2
ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp
View File

@ -82,7 +82,7 @@ const std::vector<time_t>& RimAsciiDataCurve::timeSteps() const
for ( const QDateTime& dateTime : m_timeSteps() )
{
timeSteps.push_back( dateTime.toTime_t() );
timeSteps.push_back( dateTime.toSecsSinceEpoch() );
}
return timeSteps;

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
View File

@ -285,7 +285,7 @@ QDateTime RimSummaryTimeAxisProperties::fromDisplayTimeToDate( double displayTim
//--------------------------------------------------------------------------------------------------
double RimSummaryTimeAxisProperties::fromDateToDisplayTime( const QDateTime& displayTime )
{
time_t secsSinceEpoc = displayTime.toTime_t();
time_t secsSinceEpoc = displayTime.toSecsSinceEpoch();
RimSummaryPlot* rimSummaryPlot = nullptr;
this->firstAncestorOrThisOfType( rimSummaryPlot );

2
ApplicationLibCode/UnitTests/ObservedDataParser-Test.cpp
View File

@ -575,7 +575,7 @@ TEST( RifColumnBasedRsmspecParserTest, TestTableValues )
auto timeSteps = userData.timeSteps( adr );
EXPECT_EQ( size_t( 18 ), timeSteps.size() );
EXPECT_EQ( firstTimeStep.toTime_t(), timeSteps[0] );
EXPECT_EQ( firstTimeStep.toSecsSinceEpoch(), timeSteps[0] );
}
//--------------------------------------------------------------------------------------------------

210
ApplicationLibCode/UnitTests/RiaTimeHistoryCurveTools-Test.cpp
View File

@ -11,16 +11,16 @@ static int SECS_PER_DAY = 60 * 60 * 24;
//--------------------------------------------------------------------------------------------------
/// Helpers
//--------------------------------------------------------------------------------------------------
static time_t toTime_t( const QString& timeString )
static time_t toSecsSinceEpoch( const QString& timeString )
{
return RiaQDateTimeTools::fromString( timeString, "yyyy-MM-dd" ).toTime_t();
return RiaQDateTimeTools::fromString( timeString, "yyyy-MM-dd" ).toSecsSinceEpoch();
}
static std::vector<time_t> toTime_tVector( const std::vector<QString>& timeStrings )
static std::vector<time_t> toSecsSinceEpochVector( const std::vector<QString>& timeStrings )
{
std::vector<time_t> tv;
for ( auto& ts : timeStrings )
tv.push_back( toTime_t( ts ) );
tv.push_back( toSecsSinceEpoch( ts ) );
return tv;
}
@ -34,11 +34,11 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_NoPeriod )
std::vector<double> dataValues( { 3.0, 5.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH );
EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toTime_t( "2018-03-01" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] );
}
//--------------------------------------------------------------------------------------------------
@ -51,14 +51,14 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Decade )
std::vector<double> dataValues( { 0.0, 0.0, 0.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::DECADE );
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] );
EXPECT_EQ( toSecsSinceEpoch( "1990-01-01" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2000-01-01" ), resampler.resampledTimeSteps()[1] );
EXPECT_EQ( toSecsSinceEpoch( "2010-01-01" ), resampler.resampledTimeSteps()[2] );
EXPECT_EQ( toSecsSinceEpoch( "2020-01-01" ), resampler.resampledTimeSteps()[3] );
}
//--------------------------------------------------------------------------------------------------
@ -71,15 +71,15 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Year )
std::vector<double> dataValues( { 0.0, 0.0, 0.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::YEAR );
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] );
EXPECT_EQ( toSecsSinceEpoch( "2015-01-01" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2016-01-01" ), resampler.resampledTimeSteps()[1] );
EXPECT_EQ( toSecsSinceEpoch( "2017-01-01" ), resampler.resampledTimeSteps()[2] );
EXPECT_EQ( toSecsSinceEpoch( "2018-01-01" ), resampler.resampledTimeSteps()[3] );
EXPECT_EQ( toSecsSinceEpoch( "2019-01-01" ), resampler.resampledTimeSteps()[4] );
}
//--------------------------------------------------------------------------------------------------
@ -92,15 +92,15 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_HalfYear )
std::vector<double> dataValues( { 0.0, 0.0, 0.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::HALFYEAR );
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] );
EXPECT_EQ( toSecsSinceEpoch( "2016-07-01" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2017-01-01" ), resampler.resampledTimeSteps()[1] );
EXPECT_EQ( toSecsSinceEpoch( "2017-07-01" ), resampler.resampledTimeSteps()[2] );
EXPECT_EQ( toSecsSinceEpoch( "2018-01-01" ), resampler.resampledTimeSteps()[3] );
EXPECT_EQ( toSecsSinceEpoch( "2018-07-01" ), resampler.resampledTimeSteps()[4] );
}
//--------------------------------------------------------------------------------------------------
@ -113,17 +113,17 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Quarter )
std::vector<double> dataValues( { 0.0, 0.0, 0.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::QUARTER );
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] );
EXPECT_EQ( toSecsSinceEpoch( "2016-10-01" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2017-01-01" ), resampler.resampledTimeSteps()[1] );
EXPECT_EQ( toSecsSinceEpoch( "2017-04-01" ), resampler.resampledTimeSteps()[2] );
EXPECT_EQ( toSecsSinceEpoch( "2017-07-01" ), resampler.resampledTimeSteps()[3] );
EXPECT_EQ( toSecsSinceEpoch( "2017-10-01" ), resampler.resampledTimeSteps()[4] );
EXPECT_EQ( toSecsSinceEpoch( "2018-01-01" ), resampler.resampledTimeSteps()[5] );
EXPECT_EQ( toSecsSinceEpoch( "2018-04-01" ), resampler.resampledTimeSteps()[6] );
}
//--------------------------------------------------------------------------------------------------
@ -136,16 +136,16 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Month )
std::vector<double> dataValues( { 0.0, 0.0, 0.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH );
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] );
EXPECT_EQ( toSecsSinceEpoch( "2017-10-01" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2017-11-01" ), resampler.resampledTimeSteps()[1] );
EXPECT_EQ( toSecsSinceEpoch( "2017-12-01" ), resampler.resampledTimeSteps()[2] );
EXPECT_EQ( toSecsSinceEpoch( "2018-01-01" ), resampler.resampledTimeSteps()[3] );
EXPECT_EQ( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps()[4] );
EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[5] );
}
//--------------------------------------------------------------------------------------------------
@ -158,20 +158,20 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Week )
std::vector<double> dataValues( { 0.0, 0.0, 0.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::WEEK );
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] );
EXPECT_EQ( toTime_t( "2017-11-27" ), resampler.resampledTimeSteps()[3] );
EXPECT_EQ( toTime_t( "2017-12-04" ), resampler.resampledTimeSteps()[4] );
EXPECT_EQ( toTime_t( "2017-12-11" ), resampler.resampledTimeSteps()[5] );
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] );
EXPECT_EQ( toSecsSinceEpoch( "2017-11-06" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2017-11-13" ), resampler.resampledTimeSteps()[1] );
EXPECT_EQ( toSecsSinceEpoch( "2017-11-20" ), resampler.resampledTimeSteps()[2] );
EXPECT_EQ( toSecsSinceEpoch( "2017-11-27" ), resampler.resampledTimeSteps()[3] );
EXPECT_EQ( toSecsSinceEpoch( "2017-12-04" ), resampler.resampledTimeSteps()[4] );
EXPECT_EQ( toSecsSinceEpoch( "2017-12-11" ), resampler.resampledTimeSteps()[5] );
EXPECT_EQ( toSecsSinceEpoch( "2017-12-18" ), resampler.resampledTimeSteps()[6] );
EXPECT_EQ( toSecsSinceEpoch( "2017-12-25" ), resampler.resampledTimeSteps()[7] );
EXPECT_EQ( toSecsSinceEpoch( "2018-01-01" ), resampler.resampledTimeSteps()[8] );
EXPECT_EQ( toSecsSinceEpoch( "2018-01-08" ), resampler.resampledTimeSteps()[9] );
}
//--------------------------------------------------------------------------------------------------
@ -184,11 +184,11 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_NoSampleCrossingPeriodBounda
std::vector<double> dataValues( { 0.0, 0.0, 0.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::YEAR );
EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toTime_t( "2018-01-01" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2018-01-01" ), resampler.resampledTimeSteps()[0] );
}
//--------------------------------------------------------------------------------------------------
@ -201,11 +201,11 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SingleSample )
std::vector<double> dataValues( { 3.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH );
EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toTime_t( "2018-03-01" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] );
double value = 0.0;
EXPECT_NEAR( value, resampler.resampledValues()[0], 1e-12 );
@ -221,15 +221,15 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_Days )
std::vector<double> dataValues( { 3.0, 5.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::DAY );
EXPECT_EQ( 5, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toTime_t( "2018-02-03" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toTime_t( "2018-02-04" ), resampler.resampledTimeSteps()[1] );
EXPECT_EQ( toTime_t( "2018-02-05" ), resampler.resampledTimeSteps()[2] );
EXPECT_EQ( toTime_t( "2018-02-06" ), resampler.resampledTimeSteps()[3] );
EXPECT_EQ( toTime_t( "2018-02-07" ), resampler.resampledTimeSteps()[4] );
EXPECT_EQ( toSecsSinceEpoch( "2018-02-03" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2018-02-04" ), resampler.resampledTimeSteps()[1] );
EXPECT_EQ( toSecsSinceEpoch( "2018-02-05" ), resampler.resampledTimeSteps()[2] );
EXPECT_EQ( toSecsSinceEpoch( "2018-02-06" ), resampler.resampledTimeSteps()[3] );
EXPECT_EQ( toSecsSinceEpoch( "2018-02-07" ), resampler.resampledTimeSteps()[4] );
EXPECT_NEAR( 3.0, resampler.resampledValues()[0], 1e-12 );
EXPECT_NEAR( 5.0, resampler.resampledValues()[1], 1e-12 );
@ -247,15 +247,15 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_Decade )
std::vector<double> dataValues( { 3.0, 5.0, 7.0 } );
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" );
time_t t0 = toSecsSinceEpoch( "1999-02-03" );
time_t t1 = toSecsSinceEpoch( "2005-06-06" );
time_t t2 = toSecsSinceEpoch( "2012-02-07" );
time_t tp0 = toSecsSinceEpoch( "2000-01-01" );
time_t tp1 = toSecsSinceEpoch( "2010-01-01" );
time_t tp2 = toSecsSinceEpoch( "2020-01-01" );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::DECADE );
EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() );
@ -263,7 +263,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_Decade )
EXPECT_EQ( tp1, resampler.resampledTimeSteps()[1] );
EXPECT_EQ( tp2, resampler.resampledTimeSteps()[2] );
double value0 = 5.0 * ( tp0 - t0 ) / ( tp0 - toTime_t( "1990-01-01" ) );
double value0 = 5.0 * ( tp0 - t0 ) / ( tp0 - toSecsSinceEpoch( "1990-01-01" ) );
double value1 = ( 5.0 * ( t1 - tp0 ) + 7.0 * ( tp1 - t1 ) ) / ( tp1 - tp0 );
double value2 = 7.0 * ( t2 - tp1 ) / ( tp2 - tp1 );
@ -281,12 +281,12 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartBeforePeriod )
std::vector<double> dataValues( { 3.0, 5.0, 7.0, 11.0, 13.0 } );
time_t tp0 = toTime_t( "2018-02-01" );
time_t tp1 = toTime_t( "2018-03-01" );
time_t tp2 = toTime_t( "2018-04-01" );
time_t tp0 = toSecsSinceEpoch( "2018-02-01" );
time_t tp1 = toSecsSinceEpoch( "2018-03-01" );
time_t tp2 = toSecsSinceEpoch( "2018-04-01" );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH );
EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() );
@ -294,7 +294,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartBeforePeriod )
EXPECT_EQ( tp1, resampler.resampledTimeSteps()[1] );
EXPECT_EQ( tp2, resampler.resampledTimeSteps()[2] );
double value0 = ( 5.0 * 9 + 7.0 * 3 ) * SECS_PER_DAY / ( tp0 - toTime_t( "2018-01-01" ) );
double value0 = ( 5.0 * 9 + 7.0 * 3 ) * SECS_PER_DAY / ( tp0 - toSecsSinceEpoch( "2018-01-01" ) );
double value1 = ( 7.0 * 2 + 11.0 * 24 + 13.0 * 2 ) * SECS_PER_DAY / ( tp1 - tp0 );
@ -314,12 +314,12 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartBeforePeriod_T
std::vector<double> dataValues( { 3.0, 5.0, 7.0, 11.0, 13.0 } );
time_t tp0 = toTime_t( "2018-02-01" );
time_t tp1 = toTime_t( "2018-03-01" );
time_t tp2 = toTime_t( "2018-04-01" );
time_t tp0 = toSecsSinceEpoch( "2018-02-01" );
time_t tp1 = toSecsSinceEpoch( "2018-03-01" );
time_t tp2 = toSecsSinceEpoch( "2018-04-01" );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH );
EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() );
@ -327,7 +327,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartBeforePeriod_T
EXPECT_EQ( tp1, resampler.resampledTimeSteps()[1] );
EXPECT_EQ( tp2, resampler.resampledTimeSteps()[2] );
double value0 = ( 5.0 * 12 ) * SECS_PER_DAY / ( tp0 - toTime_t( "2018-01-01" ) );
double value0 = ( 5.0 * 12 ) * SECS_PER_DAY / ( tp0 - toSecsSinceEpoch( "2018-01-01" ) );
double value1 = ( 7.0 * 2 + 11.0 * 26 ) * SECS_PER_DAY / ( tp1 - tp0 );
@ -348,14 +348,14 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartAndEndMatchPer
std::vector<double> dataValues( { 3.0, 5.0, 7.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::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( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps().front() );
EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps().back() );
time_t timePeriod = toTime_t( "2018-03-01" ) - toTime_t( "2018-02-01" );
time_t timePeriod = toSecsSinceEpoch( "2018-03-01" ) - toSecsSinceEpoch( "2018-02-01" );
double value1 = 3.0;
double value2 = ( 5.0 * 9 + 7.0 * 19 ) * SECS_PER_DAY / timePeriod;
@ -373,12 +373,12 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartMatchPeriodSta
std::vector<double> dataValues( { 3.0, 5.0, 7.0, 11.0 } );
time_t tp0 = toTime_t( "2018-02-01" );
time_t tp1 = toTime_t( "2018-03-01" );
time_t tp2 = toTime_t( "2018-04-01" );
time_t tp0 = toSecsSinceEpoch( "2018-02-01" );
time_t tp1 = toSecsSinceEpoch( "2018-03-01" );
time_t tp2 = toSecsSinceEpoch( "2018-04-01" );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH );
EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() );
@ -404,18 +404,18 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_MultipleSamplesInLastPerio
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" );
time_t tp0 = toSecsSinceEpoch( "2018-03-01" );
time_t tp1 = toSecsSinceEpoch( "2018-04-01" );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH );
EXPECT_EQ( 2, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] );
EXPECT_EQ( tp1, resampler.resampledTimeSteps()[1] );
double value0 = 5.0 * 19 * SECS_PER_DAY / ( tp0 - toTime_t( "2018-02-01" ) );
double value0 = 5.0 * 19 * SECS_PER_DAY / ( tp0 - toSecsSinceEpoch( "2018-02-01" ) );
double value1 = ( 0.0 * 17 + 11.0 * 10 + 7.0 * 3 + 5.0 * 1 ) * SECS_PER_DAY / ( tp1 - tp0 );
EXPECT_NEAR( value0, resampler.resampledValues()[0], 1e-12 );
@ -432,11 +432,11 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SingleSample )
std::vector<double> dataValues( { 3.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod::MONTH );
EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toTime_t( "2018-03-01" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] );
EXPECT_NEAR( 3.0, resampler.resampledValues()[0], 1e-12 );
}
@ -450,15 +450,15 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SamplesStartBeforePerio
std::vector<double> dataValues( { 3.0, 5.0, 7.0, 11.0 } );
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 tp0 = toTime_t( "2018-02-01" );
time_t tp1 = toTime_t( "2018-03-01" );
time_t tp2 = toTime_t( "2018-04-01" );
time_t t0 = toSecsSinceEpoch( "2018-01-30" );
time_t t1 = toSecsSinceEpoch( "2018-02-10" );
time_t t2 = toSecsSinceEpoch( "2018-03-05" );
time_t tp0 = toSecsSinceEpoch( "2018-02-01" );
time_t tp1 = toSecsSinceEpoch( "2018-03-01" );
time_t tp2 = toSecsSinceEpoch( "2018-04-01" );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod::MONTH );
EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() );
@ -485,13 +485,13 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SamplesStartMatchPeriod
std::vector<double> dataValues( { 3.0, 5.0, 7.0, 11.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod::MONTH );
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_EQ( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps()[0] );
EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[1] );
EXPECT_EQ( toSecsSinceEpoch( "2018-04-01" ), resampler.resampledTimeSteps()[2] );
EXPECT_NEAR( 3.0, resampler.resampledValues()[0], 1e-12 );
EXPECT_NEAR( 7.0, resampler.resampledValues()[1], 1e-12 );
@ -508,12 +508,12 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SamplesStartAndEndMatch
std::vector<double> dataValues( { 3.0, 5.0, 7.0 } );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toTime_tVector( timeStrings ) );
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::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( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps().front() );
EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps().back() );
EXPECT_NEAR( 3.0, resampler.resampledValues()[0], 1e-12 );
EXPECT_NEAR( 7.0, resampler.resampledValues()[1], 1e-12 );