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

check if different x positions are added to the polynomial fitter, see #645

Browse Source
This commit is contained in:
oliexdev
2020-12-11 07:12:34 +01:00
parent 40a7f4e739
commit d187079432
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartMeasurementView.java
View File

@@ -525,20 +525,28 @@ public class ChartMeasurementView extends LineChart {
PolynomialFitter polyFitter = new PolynomialFitter(lineEntries.size() == 2 ? 2 : 3); PolynomialFitter polyFitter = new PolynomialFitter(lineEntries.size() == 2 ? 2 : 3);
// add last point to polynomial fitter first
int lastPos = lineEntries.size() - 1;
Entry lastEntry = lineEntries.get(lastPos);
polyFitter.addPoint((double) lastEntry.getX(), (double) lastEntry.getY());
// use only the last 30 values for the polynomial fitter // use only the last 30 values for the polynomial fitter
for (int i=1; i<30; i++) { for (int i=2; i<30; i++) {
int pos = lineEntries.size() - i; int pos = lineEntries.size() - i;
if (pos >= 0) { if (pos >= 0) {
Entry entry = lineEntries.get(pos); Entry entry = lineEntries.get(pos);
Entry prevEntry = lineEntries.get(pos+1);
polyFitter.addPoint((double) entry.getX(), (double) entry.getY()); // check if x position is different otherwise that point is useless for the polynomial calculation.
if (entry.getX() != prevEntry.getX()) {
polyFitter.addPoint((double) entry.getX(), (double) entry.getY());
}
} }
} }
PolynomialFitter.Polynomial polynomial = polyFitter.getBestFit(); PolynomialFitter.Polynomial polynomial = polyFitter.getBestFit();
Entry lastEntry = lineEntries.get(lineEntries.size() - 1);
int maxX = (int) lastEntry.getX()+1; int maxX = (int) lastEntry.getX()+1;
List<Entry> predictionValues = new Stack<>(); List<Entry> predictionValues = new Stack<>();