CDPP / AMDA_Kernel

Commit ff88453dce1dcd8780fc8cc73658aeefb8d22170

Authored by Erdogan Furkan
1 parent b8247aee
Exists in FER_10765

10765 - Done.

Showing 2 changed files with 11 additions and 11 deletions   Show diff stats
Inline Side-by-side
src/ExternLib/StatisticProcesses/CountBoolStatistic.hh
  Diff comments   View file @ff88453
... ... @@ -92,7 +92,7 @@ namespace AMDA {
92 92 return;
93 93 }
94 94 if (isNAN(StatisticOperation<TResultData>::_resultData._result))
95   - StatisticOperation<TResultData>::_resultData._result = 0;
  95 + StatisticOperation<TResultData>::_resultData._result = NAN;
96 96 ++StatisticOperation<TResultData>::_resultData._nbDataProcessed;
97 97 if (isNAN(a) || a != AMDA::Parameters::LogicalData::True)
98 98 return;
... ...
src/ExternLib/StatisticProcesses/MinMaxMeanStatistic.hh
  Diff comments   View file @ff88453
... ... @@ -185,7 +185,7 @@ namespace AMDA {
185 185 return;
186 186  
187 187 if (isNAN(StatisticOperation<TResultData>::_resultData._result))
188   - StatisticOperation<TResultData>::_resultData._result = a;
  188 + StatisticOperation<TResultData>::_resultData._result = NAN;
189 189 else if (a < StatisticOperation<TResultData>::_resultData._result)
190 190 StatisticOperation<TResultData>::_resultData._result = a;
191 191 ++StatisticOperation<TResultData>::_resultData._nbDataProcessed;
... ... @@ -212,7 +212,7 @@ namespace AMDA {
212 212 continue;
213 213  
214 214 if (isNAN(StatisticOperation<TResultData>::_resultData[i]._result))
215   - StatisticOperation<TResultData>::_resultData[i]._result = a[i];
  215 + StatisticOperation<TResultData>::_resultData[i]._result = NAN;
216 216 else if (a[i] < StatisticOperation<TResultData>::_resultData[i]._result)
217 217 StatisticOperation<TResultData>::_resultData[i]._result = a[i];
218 218 ++StatisticOperation<TResultData>::_resultData[i]._nbDataProcessed;
... ... @@ -225,7 +225,7 @@ namespace AMDA {
225 225 return;
226 226  
227 227 if (isNAN(StatisticOperation<TResultData>::_resultData._result))
228   - StatisticOperation<TResultData>::_resultData._result = a;
  228 + StatisticOperation<TResultData>::_resultData._result = NAN;
229 229 else if (a > StatisticOperation<TResultData>::_resultData._result)
230 230 StatisticOperation<TResultData>::_resultData._result = a;
231 231 ++StatisticOperation<TResultData>::_resultData._nbDataProcessed;
... ... @@ -253,7 +253,7 @@ namespace AMDA {
253 253 continue;
254 254  
255 255 if (isNAN(StatisticOperation<TResultData>::_resultData[i]._result))
256   - StatisticOperation<TResultData>::_resultData[i]._result = a[i];
  256 + StatisticOperation<TResultData>::_resultData[i]._result = NAN;
257 257 else if (a[i] > StatisticOperation<TResultData>::_resultData[i]._result)
258 258 StatisticOperation<TResultData>::_resultData[i]._result = a[i];
259 259 ++StatisticOperation<TResultData>::_resultData[i]._nbDataProcessed;
... ... @@ -266,7 +266,7 @@ namespace AMDA {
266 266 return;
267 267  
268 268 if (isNAN(StatisticOperation<TResultData>::_resultData._result))
269   - StatisticOperation<TResultData>::_resultData._result = a;
  269 + StatisticOperation<TResultData>::_resultData._result = NAN;
270 270 else
271 271 StatisticOperation<TResultData>::_resultData._result = StatisticOperation<TResultData>::_resultData._result + a;
272 272 ++StatisticOperation<TResultData>::_resultData._nbDataProcessed;
... ... @@ -294,7 +294,7 @@ namespace AMDA {
294 294 continue;
295 295  
296 296 if (isNAN(StatisticOperation<TResultData>::_resultData[i]._result))
297   - StatisticOperation<TResultData>::_resultData[i]._result = a[i];
  297 + StatisticOperation<TResultData>::_resultData[i]._result = NAN;
298 298 else
299 299 StatisticOperation<TResultData>::_resultData[i]._result = StatisticOperation<TResultData>::_resultData[i]._result + a[i];
300 300 ++StatisticOperation<TResultData>::_resultData[i]._nbDataProcessed;
... ... @@ -307,7 +307,7 @@ namespace AMDA {
307 307 return;
308 308  
309 309 if (isNAN(StatisticOperation<TResultData>::_resultData._result))
310   - StatisticOperation<TResultData>::_resultData._result = a * a;
  310 + StatisticOperation<TResultData>::_resultData._result = NAN;
311 311 else
312 312 StatisticOperation<TResultData>::_resultData._result = StatisticOperation<TResultData>::_resultData._result + a*a;
313 313 ++StatisticOperation<TResultData>::_resultData._nbDataProcessed;
... ... @@ -335,7 +335,7 @@ namespace AMDA {
335 335 continue;
336 336  
337 337 if (isNAN(StatisticOperation<TResultData>::_resultData[i]._result))
338   - StatisticOperation<TResultData>::_resultData[i]._result = a[i] * a[i];
  338 + StatisticOperation<TResultData>::_resultData[i]._result = NAN;
339 339 else
340 340 StatisticOperation<TResultData>::_resultData[i]._result = StatisticOperation<TResultData>::_resultData[i]._result + a[i] * a[i];
341 341 ++StatisticOperation<TResultData>::_resultData[i]._nbDataProcessed;
... ... @@ -347,7 +347,7 @@ namespace AMDA {
347 347 if (isNAN(a))
348 348 return;
349 349 if (isNAN(StatisticOperation<TResultData>::_resultData._result))
350   - StatisticOperation<TResultData>::_resultData._result = a;
  350 + StatisticOperation<TResultData>::_resultData._result = NAN;
351 351 _dataList.push_back(a);
352 352 }
353 353  
... ... @@ -392,7 +392,7 @@ namespace AMDA {
392 392 if (isNAN(a))
393 393 return;
394 394 if (isNAN(StatisticOperation<TResultData>::_resultData._result))
395   - StatisticOperation<TResultData>::_resultData._result = a;
  395 + StatisticOperation<TResultData>::_resultData._result = NAN;
396 396 _timeDataList.push_back(std::make_pair(time, a));
397 397 }
398 398  
... ...