Skip to content

Functional loop algorithm #2059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ps2 merged 7 commits into from
Sep 6, 2023
Merged

Functional loop algorithm #2059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da11ae9
StoredCarbEntry constructor signature change
ps2 Aug 17, 2023
ea8c5c0
Merge remote-tracking branch 'origin/dev' into functional-loop-algorithm
ps2 Aug 25, 2023
599ba10
Adding test for Loop functional algorithm
ps2 Aug 25, 2023
a6a057f
Tests passing
ps2 Sep 2, 2023
a5f44a2
Cleanup
ps2 Sep 2, 2023
687c055
CarbValue struct update
ps2 Sep 5, 2023
d190fd5
Update live capture test with updated durations of input data, and st…
ps2 Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions Loop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,6 @@
C1201E2C23ECDBD0002DA84A /* WatchContextRequestUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1201E2B23ECDBD0002DA84A /* WatchContextRequestUserInfo.swift */; };
C1201E2D23ECDF3D002DA84A /* WatchContextRequestUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1201E2B23ECDBD0002DA84A /* WatchContextRequestUserInfo.swift */; };
C13072BA2A76AF31009A7C58 /* live_capture_predicted_glucose.json in Resources */ = {isa = PBXBuildFile; fileRef = C13072B92A76AF31009A7C58 /* live_capture_predicted_glucose.json */; };
C13072BE2A76AF97009A7C58 /* live_capture_doses.json in Resources */ = {isa = PBXBuildFile; fileRef = C13072BD2A76AF97009A7C58 /* live_capture_doses.json */; };
C13072C02A76B041009A7C58 /* live_capture_carb_entries.json in Resources */ = {isa = PBXBuildFile; fileRef = C13072BF2A76B041009A7C58 /* live_capture_carb_entries.json */; };
C13072C42A76B0B1009A7C58 /* live_capture_historic_glucose.json in Resources */ = {isa = PBXBuildFile; fileRef = C13072C32A76B0B1009A7C58 /* live_capture_historic_glucose.json */; };
C13255D6223E7BE2008AF50C /* BolusProgressTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C1F8B1DB223862D500DD66CF /* BolusProgressTableViewCell.xib */; };
C13DA2B024F6C7690098BB29 /* UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13DA2AF24F6C7690098BB29 /* UIViewController.swift */; };
C148CEE724FD91BD00711B3B /* DeliveryUncertaintyAlertManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C148CEE624FD91BD00711B3B /* DeliveryUncertaintyAlertManager.swift */; };
Expand All @@ -434,6 +431,7 @@
C16B983E26B4893300256B05 /* DoseEnactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C16B983D26B4893300256B05 /* DoseEnactor.swift */; };
C16B984026B4898800256B05 /* DoseEnactorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C16B983F26B4898800256B05 /* DoseEnactorTests.swift */; };
C16DA84222E8E112008624C2 /* PluginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C16DA84122E8E112008624C2 /* PluginManager.swift */; };
C16FC0B02A99392F0025E239 /* live_capture_input.json in Resources */ = {isa = PBXBuildFile; fileRef = C16FC0AF2A99392F0025E239 /* live_capture_input.json */; };
C1735B1E2A0809830082BB8A /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = C1735B1D2A0809830082BB8A /* ZIPFoundation */; };
C1742332259BEADC00399C9D /* ManualEntryDoseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1742331259BEADC00399C9D /* ManualEntryDoseView.swift */; };
C174233C259BEB0F00399C9D /* ManualEntryDoseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C174233B259BEB0F00399C9D /* ManualEntryDoseViewModel.swift */; };
Expand Down Expand Up @@ -470,6 +468,7 @@
C1D0B6302986D4D90098D215 /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1D0B62F2986D4D90098D215 /* LocalizedString.swift */; };
C1D0B6312986D4D90098D215 /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1D0B62F2986D4D90098D215 /* LocalizedString.swift */; };
C1D289B522F90A52003FFBD9 /* BasalDeliveryState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1D289B422F90A52003FFBD9 /* BasalDeliveryState.swift */; };
C1D476B42A8ED179002C1C87 /* LoopAlgorithmTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1D476B32A8ED179002C1C87 /* LoopAlgorithmTests.swift */; };
C1D6EEA02A06C7270047DE5C /* MKRingProgressView in Frameworks */ = {isa = PBXBuildFile; productRef = C1D6EE9F2A06C7270047DE5C /* MKRingProgressView */; };
C1DE5D23251BFC4D00439E49 /* SimpleBolusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1DE5D22251BFC4D00439E49 /* SimpleBolusView.swift */; };
C1E2773E224177C000354103 /* ClockKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1E2773D224177C000354103 /* ClockKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
Expand Down Expand Up @@ -1420,9 +1419,6 @@
C12CB9B623106A6200F84978 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Intents.strings; sourceTree = "<group>"; };
C12CB9B823106A6300F84978 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Intents.strings; sourceTree = "<group>"; };
C13072B92A76AF31009A7C58 /* live_capture_predicted_glucose.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = live_capture_predicted_glucose.json; sourceTree = "<group>"; };
C13072BD2A76AF97009A7C58 /* live_capture_doses.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = live_capture_doses.json; sourceTree = "<group>"; };
C13072BF2A76B041009A7C58 /* live_capture_carb_entries.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = live_capture_carb_entries.json; sourceTree = "<group>"; };
C13072C32A76B0B1009A7C58 /* live_capture_historic_glucose.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = live_capture_historic_glucose.json; sourceTree = "<group>"; };
C13DA2AF24F6C7690098BB29 /* UIViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewController.swift; sourceTree = "<group>"; };
C148CEE624FD91BD00711B3B /* DeliveryUncertaintyAlertManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeliveryUncertaintyAlertManager.swift; sourceTree = "<group>"; };
C14952142995822A0095AA84 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = "<group>"; };
Expand All @@ -1445,6 +1441,7 @@
C16B983D26B4893300256B05 /* DoseEnactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoseEnactor.swift; sourceTree = "<group>"; };
C16B983F26B4898800256B05 /* DoseEnactorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoseEnactorTests.swift; sourceTree = "<group>"; };
C16DA84122E8E112008624C2 /* PluginManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginManager.swift; sourceTree = "<group>"; };
C16FC0AF2A99392F0025E239 /* live_capture_input.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = live_capture_input.json; sourceTree = "<group>"; };
C1742331259BEADC00399C9D /* ManualEntryDoseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManualEntryDoseView.swift; sourceTree = "<group>"; };
C174233B259BEB0F00399C9D /* ManualEntryDoseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManualEntryDoseViewModel.swift; sourceTree = "<group>"; };
C174571329830930009EFCF2 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1542,6 +1539,7 @@
C1D0B62F2986D4D90098D215 /* LocalizedString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizedString.swift; sourceTree = "<group>"; };
C1D197FE232CF92D0096D646 /* capture-build-details.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "capture-build-details.sh"; sourceTree = "<group>"; };
C1D289B422F90A52003FFBD9 /* BasalDeliveryState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasalDeliveryState.swift; sourceTree = "<group>"; };
C1D476B32A8ED179002C1C87 /* LoopAlgorithmTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoopAlgorithmTests.swift; sourceTree = "<group>"; };
C1D70F7A2A914F71009FE129 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/InfoPlist.strings; sourceTree = "<group>"; };
C1DA986B2843B6F9001D04CC /* PersistedProperty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistedProperty.swift; sourceTree = "<group>"; };
C1DE5D22251BFC4D00439E49 /* SimpleBolusView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimpleBolusView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1864,6 +1862,7 @@
E9B3552C293592B40076AB04 /* MealDetectionManagerTests.swift */,
1D70C40026EC0F9D00C62570 /* SupportManagerTests.swift */,
A9F5F1F4251050EC00E7C8A4 /* ZipArchiveTests.swift */,
C1D476B32A8ED179002C1C87 /* LoopAlgorithmTests.swift */,
);
path = Managers;
sourceTree = "<group>";
Expand Down Expand Up @@ -2755,9 +2754,7 @@
isa = PBXGroup;
children = (
C13072B92A76AF31009A7C58 /* live_capture_predicted_glucose.json */,
C13072BD2A76AF97009A7C58 /* live_capture_doses.json */,
C13072BF2A76B041009A7C58 /* live_capture_carb_entries.json */,
C13072C32A76B0B1009A7C58 /* live_capture_historic_glucose.json */,
C16FC0AF2A99392F0025E239 /* live_capture_input.json */,
);
path = live_capture;
sourceTree = "<group>";
Expand Down Expand Up @@ -3412,7 +3409,6 @@
E93E86CE24E2E02200FF40C8 /* high_and_stable_momentum_effect.json in Resources */,
C13072BA2A76AF31009A7C58 /* live_capture_predicted_glucose.json in Resources */,
E93E865424DB6CBA00FF40C8 /* retrospective_output.json in Resources */,
C13072BE2A76AF97009A7C58 /* live_capture_doses.json in Resources */,
E9C58A7F24DB529A00487A17 /* counteraction_effect_falling_glucose.json in Resources */,
E93E865624DB731900FF40C8 /* predicted_glucose_without_retrospective.json in Resources */,
E9B3553D293706CB0076AB04 /* long_interval_counteraction_effect.json in Resources */,
Expand All @@ -3425,12 +3421,12 @@
E90909D224E34AC500F963D2 /* high_and_rising_with_cob_insulin_effect.json in Resources */,
E90909F224E35B4D00F963D2 /* high_and_falling_counteraction_effect.json in Resources */,
E90909EE24E35B4000F963D2 /* high_and_falling_predicted_glucose.json in Resources */,
C13072C02A76B041009A7C58 /* live_capture_carb_entries.json in Resources */,
E90909DD24E34F1600F963D2 /* low_and_falling_carb_effect.json in Resources */,
E90909E924E3530200F963D2 /* low_with_low_treatment_predicted_glucose.json in Resources */,
E90909D124E34AC500F963D2 /* high_and_rising_with_cob_momentum_effect.json in Resources */,
E9C58A8024DB529A00487A17 /* insulin_effect.json in Resources */,
E90909DF24E34F1600F963D2 /* low_and_falling_insulin_effect.json in Resources */,
C16FC0B02A99392F0025E239 /* live_capture_input.json in Resources */,
E93E86BE24E1FDC400FF40C8 /* flat_and_stable_carb_effect.json in Resources */,
E90909E824E3530200F963D2 /* low_with_low_treatment_insulin_effect.json in Resources */,
E9B3553B293706CB0076AB04 /* noisy_cgm_counteraction_effect.json in Resources */,
Expand All @@ -3451,7 +3447,6 @@
E93E86C324E1FE6100FF40C8 /* flat_and_stable_counteraction_effect.json in Resources */,
E9C58A7E24DB529A00487A17 /* dynamic_glucose_effect_partially_observed.json in Resources */,
E90909F324E35B4D00F963D2 /* high_and_falling_carb_effect.json in Resources */,
C13072C42A76B0B1009A7C58 /* live_capture_historic_glucose.json in Resources */,
E93E86CA24E2E02200FF40C8 /* high_and_stable_insulin_effect.json in Resources */,
E93E86BB24E1FDC400FF40C8 /* flat_and_stable_momentum_effect.json in Resources */,
E93E86CB24E2E02200FF40C8 /* high_and_stable_carb_effect.json in Resources */,
Expand Down Expand Up @@ -3991,6 +3986,7 @@
E93E86A824DDCC4400FF40C8 /* MockDoseStore.swift in Sources */,
B4D4534128E5CA7900F1A8D9 /* AlertMuterTests.swift in Sources */,
E98A55F124EDD85E0008715D /* MockDosingDecisionStore.swift in Sources */,
C1D476B42A8ED179002C1C87 /* LoopAlgorithmTests.swift in Sources */,
8968B114240C55F10074BB48 /* LoopSettingsTests.swift in Sources */,
A9BD28E7272226B40071DF15 /* TestLocalizedError.swift in Sources */,
A9F5F1F5251050EC00E7C8A4 /* ZipArchiveTests.swift in Sources */,
Expand Down
12 changes: 9 additions & 3 deletions Loop/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, WindowProvider {

setenv("CFNETWORK_DIAGNOSTICS", "3", 1)

loopAppManager.initialize(windowProvider: self, launchOptions: launchOptions)
loopAppManager.launch()
if ProcessInfo.processInfo.environment["XCTestConfigurationFilePath"] == nil {
// Code only executes when not running tests
loopAppManager.initialize(windowProvider: self, launchOptions: launchOptions)
loopAppManager.launch()
}
return loopAppManager.isLaunchComplete
}

Expand All @@ -32,7 +35,10 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, WindowProvider {
func applicationDidBecomeActive(_ application: UIApplication) {
log.default(#function)

loopAppManager.didBecomeActive()
if ProcessInfo.processInfo.environment["XCTestConfigurationFilePath"] == nil {
// Code only executes when not running tests
loopAppManager.didBecomeActive()
}
}

func applicationWillResignActive(_ application: UIApplication) {
Expand Down
14 changes: 7 additions & 7 deletions Loop/Extensions/DosingDecisionStore+SimulatedCoreData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,23 +103,23 @@ fileprivate extension StoredDosingDecision {
historicalGlucose.append(HistoricalGlucoseValue(startDate: date.addingTimeInterval(.minutes(minutes)),
quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: 125 + minutes / 5)))
}
let originalCarbEntry = StoredCarbEntry(uuid: UUID(uuidString: "C86DEB61-68E9-464E-9DD5-96A9CB445FD3")!,
let originalCarbEntry = StoredCarbEntry(startDate: date.addingTimeInterval(-.minutes(15)),
quantity: HKQuantity(unit: .gram(), doubleValue: 15),
uuid: UUID(uuidString: "C86DEB61-68E9-464E-9DD5-96A9CB445FD3")!,
provenanceIdentifier: Bundle.main.bundleIdentifier!,
syncIdentifier: "2B03D96C-6F5D-4140-99CD-80C3E64D6010",
syncVersion: 1,
startDate: date.addingTimeInterval(-.minutes(15)),
quantity: HKQuantity(unit: .gram(), doubleValue: 15),
foodType: "Simulated",
absorptionTime: .hours(3),
createdByCurrentApp: true,
userCreatedDate: date.addingTimeInterval(-.minutes(15)),
userUpdatedDate: date.addingTimeInterval(-.minutes(1)))
let carbEntry = StoredCarbEntry(uuid: UUID(uuidString: "71B699D7-0E8F-4B13-B7A1-E7751EB78E74")!,
let carbEntry = StoredCarbEntry(startDate: date.addingTimeInterval(-.minutes(1)),
quantity: HKQuantity(unit: .gram(), doubleValue: 25),
uuid: UUID(uuidString: "71B699D7-0E8F-4B13-B7A1-E7751EB78E74")!,
provenanceIdentifier: Bundle.main.bundleIdentifier!,
syncIdentifier: "2B03D96C-6F5D-4140-99CD-80C3E64D6010",
syncVersion: 2,
startDate: date.addingTimeInterval(-.minutes(1)),
quantity: HKQuantity(unit: .gram(), doubleValue: 25),
foodType: "Simulated",
absorptionTime: .hours(5),
createdByCurrentApp: true,
Expand Down Expand Up @@ -147,7 +147,7 @@ fileprivate extension StoredDosingDecision {
healthKitEligibleDate: nil)
let carbsOnBoard = CarbValue(startDate: date,
endDate: date.addingTimeInterval(.minutes(5)),
quantity: HKQuantity(unit: .gram(), doubleValue: 45.5))
value: 45.5)
let insulinOnBoard = InsulinValue(startDate: date, value: 1.5)
let glucoseTargetRangeSchedule = GlucoseRangeSchedule(rangeSchedule: DailyQuantitySchedule(unit: .milligramsPerDeciliter,
dailyItems: [RepeatingScheduleValue(startTime: .hours(0), value: DoubleRange(minValue: 100.0, maxValue: 110.0)),
Expand Down
Loading