Add Integral Retrospective Correction Option to Algorithm Experiments (#2008)

* sign

* add irc to settings

* rc selection view

* rc selection in settings

* rc selection in data manager

* rc subtitle test

* add irc file

* enable irc

* correct report of discrepancies

* watch updates

* sign

* merge fixes

* clean SettingsView

* refactor enabled RC algo

* fix IRC description

* update RC algo upon settings change

* default IRC

* fix rebase to Loop dev

* Restore automatic signing

* Isolation of code and moved settings to Experimental Section

* Removed unnecessary xcscheme files

* moved up algorithmExperimentsSection

* copy paste error

* dark mode fix

* dark mode fix

* make consistent with dev updates

* Glucose Based Partial Application Factor (#1988)

* Add Dosing Strategy: automaticBolusSlidingScale

* Reverse order of two new constants

* revert to dev for dosing strategy selection

* revert to dev for dosing strategy selection

* Rename to effectiveBolusApplicationFactor, change to flag inside existing automaticBolus case

* Add applyLinearRamp slider to Dosing Strategy

* Update constants

* Modify explanation seen by user

* missed one phrase

* Update explanation seen by user, modify font

* Enable swapping of original and replacment protocols, minimize LoopKit changes

* Restore to dev branch version prior to pr1988_update merge

* Restore to dev branch version prior to update for PR 1988

* Updates per requested changes for Loop PR 1988

* Renaming, adjusting views, logging

* Wording change

* Logging error fixed

* dead code

* missed rename

* dark mode fix

* Updated algorithm experiments view and glucose based partial application view

* Put algorithm experiments behind feature flag

---------

Co-authored-by: Jonas Björkert <jonas@bjorkert.se>
Co-authored-by: Pete Schwamb <pete@schwamb.net>

* Wording tweak

* Font adjustments

* Change settings.enabledRetrospectiveCorrectionAlgorithm back to var

* Reorg some files

---------

Co-authored-by: @dm61 <maksimov@colorado.edu>
Co-authored-by: Jonas Björkert <jonas@bjorkert.se>
Co-authored-by: Jonas Björkert <bjorkert@me.com>
Co-authored-by: Pete Schwamb <pete@schwamb.net>

Author: 4 people

Common/Extensions/GlucoseRangeSchedule.swift

@@ -13,6 +13,9 @@ extension GlucoseRangeSchedule {
     func minQuantity(at date: Date) -> HKQuantity {
         return HKQuantity(unit: unit, doubleValue: value(at: date).minValue)
     }
+    func maxQuantity(at date: Date) -> HKQuantity {
+        return HKQuantity(unit: unit, doubleValue: value(at: date).maxValue)
+    }
 }
 
 

Loop.xcodeproj/project.pbxproj

@@ -331,6 +331,7 @@
 		89F9119424358E4500ECCAF3 /* CarbAbsorptionTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89F9119324358E4500ECCAF3 /* CarbAbsorptionTime.swift */; };
 		89F9119624358E6900ECCAF3 /* BolusPickerValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89F9119524358E6900ECCAF3 /* BolusPickerValues.swift */; };
 		89FE21AD24AC57E30033F501 /* Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89FE21AC24AC57E30033F501 /* Collection.swift */; };
+		9E1B653A26F7D14E00D5BD24 /* IntegralRetrospectiveCorrection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E1B653926F7D14E00D5BD24 /* IntegralRetrospectiveCorrection.swift */; };
 		A90EF53C25DEF06200F32D61 /* PluginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C16DA84122E8E112008624C2 /* PluginManager.swift */; };
 		A90EF54425DEF0A000F32D61 /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5EE209D84BE00D17AA8 /* OSLog.swift */; };
 		A91D2A3F26CF0FF80023B075 /* IconTitleSubtitleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A91D2A3E26CF0FF80023B075 /* IconTitleSubtitleTableViewCell.swift */; };
@@ -518,6 +519,7 @@
 		C1FB428D21791D2500FAB378 /* PumpManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C3B6F620BBCAA30026CAFA /* PumpManager.swift */; };
 		C1FB428F217921D600FAB378 /* PumpManagerUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1FB428E217921D600FAB378 /* PumpManagerUI.swift */; };
 		C1FB4290217922A100FAB378 /* PumpManagerUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1FB428E217921D600FAB378 /* PumpManagerUI.swift */; };
+		DD3DBD292A33AFE9000F8B5B /* IntegralRetrospectiveCorrectionSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3DBD282A33AFE9000F8B5B /* IntegralRetrospectiveCorrectionSelectionView.swift */; };
 		DDC389F62A2B61750066E2E8 /* ApplicationFactorStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC389F52A2B61750066E2E8 /* ApplicationFactorStrategy.swift */; };
 		DDC389F82A2B620B0066E2E8 /* GlucoseBasedApplicationFactorStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC389F72A2B620B0066E2E8 /* GlucoseBasedApplicationFactorStrategy.swift */; };
 		DDC389FA2A2B62470066E2E8 /* ConstantApplicationFactorStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC389F92A2B62470066E2E8 /* ConstantApplicationFactorStrategy.swift */; };
@@ -1321,6 +1323,7 @@
 		89F9119324358E4500ECCAF3 /* CarbAbsorptionTime.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarbAbsorptionTime.swift; sourceTree = "<group>"; };
 		89F9119524358E6900ECCAF3 /* BolusPickerValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BolusPickerValues.swift; sourceTree = "<group>"; };
 		89FE21AC24AC57E30033F501 /* Collection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Collection.swift; sourceTree = "<group>"; };
+		9E1B653926F7D14E00D5BD24 /* IntegralRetrospectiveCorrection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegralRetrospectiveCorrection.swift; sourceTree = "<group>"; };
 		A900531A28D60862000BC15B /* Loop.shortcut */ = {isa = PBXFileReference; lastKnownFileType = file; path = Loop.shortcut; sourceTree = "<group>"; };
 		A900531B28D608CA000BC15B /* Cancel Override.shortcut */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Cancel Override.shortcut"; sourceTree = "<group>"; };
 		A900531C28D6090D000BC15B /* Loop Remote Overrides.shortcut */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Loop Remote Overrides.shortcut"; sourceTree = "<group>"; };
@@ -1692,6 +1695,7 @@
 		C1FF3D4B29C786A900BDC1EC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = "<group>"; };
 		C1FF3D4C29C786A900BDC1EC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = "<group>"; };
 		C1FF3D4D29C786A900BDC1EC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DD3DBD282A33AFE9000F8B5B /* IntegralRetrospectiveCorrectionSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegralRetrospectiveCorrectionSelectionView.swift; sourceTree = "<group>"; };
 		DDC389F52A2B61750066E2E8 /* ApplicationFactorStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationFactorStrategy.swift; sourceTree = "<group>"; };
 		DDC389F72A2B620B0066E2E8 /* GlucoseBasedApplicationFactorStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlucoseBasedApplicationFactorStrategy.swift; sourceTree = "<group>"; };
 		DDC389F92A2B62470066E2E8 /* ConstantApplicationFactorStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstantApplicationFactorStrategy.swift; sourceTree = "<group>"; };
@@ -2040,31 +2044,35 @@
 			children = (
 				43511CDF21FD80E400566C63 /* RetrospectiveCorrection.swift */,
 				43511CE021FD80E400566C63 /* StandardRetrospectiveCorrection.swift */,
+				9E1B653926F7D14E00D5BD24 /* IntegralRetrospectiveCorrection.swift */,
 			);
 			path = RetrospectiveCorrection;
 			sourceTree = "<group>";
 		};
 		43757D131C06F26C00910CB9 /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				A99A114029A581D6007919CE /* Remote */,
-				43511CDD21FD80AD00566C63 /* RetrospectiveCorrection */,
-				A9FB75F0252BE320004C7D3F /* BolusDosingDecision.swift */,
-				C17824A41E1AD4D100D9D25C /* ManualBolusRecommendation.swift */,
+				DDC389F52A2B61750066E2E8 /* ApplicationFactorStrategy.swift */,
 				B4E2022F2661063E009421B5 /* AutomaticDosingStatus.swift */,
+				A9FB75F0252BE320004C7D3F /* BolusDosingDecision.swift */,
+				DDC389F92A2B62470066E2E8 /* ConstantApplicationFactorStrategy.swift */,
+				C1EF747128D6A44A00C8C083 /* CrashRecoveryManager.swift */,
+				DDC389F72A2B620B0066E2E8 /* GlucoseBasedApplicationFactorStrategy.swift */,
 				B40D07C6251A89D500C1C6D7 /* GlucoseDisplay.swift */,
 				43C2FAE01EB656A500364AFF /* GlucoseEffectVelocity.swift */,
+				C1C660D0252E4DD5009B5C32 /* LoopConstants.swift */,
 				436A0DA41D236A2A00104B24 /* LoopError.swift */,
+				E9C00EF424C623EF00628F35 /* LoopSettings+Loop.swift */,
 				A9B996EF27235191002DC09C /* LoopWarning.swift */,
+				C17824A41E1AD4D100D9D25C /* ManualBolusRecommendation.swift */,
 				4F526D601DF8D9A900A04910 /* NetBasal.swift */,
 				438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */,
-				4328E0311CFC068900E199AA /* WatchContext+LoopKit.swift */,
-				E9C00EF424C623EF00628F35 /* LoopSettings+Loop.swift */,
-				A987CD4824A58A0100439ADC /* ZipArchive.swift */,
+				A99A114029A581D6007919CE /* Remote */,
+				43511CDD21FD80AD00566C63 /* RetrospectiveCorrection */,
 				C19008FD25225D3900721625 /* SimpleBolusCalculator.swift */,
 				C1E3862428247B7100F561A4 /* StoredLoopNotRunningNotification.swift */,
-				C1C660D0252E4DD5009B5C32 /* LoopConstants.swift */,
-				C1EF747128D6A44A00C8C083 /* CrashRecoveryManager.swift */,
+				4328E0311CFC068900E199AA /* WatchContext+LoopKit.swift */,
+				A987CD4824A58A0100439ADC /* ZipArchive.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -2324,7 +2332,6 @@
 			isa = PBXGroup;
 			children = (
 				A98556842493F901000FD662 /* AlertStore+SimulatedCoreData.swift */,
-				DDC389FB2A2BC6670066E2E8 /* SettingsView+algorithmExperimentsSection.swift */,
 				C1D289B422F90A52003FFBD9 /* BasalDeliveryState.swift */,
 				A9F703722489BC8500C98AD8 /* CarbStore+SimulatedCoreData.swift */,
 				C17824991E1999FA00D9D25C /* CaseCountable.swift */,
@@ -2407,11 +2414,13 @@
 				438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */,
 				439706E522D2E84900C81566 /* PredictionSettingTableViewCell.swift */,
 				1DE09BA824A3E23F009EE9F9 /* SettingsView.swift */,
+				DDC389FB2A2BC6670066E2E8 /* SettingsView+algorithmExperimentsSection.swift */,
 				C1DE5D22251BFC4D00439E49 /* SimpleBolusView.swift */,
 				43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */,
 				4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */,
 				C1AF062229426300002C1B19 /* ManualGlucoseEntryRow.swift */,
 				DDC389FD2A2C4C830066E2E8 /* GlucoseBasedApplicationFactorSelectionView.swift */,
+				DD3DBD282A33AFE9000F8B5B /* IntegralRetrospectiveCorrectionSelectionView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -2453,9 +2462,6 @@
 				C1F2075B26D6F9B0007AB7EB /* ProfileExpirationAlerter.swift */,
 				A96DAC2B2838F31200D94E38 /* SharedLogging.swift */,
 				7E69CFFB2A16A77E00203CBD /* ResetLoopManager.swift */,
-				DDC389F52A2B61750066E2E8 /* ApplicationFactorStrategy.swift */,
-				DDC389F72A2B620B0066E2E8 /* GlucoseBasedApplicationFactorStrategy.swift */,
-				DDC389F92A2B62470066E2E8 /* ConstantApplicationFactorStrategy.swift */,
 			);
 			path = Managers;
 			sourceTree = "<group>";
@@ -3878,6 +3884,7 @@
 				A9CBE45A248ACBE1008E7BA2 /* DosingDecisionStore+SimulatedCoreData.swift in Sources */,
 				A9C62D8A2331703100535612 /* ServicesManager.swift in Sources */,
 				43DBF0531C93EC8200B3C386 /* DeviceDataManager.swift in Sources */,
+				9E1B653A26F7D14E00D5BD24 /* IntegralRetrospectiveCorrection.swift in Sources */,
 				A9347F2F24E7508A00C99C34 /* WatchHistoricalCarbs.swift in Sources */,
 				A9B996F027235191002DC09C /* LoopWarning.swift in Sources */,
 				C17824A01E19CF9800D9D25C /* GlucoseThresholdTableViewController.swift in Sources */,
@@ -3912,6 +3919,7 @@
 				C178249A1E1999FA00D9D25C /* CaseCountable.swift in Sources */,
 				B4F3D25124AF890C0095CE44 /* BluetoothStateManager.swift in Sources */,
 				1DDE273D24AEA4B000796622 /* SettingsViewModel.swift in Sources */,
+				DD3DBD292A33AFE9000F8B5B /* IntegralRetrospectiveCorrectionSelectionView.swift in Sources */,
 				A9347F3124E7521800C99C34 /* CarbBackfillRequestUserInfo.swift in Sources */,
 				A9CBE458248AB564008E7BA2 /* DoseStore+SimulatedCoreData.swift in Sources */,
 				897A5A9924C22DE800C4E71D /* BolusEntryViewModel.swift in Sources */,

Loop/Managers/LoopDataManager.swift

@@ -2120,9 +2120,11 @@ extension LoopDataManager {
                 }),
                 "]",
 
+                "integralRetrospectiveCorrectionEnabled: \(UserDefaults.standard.integralRetrospectiveCorrectionEnabled)",
+                
                 "retrospectiveGlucoseDiscrepancies: [",
                 "* GlucoseEffect(start, mg/dL)",
-                (state.retrospectiveGlucoseDiscrepancies ?? []).reduce(into: "", { (entries, entry) in
+                (manager.retrospectiveGlucoseDiscrepancies ?? []).reduce(into: "", { (entries, entry) in
                     entries.append("* \(entry.startDate), \(entry.quantity.doubleValue(for: .milligramsPerDeciliter))\n")
                 }),
                 "]",

Loop/Managers/ApplicationFactorStrategy.swift renamed to Loop/Models/ApplicationFactorStrategy.swift

@@ -40,18 +40,3 @@ struct GlucoseBasedApplicationFactorStrategy: ApplicationFactorStrategy {
         return effectiveBolusApplicationFactor
     }
 }
-
-extension UserDefaults {
-    private enum Key: String {
-        case GlucoseBasedApplicationFactorEnabled = "com.loopkit.algorithmExperiments.glucoseBasedApplicationFactorEnabled"
-    }
-
-    var glucoseBasedApplicationFactorEnabled: Bool {
-        get {
-            bool(forKey: Key.GlucoseBasedApplicationFactorEnabled.rawValue) as Bool
-        }
-        set {
-            set(newValue, forKey: Key.GlucoseBasedApplicationFactorEnabled.rawValue)
-        }
-    }
-}

Loop/Managers/ConstantApplicationFactorStrategy.swift renamed to Loop/Models/ConstantApplicationFactorStrategy.swift

@@ -19,9 +19,20 @@ extension LoopSettings {
     }
 
     static let retrospectiveCorrectionEffectDuration = TimeInterval(hours: 1)
-
-    /// Creates an instance of the enabled retrospective correction implementation
+    
+    /// Creates an instance of the enabled retrospective correction implementation    
     var enabledRetrospectiveCorrectionAlgorithm: RetrospectiveCorrection {
-        return StandardRetrospectiveCorrection(effectDuration: LoopSettings.retrospectiveCorrectionEffectDuration)
+        var enabledRetrospectiveCorrectionAlgorithm: RetrospectiveCorrection
+        
+        let isIntegralRetrospectiveCorrectionEnabled = UserDefaults.standard.integralRetrospectiveCorrectionEnabled
+        
+        if isIntegralRetrospectiveCorrectionEnabled {
+            enabledRetrospectiveCorrectionAlgorithm = IntegralRetrospectiveCorrection(effectDuration: LoopSettings.retrospectiveCorrectionEffectDuration)
+        } else {
+            enabledRetrospectiveCorrectionAlgorithm = StandardRetrospectiveCorrection(effectDuration: LoopSettings.retrospectiveCorrectionEffectDuration)
+        }
+        
+        return enabledRetrospectiveCorrectionAlgorithm
     }
+    
 }