Skip to content

Remove default value for allowPredictiveTempBelowRange #297

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
Dec 2, 2016
Merged

Remove default value for allowPredictiveTempBelowRange #297

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
4bc2636
Merge pull request #1 from LoopKit/dev
Dec 1, 2016
89dd06b
Merge remote-tracking branch 'upstream/dev' into dev
Dec 1, 2016
0e57056
Copy InsulinKit framework for DoseMathTests (otherwise it won't run)
Dec 2, 2016
e6d90f5
Remove default value for allowPredictiveTempBelowRange
Dec 2, 2016
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
48 changes: 32 additions & 16 deletions DoseMathTests/DoseMathTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertNil(dose)
Expand All @@ -112,7 +113,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertNil(dose)
Expand All @@ -132,7 +134,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqual(0, dose!.rate)
Expand All @@ -148,7 +151,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqual(0, dose!.rate)
Expand Down Expand Up @@ -197,7 +201,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0)
Expand All @@ -218,7 +223,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertNil(dose)
Expand All @@ -238,7 +244,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0)
Expand All @@ -259,7 +266,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0)
Expand Down Expand Up @@ -309,7 +317,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqual(0, dose!.rate)
Expand All @@ -325,7 +334,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqual(0, dose!.rate)
Expand Down Expand Up @@ -375,7 +385,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqual(3.0, dose!.rate)
Expand All @@ -391,7 +402,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqualWithAccuracy(1.425, dose!.rate, accuracy: 1.0 / 40.0)
Expand All @@ -407,7 +419,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqualWithAccuracy(1.475, dose!.rate, accuracy: 1.0 / 40.0)
Expand All @@ -423,7 +436,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: self.insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqual(3.0, dose!.rate)
Expand All @@ -438,7 +452,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertEqualWithAccuracy(2.975, dose!.rate, accuracy: 1.0 / 40.0)
Expand All @@ -451,7 +466,8 @@ class RecommendTempBasalTests: XCTestCase {
maxBasalRate: maxBasalRate,
glucoseTargetRange: glucoseTargetRange,
insulinSensitivity: insulinSensitivitySchedule,
basalRateSchedule: basalRateSchedule
basalRateSchedule: basalRateSchedule,
allowPredictiveTempBelowRange: false
)

XCTAssertNil(dose)
Expand Down
2 changes: 2 additions & 0 deletions Loop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@
43FBEDD81D73843700B21F22 /* LevelMaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43FBEDD71D73843700B21F22 /* LevelMaskView.swift */; };
4D3B40041D4A9E1A00BC6334 /* G4ShareSpy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */; };
4D5B7A4B1D457CCA00796CA9 /* GlucoseG4.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.swift */; };
4F526D5D1DF0FD6500A04910 /* InsulinKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43C6407B1DA051850093E25D /* InsulinKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */; };
C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */; };
C17884631D51A7A400405663 /* BatteryIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17884621D51A7A400405663 /* BatteryIndicator.swift */; };
Expand Down Expand Up @@ -234,6 +235,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
4F526D5D1DF0FD6500A04910 /* InsulinKit.framework in CopyFiles */,
43E2D9171D2226BD004DA55F /* LoopKit.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
2 changes: 1 addition & 1 deletion Loop/Managers/DoseMath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct DoseMath {
glucoseTargetRange: GlucoseRangeSchedule,
insulinSensitivity: InsulinSensitivitySchedule,
basalRateSchedule: BasalRateSchedule,
allowPredictiveTempBelowRange: Bool = false
allowPredictiveTempBelowRange: Bool
) -> (rate: Double, duration: TimeInterval)? {
guard glucose.count > 1 else {
return nil
Expand Down