#1035 Adjusted the statistics calculators a bit.

This commit is contained in:
Jacob Støren
2016-12-20 11:39:10 +01:00
parent 8f145da725
commit 3c55a86650
4 changed files with 109 additions and 21 deletions

View File

@@ -56,12 +56,14 @@ public:
const std::vector<size_t>& cellScalarValuesHistogram(size_t timeStepIndex);
const std::vector<int>& uniqueCellScalarValues();
const std::vector<int>& uniqueCellScalarValues(size_t timeStepIndex);
private:
void computeHistogramStatisticsIfNeeded();
void computeHistogramStatisticsIfNeeded(size_t timeStepIndex);
void computeUniqueValuesIfNeeded();
void computeUniqueValuesIfNeeded(size_t timeStepIndex);
private:
struct StatisticsValues
@@ -100,11 +102,12 @@ private:
bool m_isValueSumCalculated;
std::vector<size_t> m_histogram;
std::vector<int> m_uniqueValues;
};
StatisticsValues m_statsAllTimesteps;
std::vector<StatisticsValues> m_statsPrTs;
std::vector<int> m_uniqueValues;
cvf::ref<RigStatisticsCalculator> m_statisticsCalculator;
};