mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-11 11:14:03 +02:00
Code Issues Releases Wiki Activity

fix average array size and index (#421)

Browse Source
This commit is contained in:
unimiso
2019-02-28 00:38:37 +09:00
committed by OliE
parent 315a6d9736
commit 753b6f63c6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java
View File

@@ -352,10 +352,10 @@ public class ChartMeasurementView extends LineChart {
} }
private ScaleMeasurement[] averageScaleMeasurementList(List<ScaleMeasurement> measurementList) { private ScaleMeasurement[] averageScaleMeasurementList(List<ScaleMeasurement> measurementList) {
final ScaleMeasurement[] avgMeasurementList = new ScaleMeasurement[minXValue + maxXValue + 1]; final ScaleMeasurement[] avgMeasurementList = new ScaleMeasurement[ maxXValue - minXValue + 1];
for (ScaleMeasurement measurement : measurementList) { for (ScaleMeasurement measurement : measurementList) {
int binNr = getBinNr(measurement); int binNr = getBinNr(measurement) - minXValue;
if (avgMeasurementList[binNr] == null) { if (avgMeasurementList[binNr] == null) {
avgMeasurementList[binNr] = measurement.clone(); avgMeasurementList[binNr] = measurement.clone();
@@ -369,7 +369,7 @@ public class ChartMeasurementView extends LineChart {
continue; continue;
} }
int binNr = getBinNr(avgMeasurement); int binNr = getBinNr(avgMeasurement) - minXValue;
avgMeasurement.divide(avgMeasurementList[binNr].count()); avgMeasurement.divide(avgMeasurementList[binNr].count());
} }
@@ -377,7 +377,7 @@ public class ChartMeasurementView extends LineChart {
} }
private ScaleMeasurement getPreviousMeasurment(ScaleMeasurement[] masurementList, int binNr) { private ScaleMeasurement getPreviousMeasurment(ScaleMeasurement[] masurementList, int binNr) {
for (int i=binNr-1; i > 0; i--) { for (int i=binNr-minXValue-1; i >= 0; i--) {
if (masurementList[i] != null) { if (masurementList[i] != null) {
return masurementList[i]; return masurementList[i];
} }