nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor Datafilter fixups

Browse Source 
.. the while loop limit of 10000 loops is too low, especially when
   looping over ride samples.

.. the pd model short names contain spaces and will never work with
   the datafilter estimates() function.
This commit is contained in:
Mark Liversedge
2020-04-26 21:53:50 +01:00
parent 75c3039358
commit ed33157945
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/DataFilter.cpp
View File

@@ -4880,7 +4880,7 @@ Result Leaf::eval(DataFilterRuntime *df, Leaf *leaf, float x, long it, RideItem
{
// we bound while to make sure it doesn't consume all
// CPU and 'hang' for badly written code..
static int maxwhile = 10000;
static int maxwhile = 1000000;
int count=0;
QTime timer;
timer.start();

8
src/Metrics/PDModel.h
View File

@@ -237,8 +237,8 @@ class CP2Model : public PDModel
double WPrime();
double CP();
QString name() { return "Classic 2 Parameter"; } // model name e.g. CP 2 parameter model
QString code() { return "2 Parm"; } // short name used in metric names e.g. 2P model
QString name() { return "Classic Parameter"; } // model name e.g. CP 2 parameter model
QString code() { return "cp2"; } // short name used in metric names e.g. 2P model
void saveParameters(QList<double>&here);
void loadParameters(QList<double>&here);
@@ -290,7 +290,7 @@ class CP3Model : public PDModel
double PMax();
QString name() { return "Morton 3 Parameter"; } // model name e.g. CP 2 parameter model
QString code() { return "3 Parm"; } // short name used in metric names e.g. 2P model
QString code() { return "cp3"; } // short name used in metric names e.g. 2P model
void saveParameters(QList<double>&here);
void loadParameters(QList<double>&here);
@@ -471,7 +471,7 @@ class ExtendedModel : public PDModel
double PMax();
QString name() { return "Extended CP"; } // model name e.g. CP 2 parameter model
QString code() { return "Ext"; } // short name used in metric names e.g. 2P model
QString code() { return "ext"; } // short name used in metric names e.g. 2P model
// Extended has multiple additional parameters
double paa, paa_dec, ecp, etau, ecp_del, tau_del, ecp_dec, ecp_dec_del;