#3162 Resampling. INF values ignored in calc

This commit is contained in:
Bjørn Erik Jensen 2018-07-06 14:14:15 +02:00
parent 11d74cd383
commit b8fbbc63f0

View File

@ -34,6 +34,11 @@
// return QString("%1.%2.%3 %4:%5:%6").arg(y).arg(m).arg(d).arg(h).arg(mm).arg(s);
//}
//--------------------------------------------------------------------------------------------------
/// Internal constants
//--------------------------------------------------------------------------------------------------
#define DOUBLE_INF std::numeric_limits<double>::infinity()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -139,7 +144,7 @@ void RiaTimeHistoryCurveResampler::computeWeightedMeanValues(DateTimePeriod peri
if (oi < origDataSize)
{
origTimeStep = origTimeSteps[oi];
origValue = origValues[oi];
origValue = origValues[oi] != DOUBLE_INF ? origValues[oi] : 0.0;
}
else
{