Explorar el Código

Fix minIobForecastGlucose variable to use calculated value

Sam King hace 5 meses
padre
commit
43e8fc6ec8

+ 1 - 1
Trio/Sources/APS/OpenAPSSwift/DetermineBasal/DetermineBasalGenerator.swift

@@ -481,7 +481,7 @@ enum DeterminationGenerator {
             currentTime: currentTime,
             targetGlucose: adjustedGlucoseTargets.targetGlucose,
             naiveEventualGlucose: naiveEventualGlucose,
-            minIOBForecastedGlucose: forecastResult.iob.min() ?? 0,
+            minIOBForecastedGlucose: forecastResult.minIOBForecastedGlucose,
             adjustedSensitivity: adjustedSensitivity,
             overrideFactor: trioCustomOrefVariables.overrideFactor(),
             adjustedCarbRatio: forecastResult.adjustedCarbRatio,

+ 6 - 0
Trio/Sources/APS/OpenAPSSwift/Forecasts/ForecastGenerator.swift

@@ -149,6 +149,7 @@ enum ForecastGenerator {
             internalUam: uamResult.forecasts,
             eventualGlucose: eventualGlucose,
             minForecastedGlucose: blendedForecasts.minForecastedGlucose,
+            minIOBForecastedGlucose: initialForecasts.iob.minForecastGlucose,
             minGuardGlucose: blendedForecasts.minGuardGlucose,
             carbImpact: carbImpact,
             remainingCarbImpactPeak: carbImpactParams.remainingCarbImpactPeak,
@@ -215,6 +216,11 @@ enum ForecastGenerator {
                 maxUamForecastGlucose = uam
             }
         }
+
+        minIobForecastGlucose = max(39, minIobForecastGlucose)
+        minCobForecastGlucose = max(39, minCobForecastGlucose)
+        minUamForecastGlucose = max(39, minUamForecastGlucose)
+
         return AllForecasts(
             iob: IOBForecast(
                 forecasts: iobForecast.forecasts,

+ 1 - 0
Trio/Sources/APS/OpenAPSSwift/Models/ForecastResult.swift

@@ -9,6 +9,7 @@ struct ForecastResult {
     public let internalUam: [Decimal] // non optional, used downstream
     public let eventualGlucose: Decimal
     public let minForecastedGlucose: Decimal
+    public let minIOBForecastedGlucose: Decimal
     public let minGuardGlucose: Decimal
     public let carbImpact: Decimal
     public let remainingCarbImpactPeak: Decimal