mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-04-15 05:32:21 +00:00
deriveExtCPParameters - Initial estimates setup after data verification
deriveExtCPParameters established Initial parameters estimates before the data verification steps so when data don't meet the minimum criteria for estimation those initial parameters are returned. This change moves the initialization step after data verification, similar to what deriveCPParameters does for the envelope fitting case. Fixes #3862
This commit is contained in:
@@ -989,16 +989,6 @@ ExtendedModel::onIntervalsChanged()
|
||||
void
|
||||
ExtendedModel::deriveExtCPParameters()
|
||||
{
|
||||
// initial estimates
|
||||
paa = 1000;
|
||||
etau = 1.2;
|
||||
ecp = 300;
|
||||
paa_dec = -2;
|
||||
ecp_del = -0.9;
|
||||
tau_del = -4.8;
|
||||
ecp_dec = -0.6;
|
||||
ecp_dec_del = -180;
|
||||
|
||||
#if 0
|
||||
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
// LEAST SQUARES FIT WITH ECP MODEL REQUIRES
|
||||
@@ -1114,6 +1104,15 @@ ExtendedModel::deriveExtCPParameters()
|
||||
break;
|
||||
|
||||
|
||||
// initial estimates
|
||||
paa = 1000;
|
||||
etau = 1.2;
|
||||
ecp = 300;
|
||||
paa_dec = -2;
|
||||
ecp_del = -0.9;
|
||||
tau_del = -4.8;
|
||||
ecp_dec = -0.6;
|
||||
ecp_dec_del = -180;
|
||||
|
||||
// previous loop values
|
||||
double etau_prev;
|
||||
|
||||
Reference in New Issue
Block a user