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: fix polynominal -> polynomial typo

Browse Source
This commit is contained in:
Kristian Bendiksen 2023-06-09 08:59:04 +02:00
parent 1fefa6f363
commit adbe080dcf
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@
#include "LinearRegression.hpp" #include "LinearRegression.hpp"
#include "LogarithmicRegression.hpp" #include "LogarithmicRegression.hpp"
#include "LogisticRegression.hpp" #include "LogisticRegression.hpp"
#include "PolynominalRegression.hpp" #include "PolynomialRegression.hpp"
#include "PowerFitRegression.hpp" #include "PowerFitRegression.hpp"
#include <QDateTime> #include <QDateTime>
@ -49,7 +49,7 @@ template <>
void caf::AppEnum<RimSummaryRegressionAnalysisCurve::RegressionType>::setUp() void caf::AppEnum<RimSummaryRegressionAnalysisCurve::RegressionType>::setUp()
{ {
addItem( RimSummaryRegressionAnalysisCurve::RegressionType::LINEAR, "LINEAR", "Linear" ); addItem( RimSummaryRegressionAnalysisCurve::RegressionType::LINEAR, "LINEAR", "Linear" );
addItem( RimSummaryRegressionAnalysisCurve::RegressionType::POLYNOMINAL, "POLYNOMINAL", "Polynominal" ); addItem( RimSummaryRegressionAnalysisCurve::RegressionType::POLYNOMIAL, "POLYNOMIAL", "Polynomial" );
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" );
@ -79,7 +79,7 @@ RimSummaryRegressionAnalysisCurve::RimSummaryRegressionAnalysisCurve()
CAF_PDM_InitField( &m_forecastForward, "ForecastForward", 0, "Forward" ); CAF_PDM_InitField( &m_forecastForward, "ForecastForward", 0, "Forward" );
CAF_PDM_InitField( &m_forecastBackward, "ForecastBackward", 0, "Backward" ); CAF_PDM_InitField( &m_forecastBackward, "ForecastBackward", 0, "Backward" );
CAF_PDM_InitFieldNoDefault( &m_forecastUnit, "ForecastUnit", "Unit" ); CAF_PDM_InitFieldNoDefault( &m_forecastUnit, "ForecastUnit", "Unit" );
CAF_PDM_InitField( &m_polynominalDegree, "PolynominalDegree", 3, "Degree" ); CAF_PDM_InitField( &m_polynomialDegree, "PolynomialDegree", 3, "Degree" );
CAF_PDM_InitFieldNoDefault( &m_minTimeStep, "MinTimeStep", "From" ); CAF_PDM_InitFieldNoDefault( &m_minTimeStep, "MinTimeStep", "From" );
m_minTimeStep.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); m_minTimeStep.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() );
@ -183,12 +183,12 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
std::vector<double> predictedValues = linearRegression.predict( outputTimeStepsD ); std::vector<double> predictedValues = linearRegression.predict( outputTimeStepsD );
return { outputTimeSteps, predictedValues, generateRegressionText( linearRegression ) }; return { outputTimeSteps, predictedValues, generateRegressionText( linearRegression ) };
} }
else if ( m_regressionType == RegressionType::POLYNOMINAL ) else if ( m_regressionType == RegressionType::POLYNOMIAL )
{ {
regression::PolynominalRegression polynominalRegression; regression::PolynomialRegression polynomialRegression;
polynominalRegression.fit( timeStepsD, valuesInRange, m_polynominalDegree ); polynomialRegression.fit( timeStepsD, valuesInRange, m_polynomialDegree );
std::vector<double> predictedValues = polynominalRegression.predict( outputTimeStepsD ); std::vector<double> predictedValues = polynomialRegression.predict( outputTimeStepsD );
return { outputTimeSteps, predictedValues, generateRegressionText( polynominalRegression ) }; return { outputTimeSteps, predictedValues, generateRegressionText( polynomialRegression ) };
} }
else if ( m_regressionType == RegressionType::POWER_FIT ) else if ( m_regressionType == RegressionType::POWER_FIT )
{ {
@ -235,9 +235,9 @@ void RimSummaryRegressionAnalysisCurve::defineUiOrdering( QString uiConfigName,
caf::PdmUiGroup* regressionCurveGroup = uiOrdering.addNewGroup( "Regression Analysis" ); caf::PdmUiGroup* regressionCurveGroup = uiOrdering.addNewGroup( "Regression Analysis" );
regressionCurveGroup->add( &m_regressionType ); regressionCurveGroup->add( &m_regressionType );
if ( m_regressionType == RegressionType::POLYNOMINAL ) if ( m_regressionType == RegressionType::POLYNOMIAL )
{ {
regressionCurveGroup->add( &m_polynominalDegree ); regressionCurveGroup->add( &m_polynomialDegree );
} }
regressionCurveGroup->add( &m_expressionText ); regressionCurveGroup->add( &m_expressionText );
@ -273,7 +273,7 @@ void RimSummaryRegressionAnalysisCurve::fieldChangedByUi( const caf::PdmFieldHan
} }
RimSummaryCurve::fieldChangedByUi( changedField, oldValue, newValue ); RimSummaryCurve::fieldChangedByUi( changedField, oldValue, newValue );
if ( changedField == &m_regressionType || changedField == &m_polynominalDegree || changedField == &m_forecastBackward || if ( changedField == &m_regressionType || changedField == &m_polynomialDegree || changedField == &m_forecastBackward ||
changedField == &m_forecastForward || changedField == &m_forecastUnit || changedField == &m_minTimeStep || changedField == &m_forecastForward || changedField == &m_forecastUnit || changedField == &m_minTimeStep ||
changedField == &m_maxTimeStep || changedField == &m_showTimeSelectionInPlot ) changedField == &m_maxTimeStep || changedField == &m_showTimeSelectionInPlot )
{ {
@ -293,11 +293,11 @@ void RimSummaryRegressionAnalysisCurve::defineEditorAttribute( const caf::PdmFie
{ {
RimSummaryCurve::defineEditorAttribute( field, uiConfigName, attribute ); RimSummaryCurve::defineEditorAttribute( field, uiConfigName, attribute );
if ( field == &m_polynominalDegree ) if ( field == &m_polynomialDegree )
{ {
if ( auto* lineEditorAttr = dynamic_cast<caf::PdmUiLineEditorAttribute*>( attribute ) ) if ( auto* lineEditorAttr = dynamic_cast<caf::PdmUiLineEditorAttribute*>( attribute ) )
{ {
// Polynominal degree should be a positive number. // Polynomial degree should be a positive number.
lineEditorAttr->validator = new QIntValidator( 1, 50, nullptr ); lineEditorAttr->validator = new QIntValidator( 1, 50, nullptr );
} }
} }
@ -370,7 +370,7 @@ QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regress
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regression::PolynominalRegression& reg ) QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regression::PolynomialRegression& reg )
{ {
QString str = "y = "; QString str = "y = ";

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

@ -32,7 +32,7 @@ class ExponentialRegression;
class LinearRegression; class LinearRegression;
class LogarithmicRegression; class LogarithmicRegression;
class LogisticRegression; class LogisticRegression;
class PolynominalRegression; class PolynomialRegression;
class PowerFitRegression; class PowerFitRegression;
} // namespace regression } // namespace regression
@ -50,7 +50,7 @@ public:
enum class RegressionType enum class RegressionType
{ {
LINEAR, LINEAR,
POLYNOMINAL, POLYNOMIAL,
POWER_FIT, POWER_FIT,
EXPONENTIAL, EXPONENTIAL,
LOGARITHMIC, LOGARITHMIC,
@ -106,7 +106,7 @@ private:
getInRangeValues( const std::vector<time_t>& timeSteps, const std::vector<double>& values, time_t minTimeStep, time_t maxTimeStep ); getInRangeValues( const std::vector<time_t>& timeSteps, const std::vector<double>& values, time_t minTimeStep, time_t maxTimeStep );
static QString generateRegressionText( const regression::LinearRegression& reg ); static QString generateRegressionText( const regression::LinearRegression& reg );
static QString generateRegressionText( const regression::PolynominalRegression& reg ); static QString generateRegressionText( const regression::PolynomialRegression& reg );
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 );
@ -121,7 +121,7 @@ private:
caf::PdmField<time_t> m_maxTimeStep; caf::PdmField<time_t> m_maxTimeStep;
caf::PdmField<bool> m_showTimeSelectionInPlot; caf::PdmField<bool> m_showTimeSelectionInPlot;
caf::PdmField<int> m_polynominalDegree; caf::PdmField<int> m_polynomialDegree;
caf::PdmField<QString> m_expressionText; caf::PdmField<QString> m_expressionText;
caf::PdmField<int> m_forecastForward; caf::PdmField<int> m_forecastForward;
caf::PdmField<int> m_forecastBackward; caf::PdmField<int> m_forecastBackward;

2
ThirdParty/regression-analysis vendored

@ -1 +1 @@
Subproject commit 34bfe0f1eab0c8946ae5b988a39f7a2884508851 Subproject commit 5ee230cf18ac7653fc95156cbf9a9a9e1eba4c95