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

Regression Analysis: Report R-squared (confidence of determination).

Browse Source
This commit is contained in:
Kristian Bendiksen 2023-05-19 10:23:32 +02:00
parent 6a56149d84
commit dc3530ac0b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.cpp
View File

@ -135,9 +135,8 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
if ( m_regressionType == RegressionType::LINEAR ) if ( m_regressionType == RegressionType::LINEAR )
{ {
auto generateRegressionText = []( const regression::LinearRegression& reg ) { auto generateRegressionText = []( const regression::LinearRegression& reg )
return QString( "Linear Regression<br>Intercept: %1<br>Slope: %2<br><br>r = %2x + %1" ).arg( reg.intercept() ).arg( reg.slope() ); { return QString( "r = %2x + %1" ).arg( reg.intercept() ).arg( reg.slope() ) + QString( "<br>R<sup>2</sup> = %1" ).arg( reg.r2() ); };
};
regression::LinearRegression linearRegression; regression::LinearRegression linearRegression;
linearRegression.fit( timeStepsD, values ); linearRegression.fit( timeStepsD, values );
@ -148,7 +147,7 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
{ {
auto generateRegressionText = []( const regression::PolynominalRegression& reg ) auto generateRegressionText = []( const regression::PolynominalRegression& reg )
{ {
QString str = "Polynominal Regression<br><br>r = "; QString str = "r = ";
std::vector<double> coeffs = reg.coeffisients(); std::vector<double> coeffs = reg.coeffisients();
QStringList parts; QStringList parts;
@ -169,7 +168,7 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
} }
} }
return str + parts.join( " + " ); return str + parts.join( " + " ) + QString( "<br>R<sup>2</sup> = %1" ).arg( reg.r2() );
}; };
regression::PolynominalRegression polynominalRegression; regression::PolynominalRegression polynominalRegression;
@ -180,7 +179,10 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
else if ( m_regressionType == RegressionType::POWER_FIT ) else if ( m_regressionType == RegressionType::POWER_FIT )
{ {
auto generateRegressionText = []( const regression::PowerFitRegression& reg ) auto generateRegressionText = []( const regression::PowerFitRegression& reg )
{ return QString( "Power Fit Regression<br><br>r = %1 + x<sup>%2</sup>" ).arg( reg.scale() ).arg( reg.exponent() ); }; {
return QString( "r = %1 + x<sup>%2</sup>" ).arg( reg.scale() ).arg( reg.exponent() ) +
QString( "<br>R<sup>2</sup> = %1" ).arg( reg.r2() );
};
regression::PowerFitRegression powerFitRegression; regression::PowerFitRegression powerFitRegression;
powerFitRegression.fit( timeStepsD, values ); powerFitRegression.fit( timeStepsD, values );

2
ThirdParty/regression-analysis vendored

@ -1 +1 @@
Subproject commit 86057ffc43926c0963292bda50fcac1ea733fe25 Subproject commit 8cb0644ae6983f4b69568164a595e2b287bc04ee