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

#7761 Objective Function : Change formula and add several options

Browse Source
This commit is contained in:
Magne Sjaastad
2021-06-09 16:25:19 +02:00
parent c89e00b966
commit 4de91e885b
24 changed files with 883 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetColorManager.cpp
View File

@@ -133,21 +133,13 @@ void RimEnsembleCurveSetColorManager::initializeLegendConfig( RimRegularLegendCo
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSetColorManager::initializeLegendConfig( RimRegularLegendConfig* legendConfig,
std::shared_ptr<RimObjectiveFunction> objectiveFunction,
std::vector<RifEclipseSummaryAddress> vectorSummaryAddresses )
void RimEnsembleCurveSetColorManager::initializeLegendConfig( RimRegularLegendConfig* legendConfig,
RimObjectiveFunction* objectiveFunction,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RifEclipseSummaryAddress>& vectorSummaryAddresses,
const ObjectiveFunctionTimeConfig& timeConfig )
{
double minValue = std::numeric_limits<double>::infinity();
double maxValue = -std::numeric_limits<double>::infinity();
for ( auto value : objectiveFunction->values( vectorSummaryAddresses ) )
{
if ( value != std::numeric_limits<double>::infinity() )
{
if ( value < minValue ) minValue = value;
if ( value > maxValue ) maxValue = value;
}
}
auto [minValue, maxValue] = objectiveFunction->minMaxValues( summaryCases, vectorSummaryAddresses, timeConfig );
legendConfig->setAutomaticRanges( minValue, maxValue, minValue, maxValue );
}
@@ -161,7 +153,7 @@ void RimEnsembleCurveSetColorManager::initializeLegendConfig( RimRegularLegendCo
double minValue = std::numeric_limits<double>::infinity();
double maxValue = -std::numeric_limits<double>::infinity();
for ( auto value : customObjectiveFunction->values() )
for ( auto value : customObjectiveFunction->functionValueForAllCases() )
{
if ( value != std::numeric_limits<double>::infinity() )
{
@@ -210,10 +202,11 @@ cvf::Color3f RimEnsembleCurveSetColorManager::caseColor( const RimRegularLegendC
//--------------------------------------------------------------------------------------------------
cvf::Color3f RimEnsembleCurveSetColorManager::caseColor( const RimRegularLegendConfig* legendConfig,
RimSummaryCase* summaryCase,
std::shared_ptr<RimObjectiveFunction> objectiveFunction,
std::vector<RifEclipseSummaryAddress> vectorSummaryAddresses )
RimObjectiveFunction* objectiveFunction,
std::vector<RifEclipseSummaryAddress> vectorSummaryAddresses,
const ObjectiveFunctionTimeConfig& timeConfig )
{
double value = objectiveFunction->value( summaryCase, vectorSummaryAddresses );
double value = objectiveFunction->value( summaryCase, vectorSummaryAddresses, timeConfig );
if ( value != std::numeric_limits<double>::infinity() )
{
return cvf::Color3f( legendConfig->scalarMapper()->mapToColor( value ) );