feat: Cleaning up shared models.
This commit is contained in:
@@ -7,7 +7,7 @@ public enum EquipmentMeasurement: Equatable {
|
||||
|
||||
case airHandler(AirHandler)
|
||||
case furnaceAndCoil(FurnaceAndCoil)
|
||||
|
||||
|
||||
public var equipmentType: EquipmentType {
|
||||
switch self {
|
||||
case .airHandler:
|
||||
@@ -25,7 +25,7 @@ public enum EquipmentMeasurement: Equatable {
|
||||
return furnaceAndCoil.externalStaticPressure
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public struct AirHandler: Equatable {
|
||||
|
||||
@Positive
|
||||
@@ -70,6 +70,144 @@ public enum EquipmentMeasurement: Equatable {
|
||||
}
|
||||
}
|
||||
|
||||
public enum EquipmentType: Equatable, CaseIterable, CustomStringConvertible, Identifiable {
|
||||
case airHandler
|
||||
case furnaceAndCoil
|
||||
|
||||
public var id: Self { self }
|
||||
|
||||
public var description: String {
|
||||
switch self {
|
||||
case .airHandler:
|
||||
return "Air Handler"
|
||||
|
||||
case .furnaceAndCoil:
|
||||
return "Furnace & Coil"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Needs updated for when forms are using `minmal` values.
|
||||
public struct FlaggedMeasurement: Equatable {
|
||||
public var airflow: Flagged
|
||||
public var coilPressureDrop: Flagged
|
||||
public var externalStaticPressure: Flagged
|
||||
public var filterPressureDrop: Flagged
|
||||
public var returnPlenumPressure: Flagged
|
||||
public var supplyPlenumPressure: Flagged
|
||||
|
||||
public init(
|
||||
airflow: Flagged,
|
||||
coilPressureDrop: Flagged,
|
||||
externalStaticPressure: Flagged,
|
||||
filterPressureDrop: Flagged,
|
||||
returnPlenumPressure: Flagged,
|
||||
supplyPlenumPressure: Flagged
|
||||
) {
|
||||
self.airflow = airflow
|
||||
self.coilPressureDrop = coilPressureDrop
|
||||
self.externalStaticPressure = externalStaticPressure
|
||||
self.filterPressureDrop = filterPressureDrop
|
||||
self.returnPlenumPressure = returnPlenumPressure
|
||||
self.supplyPlenumPressure = supplyPlenumPressure
|
||||
}
|
||||
|
||||
public init(
|
||||
budgets: BudgetedPercentEnvelope,
|
||||
measurement: EquipmentMeasurement,
|
||||
ratedPressures: RatedStaticPressures,
|
||||
tons: EquipmentMetadata.CoolingCapacity?
|
||||
) {
|
||||
switch measurement {
|
||||
case let .airHandler(airHandler):
|
||||
self = .airHandler(
|
||||
budgets: budgets,
|
||||
measurement: airHandler,
|
||||
ratedPressures: ratedPressures,
|
||||
tons: tons
|
||||
)
|
||||
case let .furnaceAndCoil(furnaceAndCoil):
|
||||
self = .furnaceAndCoil(
|
||||
budgets: budgets,
|
||||
measurement: furnaceAndCoil,
|
||||
ratedPressures: ratedPressures,
|
||||
tons: tons
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
public static func airHandler(
|
||||
budgets: BudgetedPercentEnvelope,
|
||||
measurement: EquipmentMeasurement.AirHandler,
|
||||
ratedPressures: RatedStaticPressures,
|
||||
tons: EquipmentMetadata.CoolingCapacity?
|
||||
) -> Self {
|
||||
.init(
|
||||
airflow: checkAirflow(value: measurement.airflow, tons: tons),
|
||||
coilPressureDrop: .init(
|
||||
wrappedValue: (measurement.$postCoilPressure.positiveValue - measurement.$postFilterPressure.positiveValue) ?? 0,
|
||||
.result(.good())
|
||||
),
|
||||
externalStaticPressure: checkExternalStaticPressure(
|
||||
value: measurement.externalStaticPressure,
|
||||
ratedPressures: ratedPressures
|
||||
),
|
||||
filterPressureDrop: .init(
|
||||
value: measurement.$postFilterPressure.positiveValue - measurement.$returnPlenumPressure.positiveValue,
|
||||
budget: budgets.filterBudget,
|
||||
ratedPressures: ratedPressures
|
||||
),
|
||||
returnPlenumPressure: .init(
|
||||
value: measurement.$returnPlenumPressure.positiveValue,
|
||||
budget: budgets.returnPlenumBudget,
|
||||
ratedPressures: ratedPressures
|
||||
),
|
||||
supplyPlenumPressure: .init(
|
||||
value: measurement.$supplyPlenumPressure.positiveValue ?? 0,
|
||||
budget: budgets.supplyPlenumBudget,
|
||||
ratedPressures: ratedPressures
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
public static func furnaceAndCoil(
|
||||
budgets: BudgetedPercentEnvelope,
|
||||
measurement: EquipmentMeasurement.FurnaceAndCoil,
|
||||
ratedPressures: RatedStaticPressures,
|
||||
tons: EquipmentMetadata.CoolingCapacity?
|
||||
) -> Self {
|
||||
.init(
|
||||
airflow: checkAirflow(value: measurement.airflow, tons: tons),
|
||||
coilPressureDrop: .init(
|
||||
value: measurement.$preCoilPressure.positiveValue - measurement.$supplyPlenumPressure.positiveValue,
|
||||
budget: budgets.coilBudget,
|
||||
ratedPressures: ratedPressures
|
||||
),
|
||||
externalStaticPressure: checkExternalStaticPressure(
|
||||
value: measurement.externalStaticPressure,
|
||||
ratedPressures: ratedPressures
|
||||
),
|
||||
filterPressureDrop: .init(
|
||||
value: measurement.$postFilterPressure.positiveValue - measurement.$returnPlenumPressure.positiveValue,
|
||||
budget: budgets.filterBudget,
|
||||
ratedPressures: ratedPressures,
|
||||
ignoreMinimum: true
|
||||
),
|
||||
returnPlenumPressure: .init(
|
||||
value: measurement.$returnPlenumPressure.positiveValue,
|
||||
budget: budgets.returnPlenumBudget,
|
||||
ratedPressures: ratedPressures
|
||||
),
|
||||
supplyPlenumPressure: .init(
|
||||
value: measurement.$supplyPlenumPressure.positiveValue,
|
||||
budget: budgets.supplyPlenumBudget,
|
||||
ratedPressures: ratedPressures
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public struct FurnaceAndCoil: Equatable {
|
||||
|
||||
@Positive
|
||||
@@ -128,6 +266,62 @@ public enum EquipmentMeasurement: Equatable {
|
||||
// case airflow
|
||||
// }
|
||||
//}
|
||||
fileprivate extension Flagged {
|
||||
|
||||
init(
|
||||
value: Double,
|
||||
budget: Percentage,
|
||||
ratedPressures: RatedStaticPressures,
|
||||
ignoreMinimum: Bool = false
|
||||
) {
|
||||
let minimum = ignoreMinimum ? 0 : ratedPressures.minimum * budget.fraction
|
||||
let maximum = ratedPressures.maximum * budget.fraction
|
||||
let rated = ratedPressures.rated * budget.fraction
|
||||
self.init(
|
||||
wrappedValue: value,
|
||||
.using(maximum: maximum, minimum: minimum, rated: rated)
|
||||
)
|
||||
}
|
||||
|
||||
init(
|
||||
value: Double?,
|
||||
budget: Percentage,
|
||||
ratedPressures: RatedStaticPressures,
|
||||
ignoreMinimum: Bool = false
|
||||
) {
|
||||
guard let value else {
|
||||
self = .error(message: "Value is not set.")
|
||||
return
|
||||
}
|
||||
self.init(
|
||||
value: value,
|
||||
budget: budget,
|
||||
ratedPressures: ratedPressures,
|
||||
ignoreMinimum: ignoreMinimum
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fileprivate func checkExternalStaticPressure(
|
||||
value: Double,
|
||||
ratedPressures: RatedStaticPressures
|
||||
) -> Flagged {
|
||||
.init(
|
||||
wrappedValue: value,
|
||||
.rated(ratedPressures)
|
||||
)
|
||||
}
|
||||
|
||||
fileprivate func checkAirflow(
|
||||
value: Double?,
|
||||
tons: EquipmentMetadata.CoolingCapacity?
|
||||
) -> Flagged {
|
||||
guard let value, let tons else {
|
||||
return .init(wrappedValue: value ?? 0, .result(.good()))
|
||||
}
|
||||
return .init(wrappedValue: value, .airflow(tons: tons))
|
||||
}
|
||||
|
||||
|
||||
#if DEBUG
|
||||
extension EquipmentMeasurement {
|
||||
@@ -153,4 +347,15 @@ extension EquipmentMeasurement {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension EquipmentMeasurement.FlaggedMeasurement {
|
||||
public static func mock(type equipmentType: EquipmentMeasurement.EquipmentType) -> Self {
|
||||
.init(
|
||||
budgets: .init(equipmentType: equipmentType, fanType: .variableSpeed),
|
||||
measurement: .mock(type: equipmentType),
|
||||
ratedPressures: .init(),
|
||||
tons: .default
|
||||
)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user