Ver código fonte

Roll back max meal absorption safety checks

Sam King 9 meses atrás
pai
commit
71a1f05a97

+ 5 - 10
Trio/Sources/APS/OpenAPSSwift/Forecasts/ForecastGenerator.swift

@@ -35,19 +35,11 @@ enum ForecastGenerator {
         let minDelta = min(glucoseStatus.delta, glucoseStatus.shortAvgDelta)
         // this carbImpact is `ci` in JS
         var carbImpact = (minDelta - currentGlucoseImpact).jsRounded(scale: 1)
-        // this is `uci` in JS, it isn't limited by maxCI
-        var uamCarbImpact = (minDelta - currentGlucoseImpact).jsRounded(scale: 1)
         let maxCarbAbsorptionRate = Decimal(30)
         let maxCI = (maxCarbAbsorptionRate * carbSensitivityFactor * Decimal(5) / Decimal(60)).jsRounded(scale: 1)
         if carbImpact > maxCI {
             carbImpact = maxCI
         }
-        // BUG: JS was missing this check, so we added it to our testing JS
-        // carbImpact and uamCarbImpact are the same now, but we'll leave them
-        // as two separate variables to make it easier to debug
-        if uamCarbImpact > maxCI {
-            uamCarbImpact = maxCI
-        }
 
         let carbImpactParams = CarbImpactParams.calculate(
             carbSensitivityFactor: carbSensitivityFactor,
@@ -58,6 +50,9 @@ enum ForecastGenerator {
             currentTime: currentTime
         )
 
+        // this is `uci` in JS, it isn't limited by maxCI
+        let uamCarbImpact = (minDelta - currentGlucoseImpact).jsRounded(scale: 1)
+
         // JS oref initializes all xxxPredBGs array with current glucose, we do the same, then generate
         let iobForecast = forecastIOB(
             startingGlucose: glucose,
@@ -163,7 +158,7 @@ enum ForecastGenerator {
     /// - Returns: Remaining CA time in hours (Decimal)
     static func calculateRemainingCarbAbsorptionTime(
         sensitivityRatio: Decimal,
-        maxMealAbsorptionTime: Decimal,
+        maxMealAbsorptionTime _: Decimal,
         mealCOB: Decimal,
         lastCarbTime: Date?,
         currentTime: Date
@@ -184,7 +179,7 @@ enum ForecastGenerator {
             }
         }
 
-        return min(remainingCarbAbsorptionTime, maxMealAbsorptionTime)
+        return remainingCarbAbsorptionTime
     }
 
     static func computeForecastSelection(

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
TrioTests/OpenAPSSwiftTests/javascript/bundle/determine-basal.js