Skip to content

Limit bolus using suspend threshold. #568

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
merged 4 commits into from
Sep 3, 2017
Merged

Limit bolus using suspend threshold. #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4a5f33
Only recommend bolus that would not bring forecast below range.
ps2 Sep 2, 2017
4e0fd5a
Xcode 8.3 fix
ps2 Sep 2, 2017
54e0e29
Revert inadvertent spacing changes
ps2 Sep 2, 2017
4016a39
Compute the target value as a function of time since the dose started
ps2 Sep 2, 2017
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
637 changes: 296 additions & 341 deletions DoseMathTests/DoseMathTests.swift
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions DoseMathTests/Fixtures/recommend_temp_basal_dropping_then_rising.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{"date": "2015-07-19T18:00:00", "amount": 90},
{"date": "2015-07-19T18:30:00", "amount": 80},
{"date": "2015-07-19T19:00:00", "amount": 100},
{"date": "2015-07-19T19:30:00", "amount": 160},
{"date": "2015-07-19T20:00:00", "amount": 200}
{"date": "2015-07-19T19:00:00", "amount": 80},
{"date": "2015-07-19T20:00:00", "amount": 100},
{"date": "2015-07-19T21:00:00", "amount": 160},
{"date": "2015-07-19T22:00:00", "amount": 200}
]
4 changes: 2 additions & 2 deletions DoseMathTests/Fixtures/recommend_temp_basal_flat_and_high.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[
{"date": "2015-07-19T18:00:00", "amount": 200},
{"date": "2015-07-19T18:30:00", "amount": 200},
]
{"date": "2015-07-19T22:00:00", "amount": 200},
]
10 changes: 5 additions & 5 deletions DoseMathTests/Fixtures/recommend_temp_basal_high_and_falling.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{"date": "2015-07-19T18:00:00", "amount": 240},
{"date": "2015-07-19T18:30:00", "amount": 220},
{"date": "2015-07-19T19:00:00", "amount": 200},
{"date": "2015-07-19T19:30:00", "amount": 160},
{"date": "2015-07-19T20:00:00", "amount": 124}
]
{"date": "2015-07-19T19:00:00", "amount": 220},
{"date": "2015-07-19T20:00:00", "amount": 200},
{"date": "2015-07-19T21:00:00", "amount": 160},
{"date": "2015-07-19T22:00:00", "amount": 124}
]
10 changes: 5 additions & 5 deletions DoseMathTests/Fixtures/recommend_temp_basal_high_and_rising.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{"date": "2015-07-19T18:00:00", "amount": 140},
{"date": "2015-07-19T18:30:00", "amount": 150},
{"date": "2015-07-19T19:00:00", "amount": 160},
{"date": "2015-07-19T19:30:00", "amount": 170},
{"date": "2015-07-19T20:00:00", "amount": 180}
]
{"date": "2015-07-19T19:00:00", "amount": 150},
{"date": "2015-07-19T20:00:00", "amount": 160},
{"date": "2015-07-19T21:00:00", "amount": 170},
{"date": "2015-07-19T22:00:00", "amount": 180}
]
10 changes: 5 additions & 5 deletions DoseMathTests/Fixtures/recommend_temp_basal_in_range_and_rising.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{"date": "2015-07-19T18:00:00", "amount": 90},
{"date": "2015-07-19T18:30:00", "amount": 100},
{"date": "2015-07-19T19:00:00", "amount": 110},
{"date": "2015-07-19T19:30:00", "amount": 120},
{"date": "2015-07-19T20:00:00", "amount": 125}
]
{"date": "2015-07-19T19:00:00", "amount": 100},
{"date": "2015-07-19T20:00:00", "amount": 110},
{"date": "2015-07-19T21:00:00", "amount": 120},
{"date": "2015-07-19T22:00:00", "amount": 125}
]
10 changes: 5 additions & 5 deletions DoseMathTests/Fixtures/recommend_temp_basal_start_low_end_high.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{"date": "2015-07-19T18:00:00", "amount": 60},
{"date": "2015-07-19T18:30:00", "amount": 80},
{"date": "2015-07-19T19:00:00", "amount": 120},
{"date": "2015-07-19T19:30:00", "amount": 160},
{"date": "2015-07-19T20:00:00", "amount": 200}
]
{"date": "2015-07-19T19:00:00", "amount": 80},
{"date": "2015-07-19T20:00:00", "amount": 120},
{"date": "2015-07-19T21:00:00", "amount": 160},
{"date": "2015-07-19T22:00:00", "amount": 200}
]
46 changes: 24 additions & 22 deletions Loop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
438A95A81D8B9B24009D12E1 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 438A95A71D8B9B24009D12E1 /* xDripG5.framework */; };
438D42F91D7C88BC003244B0 /* PredictionInputEffect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */; };
438D42FB1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */; };
43947D731F529FAA00A07D31 /* GlucoseRangeSchedule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C513181E864C4E001547C7 /* GlucoseRangeSchedule.swift */; };
439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897361CD2F80600223065 /* AnalyticsManager.swift */; };
4398973B1CD2FC2000223065 /* NSDateFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4398973A1CD2FC2000223065 /* NSDateFormatter.swift */; };
439BED2A1E76093C00B0AED5 /* CGMManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439BED291E76093C00B0AED5 /* CGMManager.swift */; };
Expand Down Expand Up @@ -1281,7 +1282,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0820;
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = "LoopKit Authors";
TargetAttributes = {
43776F8B1B8022E90074EA36 = {
Expand Down Expand Up @@ -1502,7 +1503,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# /usr/local/bin/carthage build --platform \"$PLATFORM_NAME\" \"$SRCROOT\"\n# Only run this script if we're not using a workspace or installing\nif [ ! -d $PROJECT_DIR/Loop.xcworkspace ] || [ \"$ACTION\" = \"install\" ]; then\n /usr/local/bin/carthage copy-frameworks\nfi";
shellScript = "# /usr/local/bin/carthage build --platform \"$PLATFORM_NAME\" \"$SRCROOT\"\n# Only run this script if we're not using a workspace or installing\nif [ ! -d $PROJECT_DIR/Loop.xcworkspace ] || [ \"$ACTION\" = \"install\" ]; then\n /usr/local/bin/carthage copy-frameworks\nfi";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -1663,6 +1664,7 @@
buildActionMask = 2147483647;
files = (
C17824A11E19E8C200D9D25C /* GlucoseThreshold.swift in Sources */,
43947D731F529FAA00A07D31 /* GlucoseRangeSchedule.swift in Sources */,
43E2D8DC1D20C049004DA55F /* DoseMath.swift in Sources */,
43E2D8DB1D20C03B004DA55F /* NSTimeInterval.swift in Sources */,
43E2D8D41D20BF42004DA55F /* DoseMathTests.swift in Sources */,
Expand Down Expand Up @@ -1842,7 +1844,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: [email protected] (XZN842LDLT)";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 39;
CURRENT_PROJECT_VERSION = 39;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -1870,7 +1872,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0.1;
SWIFT_VERSION = 3.0.1;
TARGETED_DEVICE_FAMILY = "1,2";
WARNING_CFLAGS = "-Wall";
};
Expand Down Expand Up @@ -1900,7 +1902,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: [email protected] (XZN842LDLT)";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 39;
CURRENT_PROJECT_VERSION = 39;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -1921,7 +1923,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0.1;
SWIFT_VERSION = 3.0.1;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
WARNING_CFLAGS = "-Wall";
Expand All @@ -1935,7 +1937,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Loop/Loop.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Loop/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
"OTHER_SWIFT_FLAGS[sdk=iphonesimulator*]" = "-D IOS_SIMULATOR";
Expand All @@ -1952,7 +1954,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Loop/Loop.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Loop/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER)";
Expand All @@ -1967,7 +1969,7 @@
ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "WatchApp Extension/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).watchkitapp.watchkitextension";
Expand All @@ -1985,7 +1987,7 @@
ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "WatchApp Extension/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).watchkitapp.watchkitextension";
Expand All @@ -2004,7 +2006,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
IBSC_MODULE = WatchApp_Extension;
INFOPLIST_FILE = WatchApp/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -2024,7 +2026,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
IBSC_MODULE = WatchApp_Extension;
INFOPLIST_FILE = WatchApp/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -2042,7 +2044,7 @@
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = DoseMathTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.DoseMathTests;
Expand All @@ -2055,7 +2057,7 @@
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = DoseMathTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.DoseMathTests;
Expand All @@ -2069,7 +2071,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ANALYZER_NONNULL = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = LoopTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.LoopTests;
Expand All @@ -2084,7 +2086,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ANALYZER_NONNULL = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = LoopTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.LoopTests;
Expand All @@ -2102,7 +2104,7 @@
CODE_SIGN_ENTITLEMENTS = "Loop Status Extension/Loop Status Extension.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "Loop Status Extension/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).statuswidget";
Expand All @@ -2121,7 +2123,7 @@
CODE_SIGN_ENTITLEMENTS = "Loop Status Extension/Loop Status Extension.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "Loop Status Extension/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).statuswidget";
Expand All @@ -2139,11 +2141,11 @@
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CURRENT_PROJECT_VERSION = 39;
CURRENT_PROJECT_VERSION = 39;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 39;
DYLIB_CURRENT_VERSION = 39;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = LoopUI/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand All @@ -2166,11 +2168,11 @@
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CURRENT_PROJECT_VERSION = 39;
CURRENT_PROJECT_VERSION = 39;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 39;
DYLIB_CURRENT_VERSION = 39;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = LoopUI/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down
12 changes: 12 additions & 0 deletions Loop/Extensions/GlucoseRangeSchedule.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import LoopKit
import HealthKit


extension GlucoseRangeSchedule {
Expand All @@ -21,4 +22,15 @@ extension GlucoseRangeSchedule {

return override.isActive()
}

func minQuantity(at date: Date) -> HKQuantity {
return HKQuantity(unit: unit, doubleValue: value(at: date).minValue)
}
}


extension DoubleRange {
var averageValue: Double {
return (maxValue + minValue) / 2
}
}
Loading