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

#4013 Create variation bins for ensemble parameters based on current data

Browse Source 
* Rather than having a fixed index.
* This way the variation is more or less always normal distributed.
This commit is contained in:
Gaute Lindkvist
2019-01-29 16:42:04 +01:00
parent 7518a1880a
commit 54b5dc33f4
5 changed files with 124 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -453,16 +453,13 @@ QString RimEnsembleCurveSet::ensembleParameterUiName(const RimEnsembleCurveSet::
QString variationString;
if (paramPair.second.isNumeric())
{
switch (paramPair.second.logarithmicVariationIndex())
switch (paramPair.second.variationBin)
{
case -1:
variationString = QString(" (No variation)");
case 0:
case EnsembleParameter::LOW_VARIATION:
variationString = QString(" (Low variation)");
case EnsembleParameter::MEDIUM_VARIATION:
break;
case 1:
break;
case 2:
case EnsembleParameter::HIGH_VARIATION:
variationString = QString(" (High variation)");
break;
}
@@ -1170,13 +1167,7 @@ std::vector<RimEnsembleCurveSet::NameParameterPair> RimEnsembleCurveSet::ensembl
{
parameterVector.push_back(std::make_pair(parameterName, group->ensembleParameter(parameterName)));
}
// Sort by variation index (highest first) but keep name as sorting parameter when parameters have the same variation index
std::stable_sort(parameterVector.begin(), parameterVector.end(), [](const NameParameterPair& lhs, const NameParameterPair& rhs)
{
return lhs.second.logarithmicVariationIndex() > rhs.second.logarithmicVariationIndex();
});
EnsembleParameter::sortByBinnedVariation(parameterVector);
return parameterVector;
}