cut off carbs after 4h

app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensData.java

@@ -1,17 +1,42 @@
 package info.nightscout.androidaps.plugins.IobCobCalculator;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
+
+import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.utils.SP;
 
 /**
  * Created by mike on 25.04.2017.
  */
 
 public class AutosensData {
+    private static Logger log = LoggerFactory.getLogger(AutosensData.class);
+
+    static class CarbsInPast {
+        long time = 0L;
+        double carbs = 0d;
+        double min5minCarbImpact = 0d;
+        double remaining = 0d;
+
+        public CarbsInPast(Treatment t) {
+            time = t.date;
+            carbs = t.carbs;
+            remaining = t.carbs;
+            min5minCarbImpact = SP.getDouble("openapsama_min_5m_carbimpact", 3.0);
+        }
+    }
+
     public long time = 0L;
     public String pastSensitivity = "";
     public double deviation = 0d;
     boolean nonCarbsDeviation = false;
     public boolean nonEqualDeviation = false;
+    List<CarbsInPast> activeCarbsList = new ArrayList<>();
     double absorbed = 0d;
     public double carbsFromBolus = 0d;
     public double cob = 0;
@@ -28,4 +53,29 @@ public class AutosensData {
         return (int) ((System.currentTimeMillis() - time) / 1000 / 60);
     }
 
+    // remove carbs older than 4h
+    public void removeOldCarbs(long toTime) {
+        for (int i = 0; i < activeCarbsList.size(); i++) {
+            CarbsInPast c = activeCarbsList.get(i);
+            if (c.time + 4 * 60 * 60 * 1000L < toTime) {
+                activeCarbsList.remove(i--);
+                if (c.remaining > 0)
+                    cob -= c.remaining;
+                log.debug("Removing carbs at "+ new Date(toTime).toLocaleString() + " + after 4h :" + new Date(c.time).toLocaleString());
+            }
+        }
+    }
+
+    public void substractAbosorbedCarbs() {
+        double ac = absorbed;
+        for (int i = 0; i < activeCarbsList.size() && ac > 0; i++) {
+            CarbsInPast c = activeCarbsList.get(i);
+            if (c.remaining > 0) {
+                double sub = Math.min(ac, c.remaining);
+                c.remaining -= sub;
+                ac -= sub;
+            }
+        }
+    }
+
 }

app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobCalculatorPlugin.java

@@ -353,6 +353,10 @@ public class IobCobCalculatorPlugin implements PluginBase {
 
                 AutosensData autosensData = new AutosensData();
                 autosensData.time = bgTime;
+                if (previous != null)
+                    autosensData.activeCarbsList = new ArrayList<>(previous.activeCarbsList);
+                else
+                    autosensData.activeCarbsList = new ArrayList<>();
 
                 //console.error(bgTime , bucketed_data[i].glucose);
                 double bg;
@@ -373,17 +377,28 @@ public class IobCobCalculatorPlugin implements PluginBase {
                 List<Treatment> recentTreatments = MainApp.getConfigBuilder().getTreatments5MinBackFromHistory(bgTime);
                 for (int ir = 0; ir < recentTreatments.size(); ir++) {
                     autosensData.carbsFromBolus += recentTreatments.get(ir).carbs;
+                    autosensData.activeCarbsList.add(new AutosensData.CarbsInPast(recentTreatments.get(ir)));
                 }
 
+
                 // if we are absorbing carbs
                 if (previous != null && previous.cob > 0) {
+                    // calculate sum of min carb impact from all active treatments
+                    double totalMinCarbsImpact = 0d;
+                    for (int ii = 0; ii < autosensData.activeCarbsList.size(); ++ii) {
+                        AutosensData.CarbsInPast c = autosensData.activeCarbsList.get(ii);
+                        totalMinCarbsImpact += c.min5minCarbImpact;
+                    }
+
                     // figure out how many carbs that represents
-                    // but always assume at least 3mg/dL/5m (default) absorption
+                    // but always assume at least 3mg/dL/5m (default) absorption per active treatment
-                    double ci = Math.max(deviation, SP.getDouble("openapsama_min_5m_carbimpact", 3.0));
+                    double ci = Math.max(deviation, totalMinCarbsImpact);
                     autosensData.absorbed = ci * profile.getIc(bgTime) / sens;
                     // and add that to the running total carbsAbsorbed
                     autosensData.cob = Math.max(previous.cob - autosensData.absorbed, 0d);
+                    autosensData.substractAbosorbedCarbs();
                 }
+                autosensData.removeOldCarbs(bgTime);
                 autosensData.cob += autosensData.carbsFromBolus;
                 autosensData.deviation = deviation;
                 autosensData.bgi = bgi;
@@ -481,6 +496,7 @@ public class IobCobCalculatorPlugin implements PluginBase {
         return retval;
     }
 
+    @Nullable
     public static AutosensData getAutosensData(long time) {
         long now = System.currentTimeMillis();
         if (time > now)
@@ -499,6 +515,7 @@ public class IobCobCalculatorPlugin implements PluginBase {
         }
     }
 
+    @Nullable
     public static AutosensData getLastAutosensData() {
         if (autosensDataTable.size() < 1)
             return null;