caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix adding zero deviations

Browse source
This commit is contained in:
Milos Kozak 2018-06-23 12:27:18 +02:00
parent 9c5e389afb
commit 53ba6d46d5
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityAAPSPlugin.java
View file

@ -105,12 +105,13 @@ public class SensitivityAAPSPlugin extends PluginBase implements SensitivityInte
pastSensitivity += "(SITECHANGE)"; pastSensitivity += "(SITECHANGE)";
} }
double deviation = autosensData.validDeviation ? autosensData.deviation : 0d; double deviation = autosensData.deviation;
//set positive deviations to zero if bg < 80 //set positive deviations to zero if bg < 80
if (autosensData.bg < 80 && deviation > 0) if (autosensData.bg < 80 && deviation > 0)
deviation = 0; deviation = 0;
if (autosensData.validDeviation)
if (autosensData.time > toTime - hoursForDetection * 60 * 60 * 1000L) if (autosensData.time > toTime - hoursForDetection * 60 * 60 * 1000L)
deviationsArray.add(deviation); deviationsArray.add(deviation);
if (deviationsArray.size() > hoursForDetection * 60 / 5) if (deviationsArray.size() > hoursForDetection * 60 / 5)

3
app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityOref0Plugin.java
View file

@ -106,12 +106,13 @@ public class SensitivityOref0Plugin extends PluginBase implements SensitivityInt
pastSensitivity += "(SITECHANGE)"; pastSensitivity += "(SITECHANGE)";
} }
double deviation = autosensData.validDeviation ? autosensData.deviation : 0d; double deviation = autosensData.deviation;
//set positive deviations to zero if bg < 80 //set positive deviations to zero if bg < 80
if (autosensData.bg < 80 && deviation > 0) if (autosensData.bg < 80 && deviation > 0)
deviation = 0; deviation = 0;
if (autosensData.validDeviation)
if (autosensData.time > toTime - hoursForDetection * 60 * 60 * 1000L) if (autosensData.time > toTime - hoursForDetection * 60 * 60 * 1000L)
deviationsArray.add(deviation); deviationsArray.add(deviation);
if (deviationsArray.size() > hoursForDetection * 60 / 5) if (deviationsArray.size() > hoursForDetection * 60 / 5)

3
app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityOref1Plugin.java
View file

@ -97,12 +97,13 @@ public class SensitivityOref1Plugin extends PluginBase implements SensitivityInt
pastSensitivity += "(SITECHANGE)"; pastSensitivity += "(SITECHANGE)";
} }
double deviation = autosensData.validDeviation ? autosensData.deviation : 0d; double deviation = autosensData.deviation;
//set positive deviations to zero if bg < 80 //set positive deviations to zero if bg < 80
if (autosensData.bg < 80 && deviation > 0) if (autosensData.bg < 80 && deviation > 0)
deviation = 0; deviation = 0;
if (autosensData.validDeviation)
deviationsArray.add(deviation); deviationsArray.add(deviation);
for (int i = 0; i < autosensData.extraDeviation.size(); i++) for (int i = 0; i < autosensData.extraDeviation.size(); i++)

3
app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityWeightedAveragePlugin.java
View file

@ -111,7 +111,7 @@ public class SensitivityWeightedAveragePlugin extends PluginBase implements Sens
pastSensitivity += "(SITECHANGE)"; pastSensitivity += "(SITECHANGE)";
} }
double deviation = autosensData.validDeviation ? autosensData.deviation : 0d; double deviation = autosensData.deviation;
//set positive deviations to zero if bg < 80 //set positive deviations to zero if bg < 80
if (autosensData.bg < 80 && deviation > 0) if (autosensData.bg < 80 && deviation > 0)
@ -119,6 +119,7 @@ public class SensitivityWeightedAveragePlugin extends PluginBase implements Sens
//data.append(autosensData.time); //data.append(autosensData.time);
long reverseWeight = (toTime - autosensData.time) / (5 * 60 * 1000L); long reverseWeight = (toTime - autosensData.time) / (5 * 60 * 1000L);
if (autosensData.validDeviation)
data.append(reverseWeight, deviation); data.append(reverseWeight, deviation);
//weights += reverseWeight; //weights += reverseWeight;
//weightedsum += reverseWeight * (autosensData.validDeviation ? autosensData.deviation : 0d); //weightedsum += reverseWeight * (autosensData.validDeviation ? autosensData.deviation : 0d);