3.2 RC4 Versioning

src/GcUpgrade.h

@@ -53,22 +53,21 @@
 // 3104 - V3.2 RC1X (after late commits)
 // 3105 - V3.2 RC2
 // 3106 - V3.2 RC3
-// 3107 - V3.2 RC4 (lost due to push fail by Mark)
-// 3108 - V3.2 RC4X (some problems with tagging)
+// 3107 - V3.2 RC4
 
 #define VERSION3_BUILD    3010 // released
 #define VERSION3_SP1      3030 // released
 #define VERSION3_SP2      3032 // released
 #define VERSION31_UPG     3100 // first build with 3.1 upgrade process
 #define VERSION311_BUILD  3101 // first build with 3.1 upgrade process
-#define VERSION32_BUILD   3108 // current 3.2 build
+#define VERSION32_BUILD   3107 // current 3.2 build
 
 // will keep changing during testing and before final release
 #define VERSION31_BUILD VERSION31_UPG
 
 // these three will change until we release
-#define VERSION_LATEST 3108
-#define VERSION_STRING "V3.2 RC4X"
+#define VERSION_LATEST 3107
+#define VERSION_STRING "V3.2 RC4"
 
 // default config for this release is available and maintained here:
 #define VERSION_CONFIG_PREFIX "http://www.goldencheetah.org/defaults/3.2"

src/LTMPlot.cpp

@@ -2494,12 +2494,6 @@ LTMPlot::createTODCurveData(Context *context, LTMSettings *settings, MetricDetai
 void
 LTMPlot::createCurveData(Context *context, LTMSettings *settings, MetricDetail metricDetail, QVector<double>&x,QVector<double>&y,int&n, bool forceZero)
 {
-    // resize the curve array to maximum possible size
-    int maxdays = groupForDate(settings->end.date(), settings->groupBy)
-                    - groupForDate(settings->start.date(), settings->groupBy);
-
-    if (maxdays <= 0) return;
-
     // create curves depending on type ...
     if (metricDetail.type == METRIC_DB || metricDetail.type == METRIC_META) {
         createMetricData(context, settings, metricDetail, x,y,n, forceZero);
@@ -2654,9 +2648,6 @@ LTMPlot::createBestsData(Context *, LTMSettings *settings, MetricDetail metricDe
     unsigned long secondsPerGroupBy=0;
     bool wantZero = forceZero ? 1 : (metricDetail.curveStyle == QwtPlotCurve::Steps);
 
-    // don't attempt it if the bests are not loaded
-    if (settings->bests == NULL) return;
-
     foreach (RideBest best, *(settings->bests)) { 
 
         // filter has already been applied

src/RideFileCache.cpp

@@ -1203,7 +1203,7 @@ MeanMaxComputer::run()
     // xPower - 25s EWA - uses same algorithm as BikeScore.cpp
     if (series == RideFile::xPower) {
 
-        const double exp = ride->recIntSecs() / ((25.0f / ride->recIntSecs()) + ride->recIntSecs());
+        const double exp = 2.0f / ((25.0f / ride->recIntSecs()) + 1.0f);
         const double rem = 1.0f - exp;
 
         int rollingwindowsize = 25 / ride->recIntSecs();
@@ -1218,8 +1218,7 @@ MeanMaxComputer::run()
             // loop over the data and convert to a EWMA
             for (int i=0; i<data.points.size(); i++) {
 
-                // dgr : BikeScore has weighting value from first point
-                if (false && i < rollingwindowsize) {
+                if (i < rollingwindowsize) {
 
                     // get up to speed
                     sum += data.points[i].value;
@@ -1263,7 +1262,6 @@ MeanMaxComputer::run()
                 ride_bests[sec] = val;
         }
 
-
         // increments to limit search scope
         if (i<120) i++;
         else if (i<600) i+= 2;