From ed33157945f7cc279d79729ef008a158ff4c692c Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sun, 26 Apr 2020 21:53:50 +0100 Subject: [PATCH] Minor Datafilter fixups .. 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. --- src/Core/DataFilter.cpp | 2 +- src/Metrics/PDModel.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Core/DataFilter.cpp b/src/Core/DataFilter.cpp index cf5ae4c2f..596b7d3fb 100644 --- a/src/Core/DataFilter.cpp +++ b/src/Core/DataFilter.cpp @@ -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(); diff --git a/src/Metrics/PDModel.h b/src/Metrics/PDModel.h index 2446b84ee..fd34630e4 100644 --- a/src/Metrics/PDModel.h +++ b/src/Metrics/PDModel.h @@ -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&here); void loadParameters(QList&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&here); void loadParameters(QList&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;