caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Distribute carbs strictly within timeframe

Browse source
This commit is contained in:
AdrianLxM 2018-04-13 00:48:57 +02:00 committed by GitHub
parent bf02edd871
commit 10b9171afe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
View file

@ -401,13 +401,12 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, C
createCarb(carbsAfterConstraints, time, finalNotes); createCarb(carbsAfterConstraints, time, finalNotes);
} else { } else {
long remainingCarbs = carbsAfterConstraints; long remainingCarbs = carbsAfterConstraints;
long carbTime = time; int ticks = (duration * 4); //duration guaranteed to be integer greater zero
long smallCarbAmount = Math.round(remainingCarbs / (editDuration.getValue() * 4)); for (int i = 0; i < ticks; i++){
if (smallCarbAmount == 0) smallCarbAmount = 1; long carbTime = time + i * 15 * 60 * 1000;
while (remainingCarbs > 0) { long smallCarbAmount = Math.round((1d * remainingCarbs) / (ticks-i)); //on last iteration (ticks-i) is 1 -> smallCarbAmount == remainingCarbs
createCarb(Math.min(smallCarbAmount, remainingCarbs), carbTime, finalNotes);
remainingCarbs -= smallCarbAmount; remainingCarbs -= smallCarbAmount;
carbTime += 15 * 60 * 1000; createCarb(smallCarbAmount, carbTime, finalNotes);
} }
} }
} }