From f5752d109d1221116e3caa4cb955f18f18580e3a Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Fri, 9 Jun 2023 09:11:48 +0200 Subject: [PATCH] Regression Analysis: hide logistic regression. --- .../RimSummaryRegressionAnalysisCurve.cpp | 17 ----------------- .../Summary/RimSummaryRegressionAnalysisCurve.h | 2 -- 2 files changed, 19 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.cpp index 951f3c2571..7b4264c725 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.cpp @@ -53,7 +53,6 @@ void caf::AppEnum::setUp() addItem( RimSummaryRegressionAnalysisCurve::RegressionType::POWER_FIT, "POWER_FIT", "Power Fit" ); addItem( RimSummaryRegressionAnalysisCurve::RegressionType::EXPONENTIAL, "EXPONENTIAL", "Exponential" ); addItem( RimSummaryRegressionAnalysisCurve::RegressionType::LOGARITHMIC, "LOGARITHMIC", "Logarithmic" ); - addItem( RimSummaryRegressionAnalysisCurve::RegressionType::LOGISTIC, "LOGISTIC", "Logistic" ); setDefault( RimSummaryRegressionAnalysisCurve::RegressionType::LINEAR ); } @@ -214,13 +213,6 @@ std::tuple, std::vector, QString> std::vector predictedValues = logarithmicRegression.predict( outputTimeStepsD ); return { convertToTimeT( outputTimeStepsD ), predictedValues, generateRegressionText( logarithmicRegression ) }; } - else if ( m_regressionType == RegressionType::LOGISTIC ) - { - regression::LogisticRegression logisticRegression; - logisticRegression.fit( timeStepsD, valuesInRange ); - std::vector predictedValues = logisticRegression.predict( outputTimeStepsD ); - return { convertToTimeT( outputTimeStepsD ), predictedValues, generateRegressionText( logisticRegression ) }; - } return { timeSteps, values, "" }; } @@ -431,15 +423,6 @@ QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regress QString( "
R2 = %1" ).arg( reg.r2() ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regression::LogisticRegression& reg ) -{ - // TODO: Display more parameters here. - return ""; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.h index 1c081271bc..d0e8d66a95 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.h @@ -31,7 +31,6 @@ namespace regression class ExponentialRegression; class LinearRegression; class LogarithmicRegression; -class LogisticRegression; class PolynomialRegression; class PowerFitRegression; } // namespace regression @@ -110,7 +109,6 @@ private: static QString generateRegressionText( const regression::PowerFitRegression& reg ); static QString generateRegressionText( const regression::LogarithmicRegression& reg ); static QString generateRegressionText( const regression::ExponentialRegression& reg ); - static QString generateRegressionText( const regression::LogisticRegression& reg ); static QString formatDouble( double v );