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

clang-format: Set column width to 140

Browse Source 
* Set column width to 140
* Use c++20
* Remove redundant virtual
This commit is contained in:
Magne Sjaastad
2023-02-26 10:48:40 +01:00
committed by GitHub
parent 8768e186d8
commit f8c5cf389f
1535 changed files with 10456 additions and 19398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunction.cpp
View File

@@ -117,9 +117,8 @@ double RimCustomObjectiveFunction::value( RimSummaryCase* summaryCase ) const
double value = 0.0;
for ( auto weight : m_weights )
{
double functionValue =
objectiveFunction( weight->objectiveFunction() )
->value( summaryCase, weight->summaryAddresses(), parentCurveSet()->objectiveFunctionTimeConfig() );
double functionValue = objectiveFunction( weight->objectiveFunction() )
->value( summaryCase, weight->summaryAddresses(), parentCurveSet()->objectiveFunctionTimeConfig() );
value += weight->weightValue() * functionValue;
}
@@ -233,10 +232,9 @@ QString RimCustomObjectiveFunction::formulaString( std::vector<RifEclipseSummary
QStringList weightFormulae;
for ( auto weight : weights() )
{
weightFormulae
<< QString( "%0 * %1" )
.arg( weight->weightValue() )
.arg( objectiveFunction( weight->objectiveFunction() )->formulaString( vectorSummaryAddresses ) );
weightFormulae << QString( "%0 * %1" )
.arg( weight->weightValue() )
.arg( objectiveFunction( weight->objectiveFunction() )->formulaString( vectorSummaryAddresses ) );
}
formula += weightFormulae.join( " + " );
return formula;
@@ -269,8 +267,7 @@ void RimCustomObjectiveFunction::onObjectiveFunctionChanged( const caf::SignalEm
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCustomObjectiveFunction::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering,
QString uiConfigName /* = "" */ )
void RimCustomObjectiveFunction::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /* = "" */ )
{
for ( auto weight : weights() )
{
@@ -282,9 +279,7 @@ void RimCustomObjectiveFunction::defineUiTreeOrdering( caf::PdmUiTreeOrdering& u
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCustomObjectiveFunction::defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute )
void RimCustomObjectiveFunction::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
{
if ( field == &m_customFunctionTitle )
{