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

Refactor: Make a copy of histogram data.

Browse Source
This commit is contained in:
Kristian Bendiksen
2021-05-03 10:16:25 +02:00
parent 01d88030d4
commit 359df8360e
7 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationLibCode/ReservoirDataModel/RigEnsembleFractureStatisticsCalculator.cpp
View File

@@ -106,9 +106,8 @@ RigHistogramData RigEnsembleFractureStatisticsCalculator::createStatisticsData(
double mean;
RigStatisticsMath::calculateStatisticsCurves( samples, &histogramData.p10, &p50, &histogramData.p90, &mean );
// TODO: this leaks memory: api assume the the histogram is owned by someone else (which is kind-of-strange)
std::vector<size_t>* histogram = new std::vector<size_t>();
RigHistogramCalculator histogramCalculator( histogramData.min, histogramData.max, 20, histogram );
std::vector<size_t> histogram;
RigHistogramCalculator histogramCalculator( histogramData.min, histogramData.max, 20, &histogram );
for ( auto s : samples )
histogramCalculator.addValue( s );

3
ApplicationLibCode/ReservoirDataModel/RigHistogramData.cpp
View File

@@ -31,7 +31,6 @@ RigHistogramData::RigHistogramData()
, mean( std::numeric_limits<double>::infinity() )
, weightedMean( std::numeric_limits<double>::infinity() )
, sum( 0.0 )
, histogram( nullptr )
{
}
@@ -56,5 +55,5 @@ bool RigHistogramData::isValid( double parameter ) const
//--------------------------------------------------------------------------------------------------
bool RigHistogramData::isHistogramVectorValid() const
{
return histogram && histogram->size() > 0 && isMinMaxValid();
return histogram.size() > 0 && isMinMaxValid();
}

16
ApplicationLibCode/ReservoirDataModel/RigHistogramData.h
View File

@@ -29,14 +29,14 @@ class RigHistogramData
public:
RigHistogramData();
double min;
double max;
double p10;
double p90;
double mean;
double sum;
double weightedMean;
const std::vector<size_t>* histogram;
double min;
double max;
double p10;
double p90;
double mean;
double sum;
double weightedMean;
std::vector<size_t> histogram;
bool isMinMaxValid() const;
bool isHistogramVectorValid() const;