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

#7493 Use enum for statistics types.

Browse Source
This commit is contained in:
Kristian Bendiksen 2021-03-24 12:03:19 +01:00
parent e3852e5d6e
commit 9af2389ced
2 changed files with 59 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ApplicationLibCode/ProjectDataModel/Completions/RimFractureGroupStatistics.cpp
View File

@ -29,12 +29,30 @@
#include "RifCsvDataTableFormatter.h" #include "RifCsvDataTableFormatter.h"
#include "RifStimPlanXmlReader.h" #include "RifStimPlanXmlReader.h"
#include "cafAppEnum.h"
#include "cafPdmUiTextEditor.h" #include "cafPdmUiTextEditor.h"
#include <cmath> #include <cmath>
#include <QFile> #include <QFile>
namespace caf
{
template <>
void caf::AppEnum<RimFractureGroupStatistics::StatisticsType>::setUp()
{
addItem( RimFractureGroupStatistics::StatisticsType::MEAN, "MEAN", "Mean" );
addItem( RimFractureGroupStatistics::StatisticsType::MIN, "MIN", "Minimum" );
addItem( RimFractureGroupStatistics::StatisticsType::MAX, "MAX", "Maximum" );
addItem( RimFractureGroupStatistics::StatisticsType::P10, "P10", "P10" );
addItem( RimFractureGroupStatistics::StatisticsType::P50, "P50", "P50" );
addItem( RimFractureGroupStatistics::StatisticsType::P90, "P90", "P90" );
addItem( RimFractureGroupStatistics::StatisticsType::OCCURRENCE, "OCCURRENCE", "Occurrence" );
setDefault( RimFractureGroupStatistics::StatisticsType::MEAN );
}
} // namespace caf
CAF_PDM_SOURCE_INIT( RimFractureGroupStatistics, "FractureGroupStatistics" ); CAF_PDM_SOURCE_INIT( RimFractureGroupStatistics, "FractureGroupStatistics" );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -143,16 +161,16 @@ void RimFractureGroupStatistics::computeStatistics()
std::vector<std::vector<double>> samples( numSamplesX * numSamplesY ); std::vector<std::vector<double>> samples( numSamplesX * numSamplesY );
sampleAllGrids( fractureGrids, samples, minX, minY, numSamplesX, numSamplesY, sampleDistanceX, sampleDistanceY ); sampleAllGrids( fractureGrids, samples, minX, minY, numSamplesX, numSamplesY, sampleDistanceX, sampleDistanceY );
std::map<QString, std::shared_ptr<RigSlice2D>> statisticsGrids; std::map<RimFractureGroupStatistics::StatisticsType, std::shared_ptr<RigSlice2D>> statisticsGrids;
generateStatisticsGrids( samples, numSamplesX, numSamplesY, statisticsGrids ); generateStatisticsGrids( samples, numSamplesX, numSamplesY, statisticsGrids );
writeStatisticsToCsv( "/tmp/mean.csv", *statisticsGrids["mean"] ); for ( size_t i = 0; i < caf::AppEnum<RimFractureGroupStatistics::StatisticsType>::size(); ++i )
writeStatisticsToCsv( "/tmp/min.csv", *statisticsGrids["min"] ); {
writeStatisticsToCsv( "/tmp/max.csv", *statisticsGrids["max"] ); caf::AppEnum<RimFractureGroupStatistics::StatisticsType> t =
writeStatisticsToCsv( "/tmp/p10.csv", *statisticsGrids["p10"] ); caf::AppEnum<RimFractureGroupStatistics::StatisticsType>::fromIndex( i );
writeStatisticsToCsv( "/tmp/p50.csv", *statisticsGrids["p50"] ); QString text = t.text();
writeStatisticsToCsv( "/tmp/p90.csv", *statisticsGrids["p90"] ); writeStatisticsToCsv( "/tmp/" + text + ".csv", *statisticsGrids[t.value()] );
writeStatisticsToCsv( "/tmp/occurrence.csv", *statisticsGrids["occurrence"] ); }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -381,17 +399,19 @@ bool RimFractureGroupStatistics::writeStatisticsToCsv( const QString& filePath,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimFractureGroupStatistics::generateStatisticsGrids( const std::vector<std::vector<double>>& samples, void RimFractureGroupStatistics::generateStatisticsGrids(
const std::vector<std::vector<double>>& samples,
int numSamplesX, int numSamplesX,
int numSamplesY, int numSamplesY,
std::map<QString, std::shared_ptr<RigSlice2D>>& statisticsGrids ) std::map<RimFractureGroupStatistics::StatisticsType, std::shared_ptr<RigSlice2D>>& statisticsGrids )
{ {
std::vector<QString> names = { "mean", "max", "min", "p10", "p50", "p90", "occurrence" }; for ( size_t i = 0; i < caf::AppEnum<RimFractureGroupStatistics::StatisticsType>::size(); ++i )
for ( auto name : names )
{ {
std::shared_ptr<RigSlice2D> grid = std::make_shared<RigSlice2D>( numSamplesX, numSamplesY ); std::shared_ptr<RigSlice2D> grid = std::make_shared<RigSlice2D>( numSamplesX, numSamplesY );
statisticsGrids[name] = grid;
caf::AppEnum<RimFractureGroupStatistics::StatisticsType> t =
caf::AppEnum<RimFractureGroupStatistics::StatisticsType>::fromIndex( i );
statisticsGrids[t.value()] = grid;
} }
for ( int y = 0; y < numSamplesY; y++ ) for ( int y = 0; y < numSamplesY; y++ )
@ -407,20 +427,20 @@ void RimFractureGroupStatistics::generateStatisticsGrids( const std::vector<std:
double dev; double dev;
RigStatisticsMath::calculateBasicStatistics( samples[idx], &min, &max, &sum, &range, &mean, &dev ); RigStatisticsMath::calculateBasicStatistics( samples[idx], &min, &max, &sum, &range, &mean, &dev );
statisticsGrids["mean"]->setValue( x, y, mean ); statisticsGrids[RimFractureGroupStatistics::StatisticsType::MEAN]->setValue( x, y, mean );
statisticsGrids["min"]->setValue( x, y, min ); statisticsGrids[RimFractureGroupStatistics::StatisticsType::MIN]->setValue( x, y, min );
statisticsGrids["max"]->setValue( x, y, max ); statisticsGrids[RimFractureGroupStatistics::StatisticsType::MAX]->setValue( x, y, max );
double p10; double p10;
double p50; double p50;
double p90; double p90;
RigStatisticsMath::calculateStatisticsCurves( samples[idx], &p10, &p50, &p90, &mean ); RigStatisticsMath::calculateStatisticsCurves( samples[idx], &p10, &p50, &p90, &mean );
statisticsGrids["p10"]->setValue( x, y, p10 ); statisticsGrids[RimFractureGroupStatistics::StatisticsType::P10]->setValue( x, y, p10 );
statisticsGrids["p50"]->setValue( x, y, p50 ); statisticsGrids[RimFractureGroupStatistics::StatisticsType::P50]->setValue( x, y, p50 );
statisticsGrids["p90"]->setValue( x, y, p90 ); statisticsGrids[RimFractureGroupStatistics::StatisticsType::P90]->setValue( x, y, p90 );
statisticsGrids["occurrence"]->setValue( x, y, samples[idx].size() ); statisticsGrids[RimFractureGroupStatistics::StatisticsType::OCCURRENCE]->setValue( x, y, samples[idx].size() );
} }
} }
} }

16
ApplicationLibCode/ProjectDataModel/Completions/RimFractureGroupStatistics.h
View File

@ -34,6 +34,17 @@ class RimFractureGroupStatistics : public RimNamedObject
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
enum class StatisticsType
{
MEAN,
MIN,
MAX,
P10,
P50,
P90,
OCCURRENCE
};
RimFractureGroupStatistics(); RimFractureGroupStatistics();
~RimFractureGroupStatistics() override; ~RimFractureGroupStatistics() override;
void addFilePath( const QString& filePath ); void addFilePath( const QString& filePath );
@ -72,10 +83,11 @@ protected:
double sampleDistanceX, double sampleDistanceX,
double sampleDistanceY ); double sampleDistanceY );
static void generateStatisticsGrids( const std::vector<std::vector<double>>& samples, static void generateStatisticsGrids(
const std::vector<std::vector<double>>& samples,
int numSamplesX, int numSamplesX,
int numSamplesY, int numSamplesY,
std::map<QString, std::shared_ptr<RigSlice2D>>& statisticsGrids ); std::map<RimFractureGroupStatistics::StatisticsType, std::shared_ptr<RigSlice2D>>& statisticsGrids );
static bool writeStatisticsToCsv( const QString& filePath, const RigSlice2D& samples ); static bool writeStatisticsToCsv( const QString& filePath, const RigSlice2D& samples );