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: hide logistic regression.

Browse Source
This commit is contained in:
Kristian Bendiksen 2023-06-09 09:11:48 +02:00
parent adbe080dcf
commit f5752d109d
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,6 @@ void caf::AppEnum<RimSummaryRegressionAnalysisCurve::RegressionType>::setUp()
addItem( RimSummaryRegressionAnalysisCurve::RegressionType::POWER_FIT, "POWER_FIT", "Power Fit" ); addItem( RimSummaryRegressionAnalysisCurve::RegressionType::POWER_FIT, "POWER_FIT", "Power Fit" );
addItem( RimSummaryRegressionAnalysisCurve::RegressionType::EXPONENTIAL, "EXPONENTIAL", "Exponential" ); addItem( RimSummaryRegressionAnalysisCurve::RegressionType::EXPONENTIAL, "EXPONENTIAL", "Exponential" );
addItem( RimSummaryRegressionAnalysisCurve::RegressionType::LOGARITHMIC, "LOGARITHMIC", "Logarithmic" ); addItem( RimSummaryRegressionAnalysisCurve::RegressionType::LOGARITHMIC, "LOGARITHMIC", "Logarithmic" );
addItem( RimSummaryRegressionAnalysisCurve::RegressionType::LOGISTIC, "LOGISTIC", "Logistic" );
setDefault( RimSummaryRegressionAnalysisCurve::RegressionType::LINEAR ); setDefault( RimSummaryRegressionAnalysisCurve::RegressionType::LINEAR );
} }
@ -214,13 +213,6 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
std::vector<double> predictedValues = logarithmicRegression.predict( outputTimeStepsD ); std::vector<double> predictedValues = logarithmicRegression.predict( outputTimeStepsD );
return { convertToTimeT( outputTimeStepsD ), predictedValues, generateRegressionText( logarithmicRegression ) }; return { convertToTimeT( outputTimeStepsD ), predictedValues, generateRegressionText( logarithmicRegression ) };
} }
else if ( m_regressionType == RegressionType::LOGISTIC )
{
regression::LogisticRegression logisticRegression;
logisticRegression.fit( timeStepsD, valuesInRange );
std::vector<double> predictedValues = logisticRegression.predict( outputTimeStepsD );
return { convertToTimeT( outputTimeStepsD ), predictedValues, generateRegressionText( logisticRegression ) };
}
return { timeSteps, values, "" }; return { timeSteps, values, "" };
} }
@ -431,15 +423,6 @@ QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regress
QString( "<br>R<sup>2</sup> = %1" ).arg( reg.r2() ); QString( "<br>R<sup>2</sup> = %1" ).arg( reg.r2() );
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regression::LogisticRegression& reg )
{
// TODO: Display more parameters here.
return "";
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.h
View File

@ -31,7 +31,6 @@ namespace regression
class ExponentialRegression; class ExponentialRegression;
class LinearRegression; class LinearRegression;
class LogarithmicRegression; class LogarithmicRegression;
class LogisticRegression;
class PolynomialRegression; class PolynomialRegression;
class PowerFitRegression; class PowerFitRegression;
} // namespace regression } // namespace regression
@ -110,7 +109,6 @@ private:
static QString generateRegressionText( const regression::PowerFitRegression& reg ); static QString generateRegressionText( const regression::PowerFitRegression& reg );
static QString generateRegressionText( const regression::LogarithmicRegression& reg ); static QString generateRegressionText( const regression::LogarithmicRegression& reg );
static QString generateRegressionText( const regression::ExponentialRegression& reg ); static QString generateRegressionText( const regression::ExponentialRegression& reg );
static QString generateRegressionText( const regression::LogisticRegression& reg );
static QString formatDouble( double v ); static QString formatDouble( double v );