From 4daaa159ffcbff079f5e406e9869c80fc5eba4f6 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 5 Nov 2026 15:52:36 +0100 Subject: [PATCH] #15084: Use shared statistics type enum Add RiaDefines::StatisticsType and use it in Summary Table, statistics contour map and ensemble surface statistics instead of three separate enums with the same values. --- .../Application/CMakeLists_files.cmake | 1 + .../Application/RiaStatisticsDefines.cpp | 36 ++++++++++++++++++ .../Application/RiaStatisticsDefines.h | 35 +++++++++++++++++ ...icCreateSurfaceIntersectionBandFeature.cpp | 8 ++-- .../ContourMap/RimStatisticsContourMap.cpp | 36 ++++++------------ .../ContourMap/RimStatisticsContourMap.h | 20 +++------- .../RimStatisticsContourMapProjection.h | 2 +- .../Summary/RimSummaryTable.cpp | 38 +++++++------------ .../Summary/RimSummaryTable.h | 29 +++++--------- .../Surfaces/RimEnsembleStatisticsSurface.cpp | 9 ++--- .../Surfaces/RimEnsembleStatisticsSurface.h | 6 +-- .../Surfaces/RimEnsembleSurface.cpp | 14 +++---- .../Surfaces/RimEnsembleSurface.h | 2 +- .../RigSurfaceStatisticsCalculator.cpp | 29 ++++---------- .../Surface/RigSurfaceStatisticsCalculator.h | 12 +----- .../RimStatisticsContourMap-Test.cpp | 14 +++---- 16 files changed, 149 insertions(+), 142 deletions(-) create mode 100644 ApplicationLibCode/Application/RiaStatisticsDefines.cpp create mode 100644 ApplicationLibCode/Application/RiaStatisticsDefines.h diff --git a/ApplicationLibCode/Application/CMakeLists_files.cmake b/ApplicationLibCode/Application/CMakeLists_files.cmake index 0135f19aa2..5138780c68 100644 --- a/ApplicationLibCode/Application/CMakeLists_files.cmake +++ b/ApplicationLibCode/Application/CMakeLists_files.cmake @@ -46,6 +46,7 @@ set(SOURCE_GROUP_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/RiaQuickAccessScheduler.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaGridDefines.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaModelExportDefines.cpp + ${CMAKE_CURRENT_LIST_DIR}/RiaStatisticsDefines.cpp ) list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES}) diff --git a/ApplicationLibCode/Application/RiaStatisticsDefines.cpp b/ApplicationLibCode/Application/RiaStatisticsDefines.cpp new file mode 100644 index 0000000000..b0e93984c9 --- /dev/null +++ b/ApplicationLibCode/Application/RiaStatisticsDefines.cpp @@ -0,0 +1,36 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2026 Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RiaStatisticsDefines.h" + +#include "cafAppEnum.h" + +namespace caf +{ +template <> +void caf::AppEnum::setUp() +{ + addItem( RiaDefines::StatisticsType::MIN, "MIN", "Minimum" ); + addItem( RiaDefines::StatisticsType::P90, "P90", "P90" ); + addItem( RiaDefines::StatisticsType::P50, "P50", "P50" ); + addItem( RiaDefines::StatisticsType::MEAN, "MEAN", "Mean" ); + addItem( RiaDefines::StatisticsType::P10, "P10", "P10" ); + addItem( RiaDefines::StatisticsType::MAX, "MAX", "Maximum" ); + setDefault( RiaDefines::StatisticsType::MEAN ); +} +} // namespace caf diff --git a/ApplicationLibCode/Application/RiaStatisticsDefines.h b/ApplicationLibCode/Application/RiaStatisticsDefines.h new file mode 100644 index 0000000000..a97f6ef3a8 --- /dev/null +++ b/ApplicationLibCode/Application/RiaStatisticsDefines.h @@ -0,0 +1,35 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2026 Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +namespace RiaDefines +{ +// Statistics computed across ensemble realizations. Percentiles use the oil industry convention: P90 is the low +// estimate and P10 is the high estimate. +enum class StatisticsType +{ + MIN, + P90, + P50, + MEAN, + P10, + MAX +}; + +}; // namespace RiaDefines diff --git a/ApplicationLibCode/Commands/RicCreateSurfaceIntersectionBandFeature.cpp b/ApplicationLibCode/Commands/RicCreateSurfaceIntersectionBandFeature.cpp index 44cebd262a..8f0021c754 100644 --- a/ApplicationLibCode/Commands/RicCreateSurfaceIntersectionBandFeature.cpp +++ b/ApplicationLibCode/Commands/RicCreateSurfaceIntersectionBandFeature.cpp @@ -70,8 +70,8 @@ void RicCreateSurfaceIntersectionBandFeature::onActionTriggered( bool isChecked { // Create min/max band { - auto surf1 = firstEnsembleSurface->findStatisticsSurface( RigSurfaceStatisticsCalculator::StatisticsType::MIN ); - auto surf2 = firstEnsembleSurface->findStatisticsSurface( RigSurfaceStatisticsCalculator::StatisticsType::MAX ); + auto surf1 = firstEnsembleSurface->findStatisticsSurface( RiaDefines::StatisticsType::MIN ); + auto surf2 = firstEnsembleSurface->findStatisticsSurface( RiaDefines::StatisticsType::MAX ); if ( surf2 && surf1 ) { @@ -93,8 +93,8 @@ void RicCreateSurfaceIntersectionBandFeature::onActionTriggered( bool isChecked // Create p10/p90 band { - auto surf1 = firstEnsembleSurface->findStatisticsSurface( RigSurfaceStatisticsCalculator::StatisticsType::P10 ); - auto surf2 = firstEnsembleSurface->findStatisticsSurface( RigSurfaceStatisticsCalculator::StatisticsType::P90 ); + auto surf1 = firstEnsembleSurface->findStatisticsSurface( RiaDefines::StatisticsType::P10 ); + auto surf2 = firstEnsembleSurface->findStatisticsSurface( RiaDefines::StatisticsType::P90 ); if ( surf2 && surf1 ) { diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp index 248df5ff12..f9e16ba53e 100644 --- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp +++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp @@ -158,18 +158,6 @@ void caf::AppEnum::setUp() addItem( RimStatisticsContourMap::GridImportMode::INDIVIDUAL_GRIDS, "INDIVIDUAL_GRIDS", "Import All Grids" ); setDefault( RimStatisticsContourMap::GridImportMode::SHARED_GRID ); } - -template <> -void caf::AppEnum::setUp() -{ - addItem( RimStatisticsContourMap::StatisticsType::P10, "P10", "P10" ); - addItem( RimStatisticsContourMap::StatisticsType::P50, "P50", "P50" ); - addItem( RimStatisticsContourMap::StatisticsType::P90, "P90", "P90" ); - addItem( RimStatisticsContourMap::StatisticsType::MEAN, "MEAN", "Mean" ); - addItem( RimStatisticsContourMap::StatisticsType::MIN, "MIN", "Minimum" ); - addItem( RimStatisticsContourMap::StatisticsType::MAX, "MAX", "Maximum" ); - setDefault( RimStatisticsContourMap::StatisticsType::MEAN ); -} }; // namespace caf //-------------------------------------------------------------------------------------------------- @@ -614,12 +602,12 @@ void RimStatisticsContourMap::doStatisticsCalculation( TimestepResultsMap& times if ( RigStatisticsTools::isValidNumber( maxValue ) && maxValue > -std::numeric_limits::max() ) maxResults[i] = maxValue; } - m_timeResults[timeStep][StatisticsType::P10] = p10Results; - m_timeResults[timeStep][StatisticsType::P50] = p50Results; - m_timeResults[timeStep][StatisticsType::P90] = p90Results; - m_timeResults[timeStep][StatisticsType::MEAN] = meanResults; - m_timeResults[timeStep][StatisticsType::MIN] = minResults; - m_timeResults[timeStep][StatisticsType::MAX] = maxResults; + m_timeResults[timeStep][RiaDefines::StatisticsType::P10] = p10Results; + m_timeResults[timeStep][RiaDefines::StatisticsType::P50] = p50Results; + m_timeResults[timeStep][RiaDefines::StatisticsType::P90] = p90Results; + m_timeResults[timeStep][RiaDefines::StatisticsType::MEAN] = meanResults; + m_timeResults[timeStep][RiaDefines::StatisticsType::MIN] = minResults; + m_timeResults[timeStep][RiaDefines::StatisticsType::MAX] = maxResults; } } @@ -958,7 +946,7 @@ RigContourMapGrid* RimStatisticsContourMap::contourMapGrid() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimStatisticsContourMap::result( size_t timeStep, StatisticsType statisticsType ) const +std::vector RimStatisticsContourMap::result( size_t timeStep, RiaDefines::StatisticsType statisticsType ) const { auto realTimeSteps = selectedTimeSteps(); if ( timeStep >= realTimeSteps.size() ) return {}; @@ -1198,12 +1186,12 @@ bool RimStatisticsContourMap::loadCachedResults() const cvf::Vec2ui& mapSize = contourMapGrid->mapSize(); - std::map>> timeResults; + std::map>> timeResults; for ( int timeStep : m_cacheTimeSteps() ) { - for ( size_t statisticsTypeIndex = 0; statisticsTypeIndex < caf::AppEnum::size(); ++statisticsTypeIndex ) + for ( size_t statisticsTypeIndex = 0; statisticsTypeIndex < caf::AppEnum::size(); ++statisticsTypeIndex ) { - const StatisticsType statisticsType = caf::AppEnum::fromIndex( statisticsTypeIndex ); + const RiaDefines::StatisticsType statisticsType = caf::AppEnum::fromIndex( statisticsTypeIndex ); const QString fileName = cacheFileName( m_cacheFileBaseName(), statisticsType, timeStep ); @@ -1352,10 +1340,10 @@ void RimStatisticsContourMap::setupBeforeSave() /// Full path of the cache file for one statistics type and time step, e.g. /// "_cache/Ensemble_Contour_Map_1-1a2b3c4d_MEAN_36.gri" //-------------------------------------------------------------------------------------------------- -QString RimStatisticsContourMap::cacheFileName( const QString& baseName, StatisticsType statisticsType, size_t timeStep ) const +QString RimStatisticsContourMap::cacheFileName( const QString& baseName, RiaDefines::StatisticsType statisticsType, size_t timeStep ) const { return QString( "%1/%2_%3_%4.gri" ) - .arg( getCacheDirectoryPath(), baseName, caf::AppEnum::text( statisticsType ), QString::number( timeStep ) ); + .arg( getCacheDirectoryPath(), baseName, caf::AppEnum::text( statisticsType ), QString::number( timeStep ) ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.h b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.h index 3c5cd17333..00baf8272f 100644 --- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.h +++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.h @@ -20,6 +20,8 @@ #include "RimNamedObject.h" +#include "RiaStatisticsDefines.h" + #include "ContourMap/RimContourMapResolutionTools.h" #include "RimContourMapProjection.h" @@ -54,16 +56,6 @@ class RimStatisticsContourMap : public RimNamedObject CAF_PDM_HEADER_INIT; public: - enum class StatisticsType - { - P10, - P50, - P90, - MEAN, - MIN, - MAX - }; - enum class GridImportMode { SHARED_GRID, @@ -82,7 +74,7 @@ public: QString ensembleName() const; RigContourMapGrid* contourMapGrid() const; - std::vector result( size_t timeStep, StatisticsType statisticsType ) const; + std::vector result( size_t timeStep, RiaDefines::StatisticsType statisticsType ) const; void addView( RimStatisticsContourMapView* view ); std::vector views() const; @@ -126,7 +118,7 @@ private: QString computeCacheValidityKey() const; bool loadCachedResults(); bool writeCachedResults( const QString& baseName ) const; - QString cacheFileName( const QString& baseName, StatisticsType statisticsType, size_t timeStep ) const; + QString cacheFileName( const QString& baseName, RiaDefines::StatisticsType statisticsType, size_t timeStep ) const; QString getValidCacheFileBaseName() const; void deleteCacheFiles() const; void clearCacheFields(); @@ -166,8 +158,8 @@ private: caf::PdmField> m_cacheExpandedBoundingBox; caf::PdmField> m_cacheMapSize; - std::unique_ptr m_contourMapGrid; - std::map>> m_timeResults; + std::unique_ptr m_contourMapGrid; + std::map>> m_timeResults; caf::PdmChildArrayField m_views; diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMapProjection.h b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMapProjection.h index e597e955e4..f2d332a5f1 100644 --- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMapProjection.h +++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMapProjection.h @@ -83,7 +83,7 @@ protected: void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; protected: - caf::PdmField> m_statisticsType; + caf::PdmField> m_statisticsType; QString m_currentResultName; }; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.cpp index 68426f41b1..aef836be79 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.cpp @@ -71,18 +71,6 @@ void AppEnum::setUp() addItem( RimSummaryTable::DataSource::ENSEMBLE_STATISTICS, "ENSEMBLE_STATISTICS", "Ensemble Statistics" ); setDefault( RimSummaryTable::DataSource::SINGLE_CASE ); } - -template <> -void AppEnum::setUp() -{ - addItem( RimSummaryTable::EnsembleStatistic::MIN, "MIN", "Min" ); - addItem( RimSummaryTable::EnsembleStatistic::P90, "P90", "P90" ); - addItem( RimSummaryTable::EnsembleStatistic::P50, "P50", "P50" ); - addItem( RimSummaryTable::EnsembleStatistic::MEAN, "MEAN", "Mean" ); - addItem( RimSummaryTable::EnsembleStatistic::P10, "P10", "P10" ); - addItem( RimSummaryTable::EnsembleStatistic::MAX, "MAX", "Max" ); - setDefault( RimSummaryTable::EnsembleStatistic::MEAN ); -} } // namespace caf //-------------------------------------------------------------------------------------------------- @@ -932,29 +920,29 @@ const RimSummaryTable::EnsembleStatisticsData& RimSummaryTable::ensembleStatisti m_ensembleStatisticsCase->calculate( m_ensemble->allSummaryCases(), address, false, { 0, 100 } ); // Percentiles use the switched (oil industry) convention: percentile 0 is the maximum, percentile 100 is the minimum - const auto statisticsAddress = [&address]( EnsembleStatistic statistic ) + const auto statisticsAddress = [&address]( RiaDefines::StatisticsType statistic ) { auto adr = address; switch ( statistic ) { - case EnsembleStatistic::MIN: + case RiaDefines::StatisticsType::MIN: adr.setStatisticsType( RifEclipseSummaryAddressDefines::StatisticsType::CUSTOM ); adr.setPercentile( 100 ); break; - case EnsembleStatistic::MAX: + case RiaDefines::StatisticsType::MAX: adr.setStatisticsType( RifEclipseSummaryAddressDefines::StatisticsType::CUSTOM ); adr.setPercentile( 0 ); break; - case EnsembleStatistic::P10: + case RiaDefines::StatisticsType::P10: adr.setStatisticsType( RifEclipseSummaryAddressDefines::StatisticsType::P10 ); break; - case EnsembleStatistic::P50: + case RiaDefines::StatisticsType::P50: adr.setStatisticsType( RifEclipseSummaryAddressDefines::StatisticsType::P50 ); break; - case EnsembleStatistic::P90: + case RiaDefines::StatisticsType::P90: adr.setStatisticsType( RifEclipseSummaryAddressDefines::StatisticsType::P90 ); break; - case EnsembleStatistic::MEAN: + case RiaDefines::StatisticsType::MEAN: adr.setStatisticsType( RifEclipseSummaryAddressDefines::StatisticsType::MEAN ); break; } @@ -966,12 +954,12 @@ const RimSummaryTable::EnsembleStatisticsData& RimSummaryTable::ensembleStatisti // The unit is read from the first realization, which only knows the plain (non-statistics) address data.unitName = m_ensembleStatisticsCase->unitName( address ); - for ( auto statistic : { EnsembleStatistic::MIN, - EnsembleStatistic::P90, - EnsembleStatistic::P50, - EnsembleStatistic::MEAN, - EnsembleStatistic::P10, - EnsembleStatistic::MAX } ) + for ( auto statistic : { RiaDefines::StatisticsType::MIN, + RiaDefines::StatisticsType::P90, + RiaDefines::StatisticsType::P50, + RiaDefines::StatisticsType::MEAN, + RiaDefines::StatisticsType::P10, + RiaDefines::StatisticsType::MAX } ) { auto [isOk, values] = m_ensembleStatisticsCase->values( statisticsAddress( statistic ) ); data.values[statistic] = std::move( values ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.h index 52b70ddab4..921c962cee 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.h @@ -22,6 +22,7 @@ #include "RimPlotWindow.h" #include "RiaDateTimeDefines.h" +#include "RiaStatisticsDefines.h" #include "RifEclipseSummaryAddress.h" #include "RifEclipseSummaryAddressDefines.h" @@ -69,16 +70,6 @@ public: ENSEMBLE_STATISTICS }; - enum class EnsembleStatistic - { - MIN, - P90, - P50, - MEAN, - P10, - MAX - }; - public: RimSummaryTable(); ~RimSummaryTable() override; @@ -147,12 +138,12 @@ private: // Matrix plot for visualizing table data QPointer m_matrixPlotWidget; - caf::PdmField m_tableName; - caf::PdmField m_isAutomaticName; - caf::PdmField> m_dataSource; - caf::PdmPtrField m_case; - caf::PdmPtrField m_ensemble; - caf::PdmField> m_ensembleStatistic; + caf::PdmField m_tableName; + caf::PdmField m_isAutomaticName; + caf::PdmField> m_dataSource; + caf::PdmPtrField m_case; + caf::PdmPtrField m_ensemble; + caf::PdmField> m_ensembleStatistic; caf::PdmField> m_category; caf::PdmField m_vector; @@ -188,9 +179,9 @@ private: struct EnsembleStatisticsData { - std::vector timeSteps; - std::map> values; - std::string unitName; + std::vector timeSteps; + std::map> values; + std::string unitName; }; std::map m_ensembleStatisticsCache; diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp index 8dba313a7a..99b3daa44c 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp @@ -51,7 +51,7 @@ RimEnsembleStatisticsSurface::~RimEnsembleStatisticsSurface() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimEnsembleStatisticsSurface::setStatisticsType( RigSurfaceStatisticsCalculator::StatisticsType statisticsType ) +void RimEnsembleStatisticsSurface::setStatisticsType( RiaDefines::StatisticsType statisticsType ) { m_statisticsType = statisticsType; @@ -61,7 +61,7 @@ void RimEnsembleStatisticsSurface::setStatisticsType( RigSurfaceStatisticsCalcul //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigSurfaceStatisticsCalculator::StatisticsType RimEnsembleStatisticsSurface::statisticsType() const +RiaDefines::StatisticsType RimEnsembleStatisticsSurface::statisticsType() const { return m_statisticsType(); } @@ -71,7 +71,7 @@ RigSurfaceStatisticsCalculator::StatisticsType RimEnsembleStatisticsSurface::sta //-------------------------------------------------------------------------------------------------- QString RimEnsembleStatisticsSurface::fullName() const { - return caf::AppEnum::uiText( m_statisticsType.v() ); + return caf::AppEnum::uiText( m_statisticsType.v() ); } //-------------------------------------------------------------------------------------------------- @@ -131,8 +131,7 @@ std::vector RimEnsembleStatisticsSurface::extractStatisticalDepthFor CAF_ASSERT( surface ); std::vector verts = surface->vertices(); - const auto& meanValues = - surface->propertyValues( caf::AppEnum::text( m_statisticsType.v() ) ); + const auto& meanValues = surface->propertyValues( caf::AppEnum::text( m_statisticsType.v() ) ); for ( size_t i = 0; i < verts.size(); i++ ) { diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.h b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.h index a013ba4436..a165eb43c2 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.h +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.h @@ -36,8 +36,8 @@ public: bool onLoadData() override; RimSurface* createCopy() override; - void setStatisticsType( RigSurfaceStatisticsCalculator::StatisticsType statisticsType ); - RigSurfaceStatisticsCalculator::StatisticsType statisticsType() const; + void setStatisticsType( RiaDefines::StatisticsType statisticsType ); + RiaDefines::StatisticsType statisticsType() const; QString fullName() const override; @@ -49,5 +49,5 @@ protected: void clearCachedNativeData() override; private: - caf::PdmField> m_statisticsType; + caf::PdmField> m_statisticsType; }; diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp index a4b3744d77..d78a63197a 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp @@ -48,12 +48,12 @@ RimEnsembleSurface::RimEnsembleSurface() CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSet, "FilterEnsembleCurveSet", "Filter by Ensemble Curve Set" ); - std::vector statisticsTypes = { RigSurfaceStatisticsCalculator::StatisticsType::MIN, - RigSurfaceStatisticsCalculator::StatisticsType::MAX, - RigSurfaceStatisticsCalculator::StatisticsType::MEAN, - RigSurfaceStatisticsCalculator::StatisticsType::P10, - RigSurfaceStatisticsCalculator::StatisticsType::P50, - RigSurfaceStatisticsCalculator::StatisticsType::P90 }; + std::vector statisticsTypes = { RiaDefines::StatisticsType::MIN, + RiaDefines::StatisticsType::MAX, + RiaDefines::StatisticsType::MEAN, + RiaDefines::StatisticsType::P10, + RiaDefines::StatisticsType::P50, + RiaDefines::StatisticsType::P90 }; for ( auto s : statisticsTypes ) { @@ -294,7 +294,7 @@ void RimEnsembleSurface::loadData() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimSurface* RimEnsembleSurface::findStatisticsSurface( RigSurfaceStatisticsCalculator::StatisticsType statisticsType ) +RimSurface* RimEnsembleSurface::findStatisticsSurface( RiaDefines::StatisticsType statisticsType ) { for ( auto s : surfaces() ) { diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.h b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.h index 78a1f528a4..fb63863c20 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.h +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.h @@ -53,7 +53,7 @@ public: void loadData() override; - RimSurface* findStatisticsSurface( RigSurfaceStatisticsCalculator::StatisticsType statisticsType ); + RimSurface* findStatisticsSurface( RiaDefines::StatisticsType statisticsType ); protected: QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override; diff --git a/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.cpp b/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.cpp index e445a098a1..aabce53a2c 100644 --- a/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.cpp +++ b/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.cpp @@ -27,21 +27,6 @@ #include -namespace caf -{ -template <> -void caf::AppEnum::setUp() -{ - addItem( RigSurfaceStatisticsCalculator::StatisticsType::MEAN, "MEAN", "Mean" ); - addItem( RigSurfaceStatisticsCalculator::StatisticsType::MIN, "MIN", "Minimum" ); - addItem( RigSurfaceStatisticsCalculator::StatisticsType::MAX, "MAX", "Maximum" ); - addItem( RigSurfaceStatisticsCalculator::StatisticsType::P10, "P10", "P10" ); - addItem( RigSurfaceStatisticsCalculator::StatisticsType::P50, "P50", "P50" ); - addItem( RigSurfaceStatisticsCalculator::StatisticsType::P90, "P90", "P90" ); - setDefault( RigSurfaceStatisticsCalculator::StatisticsType::MEAN ); -} -}; // namespace caf - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -102,14 +87,14 @@ cvf::ref RigSurfaceStatisticsCalculator::computeStatistics( const st cvf::ref statSurface = cvf::make_ref(); statSurface->setTriangleData( surfaces[0]->triangleIndices(), surfaces[0]->vertices() ); - auto enumToText = []( auto statisticsType ) { return caf::AppEnum::text( statisticsType ); }; + auto enumToText = []( auto statisticsType ) { return caf::AppEnum::text( statisticsType ); }; - statSurface->addVertexResult( enumToText( StatisticsType::MEAN ), meanValues ); - statSurface->addVertexResult( enumToText( StatisticsType::MIN ), minValues ); - statSurface->addVertexResult( enumToText( StatisticsType::MAX ), maxValues ); - statSurface->addVertexResult( enumToText( StatisticsType::P10 ), p10Values ); - statSurface->addVertexResult( enumToText( StatisticsType::P50 ), p50Values ); - statSurface->addVertexResult( enumToText( StatisticsType::P90 ), p90Values ); + statSurface->addVertexResult( enumToText( RiaDefines::StatisticsType::MEAN ), meanValues ); + statSurface->addVertexResult( enumToText( RiaDefines::StatisticsType::MIN ), minValues ); + statSurface->addVertexResult( enumToText( RiaDefines::StatisticsType::MAX ), maxValues ); + statSurface->addVertexResult( enumToText( RiaDefines::StatisticsType::P10 ), p10Values ); + statSurface->addVertexResult( enumToText( RiaDefines::StatisticsType::P50 ), p50Values ); + statSurface->addVertexResult( enumToText( RiaDefines::StatisticsType::P90 ), p90Values ); return statSurface; } diff --git a/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.h b/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.h index 2cc3f8da62..f72b01476d 100644 --- a/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.h +++ b/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.h @@ -20,6 +20,8 @@ #include "RigSurface.h" +#include "RiaStatisticsDefines.h" + #include "cvfObject.h" #include @@ -31,16 +33,6 @@ class RigSurfaceStatisticsCalculator { public: - enum class StatisticsType - { - MIN, - MAX, - P10, - P50, - P90, - MEAN - }; - static cvf::ref computeStatistics( const std::vector>& surfaces ); static bool areSurfacesSameSize( const std::vector>& surfaces ); }; diff --git a/ApplicationLibCode/UnitTests/RimStatisticsContourMap-Test.cpp b/ApplicationLibCode/UnitTests/RimStatisticsContourMap-Test.cpp index 0a324ab9ee..ed98cddcd6 100644 --- a/ApplicationLibCode/UnitTests/RimStatisticsContourMap-Test.cpp +++ b/ApplicationLibCode/UnitTests/RimStatisticsContourMap-Test.cpp @@ -211,12 +211,12 @@ std::vector verifyDataFilterIsApplied( GridModeType gridMode, GridImport if ( !map ) return {}; RimStatisticsContourMap::computeStatisticsForMaps( { map } ); - const auto unfiltered = map->result( 0, RimStatisticsContourMap::StatisticsType::MEAN ); + const auto unfiltered = map->result( 0, RiaDefines::StatisticsType::MEAN ); EXPECT_GT( countValidValues( unfiltered ), 0u ); setDataFilter( map, addTopLayerFilter( ensemble.get() ) ); RimStatisticsContourMap::computeStatisticsForMaps( { map } ); - const auto filtered = map->result( 0, RimStatisticsContourMap::StatisticsType::MEAN ); + const auto filtered = map->result( 0, RiaDefines::StatisticsType::MEAN ); EXPECT_EQ( unfiltered.size(), filtered.size() ); if ( unfiltered.size() != filtered.size() ) return {}; @@ -229,7 +229,7 @@ std::vector verifyDataFilterIsApplied( GridModeType gridMode, GridImport excludeFilter->setFilterMode( RimCellFilter::EXCLUDE ); setDataFilter( map, excludeFilter ); RimStatisticsContourMap::computeStatisticsForMaps( { map } ); - const auto excluded = map->result( 0, RimStatisticsContourMap::StatisticsType::MEAN ); + const auto excluded = map->result( 0, RiaDefines::StatisticsType::MEAN ); EXPECT_GT( countDifferentValues( filtered, excluded ), 0u ); @@ -338,8 +338,8 @@ TEST( RimStatisticsContourMapTest, StaticResultWithDynamicFilterProducesResultsP RimStatisticsContourMap::computeStatisticsForMaps( { map } ); - const auto resultAtFirstStep = map->result( 0, RimStatisticsContourMap::StatisticsType::MEAN ); - const auto resultAtLastStep = map->result( 1, RimStatisticsContourMap::StatisticsType::MEAN ); + const auto resultAtFirstStep = map->result( 0, RiaDefines::StatisticsType::MEAN ); + const auto resultAtLastStep = map->result( 1, RiaDefines::StatisticsType::MEAN ); EXPECT_GT( countValidValues( resultAtFirstStep ), 0u ); EXPECT_GT( countValidValues( resultAtLastStep ), 0u ); @@ -462,8 +462,8 @@ TEST( RimStatisticsContourMapTest, EnsureResultsComputedMakesGeneratedResultDyna EXPECT_TRUE( ( *resultDefinitionField )()->hasDynamicResult() ); EXPECT_EQ( ( std::vector{ 0, lastTimeStep } ), map->selectedTimeSteps() ); - const auto resultAtFirstStep = map->result( 0, RimStatisticsContourMap::StatisticsType::MEAN ); - const auto resultAtLastStep = map->result( 1, RimStatisticsContourMap::StatisticsType::MEAN ); + const auto resultAtFirstStep = map->result( 0, RiaDefines::StatisticsType::MEAN ); + const auto resultAtLastStep = map->result( 1, RiaDefines::StatisticsType::MEAN ); EXPECT_GT( countValidValues( resultAtFirstStep ), 0u ); EXPECT_GT( countValidValues( resultAtLastStep ), 0u );