martin/swimtracker-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix in active time detection

Browse Source
This commit is contained in:
Martin Bauer
2020-07-15 18:17:12 +02:00
parent 39632d4eec
commit aee89d799c
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
data_processing/DataAnalysis.js
View File

@@ -31,10 +31,11 @@ export default class DataAnalysis {
// active time
const newAverages = this.movingAverage.addVector(newDataArr);
this.activeMeasurements += newAverages.reduce((n, val) => {
return n + (val >= analysisParameters.activeTimeThreshold);
});
return n + ((val >= analysisParameters.activeTimeThreshold) ? 1 : 0);
}, 0);
console.log("data", newDataArr, "newAverages", newAverages, "reduction", this.activeMeasurements);
// peaks
// peaks
const newPeaks = this.peakDetectorSimple.addVector(newDataArr);
this.allPeaks = this.allPeaks.concat(List(newPeaks));
@@ -52,7 +53,7 @@ export default class DataAnalysis {
this.analyzedUpToIdx = allMeasurements.size;
return {
peaks: this.allPeaks,
totalTime: allMeasurements / analysisParameters.numMeasurementsPerSec,
totalTime: allMeasurements.size / analysisParameters.numMeasurementsPerSec,
activeTime: this.activeMeasurements / analysisParameters.numMeasurementsPerSec,
totalMomentum: this.aggregatedMomentum,