diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.cpp index 2dbf8ae6c9..7fe43f076b 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.cpp @@ -135,9 +135,8 @@ std::tuple, std::vector, QString> if ( m_regressionType == RegressionType::LINEAR ) { - auto generateRegressionText = []( const regression::LinearRegression& reg ) { - return QString( "Linear Regression
Intercept: %1
Slope: %2

r = %2x + %1" ).arg( reg.intercept() ).arg( reg.slope() ); - }; + auto generateRegressionText = []( const regression::LinearRegression& reg ) + { return QString( "r = %2x + %1" ).arg( reg.intercept() ).arg( reg.slope() ) + QString( "
R2 = %1" ).arg( reg.r2() ); }; regression::LinearRegression linearRegression; linearRegression.fit( timeStepsD, values ); @@ -148,7 +147,7 @@ std::tuple, std::vector, QString> { auto generateRegressionText = []( const regression::PolynominalRegression& reg ) { - QString str = "Polynominal Regression

r = "; + QString str = "r = "; std::vector coeffs = reg.coeffisients(); QStringList parts; @@ -169,7 +168,7 @@ std::tuple, std::vector, QString> } } - return str + parts.join( " + " ); + return str + parts.join( " + " ) + QString( "
R2 = %1" ).arg( reg.r2() ); }; regression::PolynominalRegression polynominalRegression; @@ -180,7 +179,10 @@ std::tuple, std::vector, QString> else if ( m_regressionType == RegressionType::POWER_FIT ) { auto generateRegressionText = []( const regression::PowerFitRegression& reg ) - { return QString( "Power Fit Regression

r = %1 + x%2" ).arg( reg.scale() ).arg( reg.exponent() ); }; + { + return QString( "r = %1 + x%2" ).arg( reg.scale() ).arg( reg.exponent() ) + + QString( "
R2 = %1" ).arg( reg.r2() ); + }; regression::PowerFitRegression powerFitRegression; powerFitRegression.fit( timeStepsD, values ); diff --git a/ThirdParty/regression-analysis b/ThirdParty/regression-analysis index 86057ffc43..8cb0644ae6 160000 --- a/ThirdParty/regression-analysis +++ b/ThirdParty/regression-analysis @@ -1 +1 @@ -Subproject commit 86057ffc43926c0963292bda50fcac1ea733fe25 +Subproject commit 8cb0644ae6983f4b69568164a595e2b287bc04ee