gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

putting test in the HR calculationto stay compatible with the algo usage

Browse Source
This commit is contained in:
Pierre Bonneau
2024-03-23 14:37:08 +01:00
committed by GitHub
parent 19ebe73182
commit 8a15edd8fc
1 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/uk/org/openseizuredetector/SdAlgHr.java
View File

@@ -104,10 +104,12 @@ public class SdAlgHr {
* Check heart rate value against simple thresholds * Check heart rate value against simple thresholds
*/ */
boolean retVal = false; boolean retVal = false;
if (mSimpleHrAlarmActive) {
if ((hrVal > mSimpleHrAlarmThreshMax) if ((hrVal > mSimpleHrAlarmThreshMax)
|| (hrVal < mSimpleHrAlarmThreshMin)) { || (hrVal < mSimpleHrAlarmThreshMin)) {
retVal = true; retVal = true;
} }
}
return (retVal); return (retVal);
} }
@@ -145,6 +147,8 @@ public class SdAlgHr {
private boolean checkAdaptiveHr(double hrVal) { private boolean checkAdaptiveHr(double hrVal) {
boolean retVal; boolean retVal;
retVal = false; retVal = false;
if (mAdaptiveHrAlarmActive) {
double hrThreshMin; double hrThreshMin;
double hrThreshMax; double hrThreshMax;
double avHr = getAdaptiveHrAverage(); double avHr = getAdaptiveHrAverage();
@@ -159,12 +163,14 @@ public class SdAlgHr {
retVal = true; retVal = true;
} }
Log.d(TAG, "checkAdaptiveHr() - hrVal=" + hrVal + ", avHr=" + avHr + ", thresholds=(" + hrThreshMin + ", " + hrThreshMax + "): Alarm=" + retVal); Log.d(TAG, "checkAdaptiveHr() - hrVal=" + hrVal + ", avHr=" + avHr + ", thresholds=(" + hrThreshMin + ", " + hrThreshMax + "): Alarm=" + retVal);
}
return (retVal); return (retVal);
} }
private boolean checkAverageHr(double hrVal) { private boolean checkAverageHr(double hrVal) {
boolean retVal; boolean retVal;
retVal = false; retVal = false;
if (mAverageHrAlarmActive) {
double avHr = getAverageHrAverage(); double avHr = getAverageHrAverage();
if (avHr < mAverageHrAlarmThreshMin) { if (avHr < mAverageHrAlarmThreshMin) {
retVal = true; retVal = true;
@@ -173,6 +179,7 @@ public class SdAlgHr {
retVal = true; retVal = true;
} }
Log.d(TAG, "checkAverageHr() - hrVal=" + hrVal + ", avHr=" + avHr + ", thresholds=(" + mAverageHrAlarmThreshMin + ", " + mAverageHrAlarmThreshMin + "): Alarm=" + retVal); Log.d(TAG, "checkAverageHr() - hrVal=" + hrVal + ", avHr=" + avHr + ", thresholds=(" + mAverageHrAlarmThreshMin + ", " + mAverageHrAlarmThreshMin + "): Alarm=" + retVal);
}
return (retVal); return (retVal);
} }
@@ -189,15 +196,10 @@ public class SdAlgHr {
mAverageHrBuff.add(hrVal); mAverageHrBuff.add(hrVal);
mHrHist.add(hrVal); mHrHist.add(hrVal);
ArrayList<Boolean> retVal = new ArrayList<Boolean>(); ArrayList<Boolean> retVal = new ArrayList<Boolean>();
if (mSimpleHrAlarmActive) {
retVal.add(checkSimpleHr(hrVal)); retVal.add(checkSimpleHr(hrVal));
}
if (mAdaptiveHrAlarmActive) {
retVal.add(checkAdaptiveHr(hrVal)); retVal.add(checkAdaptiveHr(hrVal));
}
if (mAverageHrAlarmActive) {
retVal.add(checkAverageHr(hrVal)); retVal.add(checkAverageHr(hrVal));
}
return (retVal); return (retVal);
} }