Delete code (90 days)

FreeAPS/Sources/APS/APSManager.swift

@@ -907,18 +907,15 @@ final class BaseAPSManager: APSManager, Injectable {
         var bgArray_1_: [Double] = []
         var bgArray_7_: [Double] = []
         var bgArray_30_: [Double] = []
-        var bgArray_90_: [Double] = []
         var bgArrayForTIR: [(bg_: Double, date_: Date)] = []
         var bgArray_1: [(bg_: Double, date_: Date)] = []
         var bgArray_7: [(bg_: Double, date_: Date)] = []
         var bgArray_30: [(bg_: Double, date_: Date)] = []
-        var bgArray_90: [(bg_: Double, date_: Date)] = []
         var medianBG = 0.0
         var nr_bgs: Decimal = 0
         var nr_bgs_1: Decimal = 0
         var nr_bgs_7: Decimal = 0
         var nr_bgs_30: Decimal = 0
-        var nr_bgs_90: Decimal = 0
 
         var startDate = Date("1978-02-22T11:43:54.659Z")
         if endIndex >= 0 {
@@ -927,11 +924,9 @@ final class BaseAPSManager: APSManager, Injectable {
         var end1 = false
         var end7 = false
         var end30 = false
-        var end90 = false
         var bg_1: Decimal = 0
         var bg_7: Decimal = 0
         var bg_30: Decimal = 0
-        var bg_90: Decimal = 0
         var bg_total: Decimal = 0
         var j = -1
 
@@ -969,14 +964,6 @@ final class BaseAPSManager: APSManager, Injectable {
                         nr_bgs_30 = nr_bgs
                         // time_30 = ((startDate ?? Date()) - entry.date).timeInterval
                     }
-                    if (startDate! - entry.date).timeInterval >= 7.776E6, !end90 {
-                        end90 = true
-                        bg_90 = bg / nr_bgs
-                        bgArray_90 = bgArrayForTIR
-                        bgArray_90_ = bgArray
-                        nr_bgs_90 = nr_bgs
-                        // time_90 = ((startDate ?? Date()) - entry.date).timeInterval
-                    }
                 }
             }
         }
@@ -1069,14 +1056,6 @@ final class BaseAPSManager: APSManager, Injectable {
             IFCCa1CStatisticValue_30 = 10.929 *
                 (NGSPa1CStatisticValue_30 - 2.152) // IFCC (mmol/mol)  A1C(mmol/mol) = 10.929 * (A1C(%) - 2.15)
         }
-        // 90 Days
-        var NGSPa1CStatisticValue_90: Decimal = 0.0
-        var IFCCa1CStatisticValue_90: Decimal = 0.0
-        if end90 {
-            NGSPa1CStatisticValue_90 = (46.7 + bg_90) / 28.7 // NGSP (%)
-            IFCCa1CStatisticValue_90 = 10.929 *
-                (NGSPa1CStatisticValue_90 - 2.152) // IFCC (mmol/mol)  A1C(mmol/mol) = 10.929 * (A1C(%) - 2.15)
-        }
         // Total days
         var NGSPa1CStatisticValue_total: Decimal = 0.0
         var IFCCa1CStatisticValue_total: Decimal = 0.0
@@ -1090,7 +1069,6 @@ final class BaseAPSManager: APSManager, Injectable {
             day: roundDecimal(Decimal(medianCalculation(array: bgArray_1.map(\.bg_))), 1),
             week: roundDecimal(Decimal(medianCalculation(array: bgArray_7.map(\.bg_))), 1),
             month: roundDecimal(Decimal(medianCalculation(array: bgArray_30.map(\.bg_))), 1),
-            ninetyDays: roundDecimal(Decimal(medianCalculation(array: bgArray_90.map(\.bg_))), 1),
             total: roundDecimal(Decimal(medianBG), 1)
         )
 
@@ -1098,7 +1076,6 @@ final class BaseAPSManager: APSManager, Injectable {
             day: roundDecimal(NGSPa1CStatisticValue, 1),
             week: roundDecimal(NGSPa1CStatisticValue_7, 1),
             month: roundDecimal(NGSPa1CStatisticValue_30, 1),
-            ninetyDays: roundDecimal(NGSPa1CStatisticValue_90, 1),
             total: roundDecimal(NGSPa1CStatisticValue_total, 1)
         )
 
@@ -1109,14 +1086,12 @@ final class BaseAPSManager: APSManager, Injectable {
             bg_1 = bg_1.asMmolL
             bg_7 = bg_7.asMmolL
             bg_30 = bg_30.asMmolL
-            bg_90 = bg_90.asMmolL
             bg_total = bg_total.asMmolL
 
             median = Durations(
                 day: roundDecimal(Decimal(medianCalculation(array: bgArray_1.map(\.bg_))).asMmolL, 1),
                 week: roundDecimal(Decimal(medianCalculation(array: bgArray_7.map(\.bg_))).asMmolL, 1),
                 month: roundDecimal(Decimal(medianCalculation(array: bgArray_30.map(\.bg_))).asMmolL, 1),
-                ninetyDays: roundDecimal(Decimal(medianCalculation(array: bgArray_90.map(\.bg_))).asMmolL, 1),
                 total: roundDecimal(Decimal(medianBG).asMmolL, 1)
             )
 
@@ -1126,7 +1101,6 @@ final class BaseAPSManager: APSManager, Injectable {
                     day: roundDecimal(IFCCa1CStatisticValue, 1),
                     week: roundDecimal(IFCCa1CStatisticValue_7, 1),
                     month: roundDecimal(IFCCa1CStatisticValue_30, 1),
-                    ninetyDays: roundDecimal(IFCCa1CStatisticValue_90, 1),
                     total: roundDecimal(IFCCa1CStatisticValue_total, 1)
                 )
             }
@@ -1135,7 +1109,6 @@ final class BaseAPSManager: APSManager, Injectable {
                 day: roundDecimal(IFCCa1CStatisticValue, 1),
                 week: roundDecimal(IFCCa1CStatisticValue_7, 1),
                 month: roundDecimal(IFCCa1CStatisticValue_30, 1),
-                ninetyDays: roundDecimal(IFCCa1CStatisticValue_90, 1),
                 total: roundDecimal(IFCCa1CStatisticValue_total, 1)
             )
         }
@@ -1161,7 +1134,6 @@ final class BaseAPSManager: APSManager, Injectable {
         var oneDay_: (TIR: Double, hypos: Double, hypers: Double) = (0.0, 0.0, 0.0)
         var sevenDays_: (TIR: Double, hypos: Double, hypers: Double) = (0.0, 0.0, 0.0)
         var thirtyDays_: (TIR: Double, hypos: Double, hypers: Double) = (0.0, 0.0, 0.0)
-        var ninetyDays_: (TIR: Double, hypos: Double, hypers: Double) = (0.0, 0.0, 0.0)
         var totalDays_: (TIR: Double, hypos: Double, hypers: Double) = (0.0, 0.0, 0.0)
 
         // Get all TIR calcs for every case
@@ -1174,10 +1146,6 @@ final class BaseAPSManager: APSManager, Injectable {
         if end30 {
             thirtyDays_ = tir(bgArray_30)
         }
-        if end90 {
-            ninetyDays_ = tir(bgArray_90)
-        }
-
         if nr_bgs > 0 {
             totalDays_ = tir(bgArrayForTIR)
         }
@@ -1186,7 +1154,6 @@ final class BaseAPSManager: APSManager, Injectable {
             day: roundDecimal(Decimal(oneDay_.TIR), 1),
             week: roundDecimal(Decimal(sevenDays_.TIR), 1),
             month: roundDecimal(Decimal(thirtyDays_.TIR), 1),
-            ninetyDays: roundDecimal(Decimal(ninetyDays_.TIR), 1),
             total: roundDecimal(Decimal(totalDays_.TIR), 1)
         )
 
@@ -1194,7 +1161,6 @@ final class BaseAPSManager: APSManager, Injectable {
             day: Decimal(oneDay_.hypos),
             week: Decimal(sevenDays_.hypos),
             month: Decimal(thirtyDays_.hypos),
-            ninetyDays: Decimal(ninetyDays_.hypos),
             total: Decimal(totalDays_.hypos)
         )
 
@@ -1202,7 +1168,6 @@ final class BaseAPSManager: APSManager, Injectable {
             day: Decimal(oneDay_.hypers),
             week: Decimal(sevenDays_.hypers),
             month: Decimal(thirtyDays_.hypers),
-            ninetyDays: Decimal(ninetyDays_.hypers),
             total: Decimal(totalDays_.hypers)
         )
 
@@ -1212,7 +1177,6 @@ final class BaseAPSManager: APSManager, Injectable {
             day: roundDecimal(bg_1, 1),
             week: roundDecimal(bg_7, 1),
             month: roundDecimal(bg_30, 1),
-            ninetyDays: roundDecimal(bg_90, 1),
             total: roundDecimal(bg_total, 1)
         )
 
@@ -1233,7 +1197,6 @@ final class BaseAPSManager: APSManager, Injectable {
         var sumOfSquares_1: Decimal = 0
         var sumOfSquares_7: Decimal = 0
         var sumOfSquares_30: Decimal = 0
-        var sumOfSquares_90: Decimal = 0
 
         // Total
         for array in bgArray {
@@ -1259,12 +1222,6 @@ final class BaseAPSManager: APSManager, Injectable {
                 sumOfSquares_30 += pow(Decimal(array_30).asMmolL - bg_30, 2)
             } else { sumOfSquares_30 += pow(Decimal(array_30) - bg_30, 2) }
         }
-        // 90 days
-        for array_90 in bgArray_90_ {
-            if units == .mmolL {
-                sumOfSquares_90 += pow(Decimal(array_90).asMmolL - bg_90, 2)
-            } else { sumOfSquares_90 += pow(Decimal(array_90) - bg_90, 2) }
-        }
 
         // Standard deviation and Coefficient of variation
         var sd_total = 0.0
@@ -1275,8 +1232,6 @@ final class BaseAPSManager: APSManager, Injectable {
         var cv_7 = 0.0
         var sd_30 = 0.0
         var cv_30 = 0.0
-        var sd_90 = 0.0
-        var cv_90 = 0.0
 
         // Avoid division by zero
         if avgs.total < 1 || nr_bgs < 1 { sd_total = 0
@@ -1302,17 +1257,12 @@ final class BaseAPSManager: APSManager, Injectable {
             cv_30 = 0 } else { sd_30 = sqrt(Double(sumOfSquares_30 / nr_bgs_30))
             cv_30 = sd_30 / Double(bg_30) * 100
         }
-        if avgs.ninetyDays < 1 || nr_bgs_90 < 1 { sd_90 = 0
-            cv_90 = 0 } else { sd_90 = sqrt(Double(sumOfSquares_90 / nr_bgs_90))
-            cv_90 = sd_90 / Double(bg_90) * 100
-        }
 
         // Standard Deviations
         let standardDeviations = Durations(
             day: roundDecimal(Decimal(sd_1), 1),
             week: roundDecimal(Decimal(sd_7), 1),
             month: roundDecimal(Decimal(sd_30), 1),
-            ninetyDays: roundDecimal(Decimal(sd_90), 1),
             total: roundDecimal(Decimal(sd_total), 1)
         )
 
@@ -1321,7 +1271,6 @@ final class BaseAPSManager: APSManager, Injectable {
             day: roundDecimal(Decimal(cv_1), 1),
             week: roundDecimal(Decimal(cv_7), 1),
             month: roundDecimal(Decimal(cv_30), 1),
-            ninetyDays: roundDecimal(Decimal(cv_90), 1),
             total: roundDecimal(Decimal(cv_total), 1)
         )
 

FreeAPS/Sources/Models/Statistics.swift

@@ -107,7 +107,6 @@ struct Durations: JSON, Equatable {
     var day: Decimal
     var week: Decimal
     var month: Decimal
-    var ninetyDays: Decimal
     var total: Decimal
 }
 

FreeAPS/Sources/Modules/Home/DurationButton.swift

@@ -14,7 +14,6 @@ enum durationState: String, DurationButton {
     case day = "Past 24 Hours "
     case week = "Past Week "
     case month = "Past Month "
-    case ninetyDays = "Past 90 Days "
     case total = "All Past Days of Data "
 }
 

FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -311,37 +311,6 @@ extension Home {
 
                         averageTIRhca1c(hba1c_all, average_, median_, tir_low, tir_high, tir_, hba1c_, sd_, cv_)
 
-                    case .ninetyDays:
-                        let hba1c_all = numberFormatter
-                            .string(from: (state.statistics?.Statistics.HbA1c.total ?? 0) as NSNumber) ?? ""
-                        let average_ = targetFormatter
-                            .string(from: (state.statistics?.Statistics.Glucose.Average.ninetyDays ?? 0) as NSNumber) ??
-                            ""
-                        let median_ = targetFormatter
-                            .string(from: (state.statistics?.Statistics.Glucose.Median.ninetyDays ?? 0) as NSNumber) ??
-                            ""
-                        let tir_low = tirFormatter
-                            .string(
-                                from: (state.statistics?.Statistics.Distribution.Hypos.ninetyDays ?? 0) as NSNumber
-                            ) ??
-                            ""
-                        let tir_high = tirFormatter
-                            .string(
-                                from: (state.statistics?.Statistics.Distribution.Hypers.ninetyDays ?? 0) as NSNumber
-                            ) ??
-                            ""
-                        let tir_ = tirFormatter
-                            .string(from: (state.statistics?.Statistics.Distribution.TIR.ninetyDays ?? 0) as NSNumber) ??
-                            ""
-                        let hba1c_ = numberFormatter
-                            .string(from: (state.statistics?.Statistics.HbA1c.ninetyDays ?? 0) as NSNumber) ?? ""
-                        let sd_ = numberFormatter
-                            .string(from: (state.statistics?.Statistics.Variance.SD.ninetyDays ?? 0) as NSNumber) ?? ""
-                        let cv_ = tirFormatter
-                            .string(from: (state.statistics?.Statistics.Variance.CV.ninetyDays ?? 0) as NSNumber) ?? ""
-
-                        averageTIRhca1c(hba1c_all, average_, median_, tir_low, tir_high, tir_, hba1c_, sd_, cv_)
-
                     case .total:
                         let hba1c_all = numberFormatter
                             .string(from: (state.statistics?.Statistics.HbA1c.total ?? 0) as NSNumber) ?? ""