[chronojump] Fixed commit: Encoder: Better calc and display of non-discarded reps avg and loss
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed commit: Encoder: Better calc and display of non-discarded reps avg and loss
- Date: Mon, 17 Sep 2018 11:40:51 +0000 (UTC)
commit e8cd29efe963d9e46e50d52e42a76196c1d580fb
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Sep 7 12:13:15 2018 +0200
Fixed commit: Encoder: Better calc and display of non-discarded reps avg and loss
src/gui/encoder.cs | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index a145dfd8..dd21dde8 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -4903,6 +4903,9 @@ public partial class ChronoJumpWindow
double maxThisSet = -100000;
double minThisSet = 100000;
+ //ForCalcs is to calculate avg and loss
+ double maxThisSetValid = maxThisSet;
+ double minThisSetValid = minThisSet;
//know not-discarded phases
double countValid = 0;
double sumValid = 0;
@@ -4911,6 +4914,11 @@ public partial class ChronoJumpWindow
foreach(double d in data)
{
+ if(d > maxThisSet)
+ maxThisSet = d;
+ if(d < minThisSet)
+ minThisSet = d;
+
if(
encoderConfigurationCurrent.has_inertia && count == 0
||
@@ -4922,10 +4930,10 @@ public partial class ChronoJumpWindow
countValid ++;
sumValid += d;
- if(d > maxThisSet)
- maxThisSet = d;
- if(d < minThisSet)
- minThisSet = d;
+ if(d > maxThisSetValid)
+ maxThisSetValid = d;
+ if(d < minThisSetValid)
+ minThisSetValid = d;
}
count ++;
@@ -5259,9 +5267,9 @@ public partial class ChronoJumpWindow
Util.TrimDecimals( (sumSaved / countSaved), decimals) +
" " + units;
- if(maxThisSet > 0)
+ if(maxThisSetValid > 0)
title += "; Loss: " + Util.TrimDecimals(
- 100.0 * (maxThisSet - minThisSet) / maxThisSet, decimals) + "%";
+ 100.0 * (maxThisSetValid - minThisSetValid) / maxThisSetValid,
decimals) + "%";
title += "]";
layout_encoder_capture_curves_bars_text.SetMarkup(title);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]