Merge pull request #468 from LoopKit/hkunit-rename

ps2 · web-flow · commit 1ae59e99c1fc · 2017-05-12T20:27:02.000-05:00
renaming milligramsPerDeciliterUnit() to milligramsPerDeciliter()
diff --git a/Common/Extensions/HKUnit.swift b/Common/Extensions/HKUnit.swift
@@ -21,17 +21,17 @@ extension HKUnit {
         }
     }
 
-    static func milligramsPerDeciliterUnit() -> HKUnit {
+    static func milligramsPerDeciliter() -> HKUnit {
         return HKUnit.gramUnit(with: .milli).unitDivided(by: HKUnit.literUnit(with: .deci))
     }
     
-    static func millimolesPerLiterUnit() -> HKUnit {
+    static func millimolesPerLiter() -> HKUnit {
         return HKUnit.moleUnit(with: .milli, molarMass: HKUnitMolarMassBloodGlucose).unitDivided(by: HKUnit.liter())
     }
     
     // A glucose-centric presentation helper for the localized unit string
     var glucoseUnitDisplayString: String {
-        if self == HKUnit.millimolesPerLiterUnit() {
+        if self == HKUnit.millimolesPerLiter() {
             return NSLocalizedString("mmol/L", comment: "The unit display string for millimoles of glucose per liter")
         } else {
             return String(describing: self)
diff --git a/DoseMathTests/DoseMathTests.swift b/DoseMathTests/DoseMathTests.swift
@@ -61,7 +61,7 @@ class RecommendTempBasalTests: XCTestCase {
         return fixture.map {
             return GlucoseFixtureValue(
                 startDate: dateFormatter.date(from: $0["date"] as! String)!,
-                quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: $0["amount"] as! Double)
+                quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: $0["amount"] as! Double)
             )
         }
     }
@@ -81,15 +81,15 @@ class RecommendTempBasalTests: XCTestCase {
     }
 
     var glucoseTargetRange: GlucoseRangeSchedule {
-        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!
+        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!
     }
 
     var insulinSensitivitySchedule: InsulinSensitivitySchedule {
-        return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!
+        return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!
     }
     
     var minimumBGGuard: GlucoseThreshold {
-        return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliterUnit(), value: 55)
+        return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliter(), value: 55)
     }
 
     var insulinActionDuration: TimeInterval {
@@ -385,7 +385,7 @@ class RecommendTempBasalTests: XCTestCase {
         XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration)
 
         // Use mmol sensitivity value
-        let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 3.33)])!
+        let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 3.33)])!
 
         dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
             atDate: glucose.first!.startDate,
@@ -465,7 +465,7 @@ class RecommendBolusTests: XCTestCase {
         return fixture.map {
             return GlucoseFixtureValue(
                 startDate: dateFormatter.date(from: $0["date"] as! String)!,
-                quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: $0["amount"] as! Double)
+                quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: $0["amount"] as! Double)
             )
         }
     }
@@ -485,15 +485,15 @@ class RecommendBolusTests: XCTestCase {
     }
 
     var glucoseTargetRange: GlucoseRangeSchedule {
-        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!
+        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!
     }
 
     var insulinSensitivitySchedule: InsulinSensitivitySchedule {
-        return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!
+        return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!
     }
     
     var minimumBGGuard: GlucoseThreshold {
-        return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliterUnit(), value: 55)
+        return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliter(), value: 55)
     }
 
     var insulinActionDuration: TimeInterval {
@@ -589,13 +589,11 @@ class RecommendBolusTests: XCTestCase {
         XCTAssertEqual(1.325, dose.amount)
 
         if case BolusRecommendationNotice.currentGlucoseBelowTarget(let glucose, let units) = dose.notice! {
-            XCTAssertEqual(units, HKUnit.milligramsPerDeciliterUnit())
+            XCTAssertEqual(units, HKUnit.milligramsPerDeciliter())
             XCTAssertEqual(glucose.quantity.doubleValue(for: units), 60)
         } else {
             XCTFail("Expected currentGlucoseBelowTarget, but got \(dose.notice!)")
         }
-
-        //XCTAssertEqual(BolusRecommendationNotice.currentGlucoseBelowTarget(glucose: GlucoseValue(56), unit: HKUnit.milligramsPerDeciliterUnit()), dose.notice!)
     }
 
     func testDroppingBelowRangeThenRising() {
@@ -747,7 +745,7 @@ class RecommendBolusTests: XCTestCase {
         XCTAssertEqual(1.0, dose.amount)
 
         // Use mmol sensitivity value
-        let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 10.0 / 3)])!
+        let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 10.0 / 3)])!
 
         dose = DoseMath.recommendBolusFromPredictedGlucose(glucose,
             atDate: glucose.first!.startDate,
diff --git a/Loop Status Extension/StatusViewController.swift b/Loop Status Extension/StatusViewController.swift
@@ -50,8 +50,8 @@ class StatusViewController: UIViewController, NCWidgetProviding {
         )
 
         charts.glucoseDisplayRange = (
-            min: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 100),
-            max: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 175)
+            min: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 100),
+            max: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 175)
         )
 
         return charts
diff --git a/Loop/Managers/CGM/EnliteCGMManager.swift b/Loop/Managers/CGM/EnliteCGMManager.swift
@@ -39,7 +39,7 @@ final class EnliteCGMManager: CGMManager {
                     self.sensorState = EnliteSensorDisplayable(latestSensorEvent)
                 }
 
-                let unit = HKUnit.milligramsPerDeciliterUnit()
+                let unit = HKUnit.milligramsPerDeciliter()
                 let glucoseValues = events
                     // TODO: Is the { $0.date > latestGlucoseDate } filter duplicative?
                     .filter({ $0.glucoseEvent is SensorValueGlucoseEvent && $0.date > latestGlucoseDate })
diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift
@@ -178,7 +178,7 @@ final class DeviceDataManager {
             // Enlite data is included
             if let date = glucoseDateComponents?.date {
                 loopManager.addGlucose([(
-                    quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: Double(glucose)),
+                    quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: Double(glucose)),
                     date: date,
                     isDisplayOnly: false
                 )], from: nil)
diff --git a/Loop/Managers/DoseMath.swift b/Loop/Managers/DoseMath.swift
@@ -31,7 +31,7 @@ struct DoseMath {
      - returns: The determined basal rate, in Units/hour
      */
     private static func calculateTempBasalRateForGlucose(_ currentGlucose: HKQuantity, toTargetGlucose targetGlucose: HKQuantity, insulinSensitivity: HKQuantity, currentBasalRate: Double, maxBasalRate: Double, duration: TimeInterval) -> Double {
-        let unit = HKUnit.milligramsPerDeciliterUnit()
+        let unit = HKUnit.milligramsPerDeciliter()
         let doseUnits = (currentGlucose.doubleValue(for: unit) - targetGlucose.doubleValue(for: unit)) / insulinSensitivity.doubleValue(for: unit)
 
         let rate = min(maxBasalRate, max(0, doseUnits / (duration / TimeInterval(hours: 1)) + currentBasalRate))
diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift
@@ -715,7 +715,7 @@ final class LoopDataManager {
         self.retrospectivePredictedGlucose = retrospectivePrediction
 
         guard let lastGlucose = retrospectivePrediction.last else { return }
-        let glucoseUnit = HKUnit.milligramsPerDeciliterUnit()
+        let glucoseUnit = HKUnit.milligramsPerDeciliter()
         let velocityUnit = glucoseUnit.unitDivided(by: HKUnit.second())
 
         let discrepancy = change.end.quantity.doubleValue(for: glucoseUnit) - lastGlucose.quantity.doubleValue(for: glucoseUnit) // mg/dL
diff --git a/Loop/Managers/StatusExtensionDataManager.swift b/Loop/Managers/StatusExtensionDataManager.swift
@@ -62,7 +62,7 @@ final class StatusExtensionDataManager {
                 )
                 context.predictedGlucose = PredictedGlucoseContext(
                     values: (1...36).map { 89.123 + Double($0 * 5) }, // 3 hours of linear data
-                    unit: HKUnit.milligramsPerDeciliterUnit(),
+                    unit: HKUnit.milligramsPerDeciliter(),
                     startDate: Date(),
                     interval: TimeInterval(minutes: 5))
 
diff --git a/Loop/Managers/WatchDataManager.swift b/Loop/Managers/WatchDataManager.swift
@@ -62,7 +62,7 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
     private var lastComplicationContext: WatchContext?
 
     private let minTrendDrift: Double = 20
-    private lazy var minTrendUnit = HKUnit.milligramsPerDeciliterUnit()
+    private lazy var minTrendUnit = HKUnit.milligramsPerDeciliter()
 
     private func sendWatchContext(_ context: WatchContext) {
         if let session = watchSession, session.isPaired && session.isWatchAppInstalled {
diff --git a/Loop/Models/BolusRecommendation.swift b/Loop/Models/BolusRecommendation.swift
@@ -10,6 +10,7 @@ import Foundation
 import LoopKit
 import HealthKit
 
+
 enum BolusRecommendationNotice: CustomStringConvertible, Equatable {
     case glucoseBelowMinimumGuard(minGlucose: GlucoseValue, unit: HKUnit)
     case currentGlucoseBelowTarget(glucose: GlucoseValue, unit: HKUnit)
@@ -74,6 +75,7 @@ struct BolusRecommendation {
     }
 }
 
+
 extension BolusRecommendation: Comparable {
     static func ==(lhs: BolusRecommendation, rhs: BolusRecommendation) -> Bool {
         return lhs.amount == rhs.amount
diff --git a/Loop/Models/GlucoseG4.swift b/Loop/Models/GlucoseG4.swift
@@ -15,7 +15,7 @@ import LoopUI
 
 extension GlucoseG4: GlucoseValue {
     public var quantity: HKQuantity {
-        return HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: Double(glucose))
+        return HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: Double(glucose))
     }
 
     public var startDate: Date {
diff --git a/Loop/Models/ShareGlucose+GlucoseKit.swift b/Loop/Models/ShareGlucose+GlucoseKit.swift
@@ -19,7 +19,7 @@ extension ShareGlucose: GlucoseValue {
     }
 
     public var quantity: HKQuantity {
-        return HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: Double(glucose))
+        return HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: Double(glucose))
     }
 }
 
diff --git a/Loop/View Controllers/BolusViewController.swift b/Loop/View Controllers/BolusViewController.swift
@@ -63,7 +63,7 @@ final class BolusViewController: UITableViewController, IdentifiableClass, UITex
 
     // MARK: - State
 
-    var glucoseUnit: HKUnit = HKUnit.milligramsPerDeciliterUnit()
+    var glucoseUnit: HKUnit = HKUnit.milligramsPerDeciliter()
 
     var bolusRecommendation: BolusRecommendation? = nil {
         didSet {
diff --git a/Loop/View Controllers/PredictionTableViewController.swift b/Loop/View Controllers/PredictionTableViewController.swift
@@ -93,8 +93,8 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
         let charts = StatusChartsManager(colors: .default, settings: .default)
 
         charts.glucoseDisplayRange = (
-            min: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 60),
-            max: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 200)
+            min: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 60),
+            max: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 200)
         )
 
         return charts
diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift
@@ -436,8 +436,8 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         let charts = StatusChartsManager(colors: .default, settings: .default)
 
         charts.glucoseDisplayRange = (
-            min: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 100),
-            max: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 175)
+            min: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 100),
+            max: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 175)
         )
 
         return charts
diff --git a/LoopUI/Managers/StatusChartsManager.swift b/LoopUI/Managers/StatusChartsManager.swift
@@ -110,7 +110,7 @@ public final class StatusChartsManager {
         }
     }
 
-    public var glucoseUnit: HKUnit = HKUnit.milligramsPerDeciliterUnit() {
+    public var glucoseUnit: HKUnit = HKUnit.milligramsPerDeciliter() {
         didSet {
             if glucoseUnit != oldValue {
                 // Regenerate the glucose display points
@@ -695,7 +695,7 @@ public final class StatusChartsManager {
 
 private extension HKUnit {
     var glucoseUnitYAxisSegmentSize: Double {
-        if self == HKUnit.milligramsPerDeciliterUnit() {
+        if self == HKUnit.milligramsPerDeciliter() {
             return 25
         } else {
             return 1

Original file line number	Diff line number	Diff line change
`@@ -21,17 +21,17 @@ extension HKUnit {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`- static func milligramsPerDeciliterUnit() -> HKUnit {`
	`24`	`+ static func milligramsPerDeciliter() -> HKUnit {`
`25`	`25`	`return HKUnit.gramUnit(with: .milli).unitDivided(by: HKUnit.literUnit(with: .deci))`
`26`	`26`	`}`
`27`	`27`
`28`		`- static func millimolesPerLiterUnit() -> HKUnit {`
	`28`	`+ static func millimolesPerLiter() -> HKUnit {`
`29`	`29`	`return HKUnit.moleUnit(with: .milli, molarMass: HKUnitMolarMassBloodGlucose).unitDivided(by: HKUnit.liter())`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`// A glucose-centric presentation helper for the localized unit string`
`33`	`33`	`var glucoseUnitDisplayString: String {`
`34`		`- if self == HKUnit.millimolesPerLiterUnit() {`
	`34`	`+ if self == HKUnit.millimolesPerLiter() {`
`35`	`35`	`return NSLocalizedString("mmol/L", comment: "The unit display string for millimoles of glucose per liter")`
`36`	`36`	`} else {`
`37`	`37`	`return String(describing: self)`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class RecommendTempBasalTests: XCTestCase {`
`61`	`61`	`return fixture.map {`
`62`	`62`	`return GlucoseFixtureValue(`
`63`	`63`	`startDate: dateFormatter.date(from: $0["date"] as! String)!,`
`64`		`- quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: $0["amount"] as! Double)`
	`64`	`+ quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: $0["amount"] as! Double)`
`65`	`65`	`)`
`66`	`66`	`}`
`67`	`67`	`}`
`@@ -81,15 +81,15 @@ class RecommendTempBasalTests: XCTestCase {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`var glucoseTargetRange: GlucoseRangeSchedule {`
`84`		`- return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!`
	`84`	`+ return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`var insulinSensitivitySchedule: InsulinSensitivitySchedule {`
`88`		`- return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!`
	`88`	`+ return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`var minimumBGGuard: GlucoseThreshold {`
`92`		`- return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliterUnit(), value: 55)`
	`92`	`+ return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliter(), value: 55)`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`var insulinActionDuration: TimeInterval {`
`@@ -385,7 +385,7 @@ class RecommendTempBasalTests: XCTestCase {`
`385`	`385`	`XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration)`
`386`	`386`
`387`	`387`	`// Use mmol sensitivity value`
`388`		`- let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 3.33)])!`
	`388`	`+ let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 3.33)])!`
`389`	`389`
`390`	`390`	`dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,`
`391`	`391`	`atDate: glucose.first!.startDate,`
`@@ -465,7 +465,7 @@ class RecommendBolusTests: XCTestCase {`
`465`	`465`	`return fixture.map {`
`466`	`466`	`return GlucoseFixtureValue(`
`467`	`467`	`startDate: dateFormatter.date(from: $0["date"] as! String)!,`
`468`		`- quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: $0["amount"] as! Double)`
	`468`	`+ quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: $0["amount"] as! Double)`
`469`	`469`	`)`
`470`	`470`	`}`
`471`	`471`	`}`
`@@ -485,15 +485,15 @@ class RecommendBolusTests: XCTestCase {`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`var glucoseTargetRange: GlucoseRangeSchedule {`
`488`		`- return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!`
	`488`	`+ return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!`
`489`	`489`	`}`
`490`	`490`
`491`	`491`	`var insulinSensitivitySchedule: InsulinSensitivitySchedule {`
`492`		`- return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!`
	`492`	`+ return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`var minimumBGGuard: GlucoseThreshold {`
`496`		`- return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliterUnit(), value: 55)`
	`496`	`+ return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliter(), value: 55)`
`497`	`497`	`}`
`498`	`498`
`499`	`499`	`var insulinActionDuration: TimeInterval {`
`@@ -589,13 +589,11 @@ class RecommendBolusTests: XCTestCase {`
`589`	`589`	`XCTAssertEqual(1.325, dose.amount)`
`590`	`590`
`591`	`591`	`if case BolusRecommendationNotice.currentGlucoseBelowTarget(let glucose, let units) = dose.notice! {`
`592`		`- XCTAssertEqual(units, HKUnit.milligramsPerDeciliterUnit())`
	`592`	`+ XCTAssertEqual(units, HKUnit.milligramsPerDeciliter())`
`593`	`593`	`XCTAssertEqual(glucose.quantity.doubleValue(for: units), 60)`
`594`	`594`	`} else {`
`595`	`595`	`XCTFail("Expected currentGlucoseBelowTarget, but got \(dose.notice!)")`
`596`	`596`	`}`
`597`		`-`
`598`		`- //XCTAssertEqual(BolusRecommendationNotice.currentGlucoseBelowTarget(glucose: GlucoseValue(56), unit: HKUnit.milligramsPerDeciliterUnit()), dose.notice!)`
`599`	`597`	`}`
`600`	`598`
`601`	`599`	`func testDroppingBelowRangeThenRising() {`
`@@ -747,7 +745,7 @@ class RecommendBolusTests: XCTestCase {`
`747`	`745`	`XCTAssertEqual(1.0, dose.amount)`
`748`	`746`
`749`	`747`	`// Use mmol sensitivity value`
`750`		`- let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 10.0 / 3)])!`
	`748`	`+ let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 10.0 / 3)])!`
`751`	`749`
`752`	`750`	`dose = DoseMath.recommendBolusFromPredictedGlucose(glucose,`
`753`	`751`	`atDate: glucose.first!.startDate,`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ class StatusViewController: UIViewController, NCWidgetProviding {`
`50`	`50`	`)`
`51`	`51`
`52`	`52`	`charts.glucoseDisplayRange = (`
`53`		`- min: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 100),`
`54`		`- max: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 175)`
	`53`	`+ min: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 100),`
	`54`	`+ max: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 175)`
`55`	`55`	`)`
`56`	`56`
`57`	`57`	`return charts`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ final class EnliteCGMManager: CGMManager {`
`39`	`39`	`self.sensorState = EnliteSensorDisplayable(latestSensorEvent)`
`40`	`40`	`}`
`41`	`41`
`42`		`- let unit = HKUnit.milligramsPerDeciliterUnit()`
	`42`	`+ let unit = HKUnit.milligramsPerDeciliter()`
`43`	`43`	`let glucoseValues = events`
`44`	`44`	`// TODO: Is the { $0.date > latestGlucoseDate } filter duplicative?`
`45`	`45`	`.filter({ $0.glucoseEvent is SensorValueGlucoseEvent && $0.date > latestGlucoseDate })`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ final class StatusExtensionDataManager {`
`62`	`62`	`)`
`63`	`63`	`context.predictedGlucose = PredictedGlucoseContext(`
`64`	`64`	`values: (1...36).map { 89.123 + Double($0 * 5) }, // 3 hours of linear data`
`65`		`- unit: HKUnit.milligramsPerDeciliterUnit(),`
	`65`	`+ unit: HKUnit.milligramsPerDeciliter(),`
`66`	`66`	`startDate: Date(),`
`67`	`67`	`interval: TimeInterval(minutes: 5))`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import Foundation`
`10`	`10`	`import LoopKit`
`11`	`11`	`import HealthKit`
`12`	`12`
	`13`	`+`
`13`	`14`	`enum BolusRecommendationNotice: CustomStringConvertible, Equatable {`
`14`	`15`	`case glucoseBelowMinimumGuard(minGlucose: GlucoseValue, unit: HKUnit)`
`15`	`16`	`case currentGlucoseBelowTarget(glucose: GlucoseValue, unit: HKUnit)`
`@@ -74,6 +75,7 @@ struct BolusRecommendation {`
`74`	`75`	`}`
`75`	`76`	`}`
`76`	`77`
	`78`	`+`
`77`	`79`	`extension BolusRecommendation: Comparable {`
`78`	`80`	`static func ==(lhs: BolusRecommendation, rhs: BolusRecommendation) -> Bool {`
`79`	`81`	`return lhs.amount == rhs.amount`