michael/swift-duct-calc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Reorganizes / creates duct sizes container, uses it in views and projectClient.

Browse Source
This commit is contained in:
Michael Housh
2026-01-16 11:40:21 -05:00
parent 146baa7815
commit 13c4bb33b5
11 changed files with 90 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/ProjectClient/Internal/DatabaseClient+calculateDuctSizes.swift
View File

@@ -7,7 +7,7 @@ extension DatabaseClient {
func calculateDuctSizes(
projectID: Project.ID
) async throws -> ProjectClient.DuctSizeResponse {
) async throws -> DuctSizes {
@Dependency(\.manualD) var manualD
return try await manualD.calculateDuctSizes(
@@ -19,7 +19,7 @@ extension DatabaseClient {
func calculateRoomDuctSizes(
projectID: Project.ID
) async throws -> [DuctSizing.RoomContainer] {
) async throws -> [DuctSizes.RoomContainer] {
@Dependency(\.manualD) var manualD
return try await manualD.calculateRoomSizes(
@@ -30,7 +30,7 @@ extension DatabaseClient {
func calculateTrunkDuctSizes(
projectID: Project.ID
) async throws -> [DuctSizing.TrunkContainer] {
) async throws -> [DuctSizes.TrunkContainer] {
@Dependency(\.manualD) var manualD
return try await manualD.calculateTrunkSizes(

20
Sources/ProjectClient/Internal/ManualDClient+calculateDuctSizes.swift
View File

@@ -19,7 +19,7 @@ extension ManualDClient {
trunks: [TrunkSize],
sharedRequest: DuctSizeSharedRequest,
logger: Logger? = nil
) async throws -> ProjectClient.DuctSizeResponse {
) async throws -> DuctSizes {
try await .init(
rooms: calculateRoomSizes(
rooms: rooms,
@@ -37,9 +37,9 @@ extension ManualDClient {
rooms: [Room],
sharedRequest: DuctSizeSharedRequest,
logger: Logger? = nil
) async throws -> [DuctSizing.RoomContainer] {
) async throws -> [DuctSizes.RoomContainer] {
var retval: [DuctSizing.RoomContainer] = []
var retval: [DuctSizes.RoomContainer] = []
let totalHeatingLoad = rooms.totalHeatingLoad
let totalCoolingSensible = rooms.totalCoolingSensible(shr: sharedRequest.projectSHR)
@@ -50,7 +50,7 @@ extension ManualDClient {
let coolingPercent = coolingLoad / totalCoolingSensible
let heatingCFM = heatingPercent * Double(sharedRequest.equipmentInfo.heatingCFM)
let coolingCFM = coolingPercent * Double(sharedRequest.equipmentInfo.coolingCFM)
let designCFM = DuctSizing.DesignCFM(heating: heatingCFM, cooling: coolingCFM)
let designCFM = DuctSizes.DesignCFM(heating: heatingCFM, cooling: coolingCFM)
let sizes = try await self.ductSize(
.init(designCFM: Int(designCFM.value), frictionRate: sharedRequest.designFrictionRate)
)
@@ -96,9 +96,9 @@ extension ManualDClient {
trunks: [TrunkSize],
sharedRequest: DuctSizeSharedRequest,
logger: Logger? = nil
) async throws -> [DuctSizing.TrunkContainer] {
) async throws -> [DuctSizes.TrunkContainer] {
var retval = [DuctSizing.TrunkContainer]()
var retval = [DuctSizes.TrunkContainer]()
let totalHeatingLoad = rooms.totalHeatingLoad
let totalCoolingSensible = rooms.totalCoolingSensible(shr: sharedRequest.projectSHR)
@@ -109,7 +109,7 @@ extension ManualDClient {
let coolingPercent = coolingLoad / totalCoolingSensible
let heatingCFM = heatingPercent * Double(sharedRequest.equipmentInfo.heatingCFM)
let coolingCFM = coolingPercent * Double(sharedRequest.equipmentInfo.coolingCFM)
let designCFM = DuctSizing.DesignCFM(heating: heatingCFM, cooling: coolingCFM)
let designCFM = DuctSizes.DesignCFM(heating: heatingCFM, cooling: coolingCFM)
let sizes = try await self.ductSize(
.init(designCFM: Int(designCFM.value), frictionRate: sharedRequest.designFrictionRate)
)
@@ -139,9 +139,9 @@ extension ManualDClient {
}
extension DuctSizing.SizeContainer {
extension DuctSizes.SizeContainer {
init(
designCFM: DuctSizing.DesignCFM,
designCFM: DuctSizes.DesignCFM,
sizes: ManualDClient.DuctSizeResponse,
height: Int?,
width: Int?
@@ -159,7 +159,7 @@ extension DuctSizing.SizeContainer {
}
init(
designCFM: DuctSizing.DesignCFM,
designCFM: DuctSizes.DesignCFM,
sizes: ManualDClient.DuctSizeResponse,
rectangularSize: Room.RectangularSize?,
width: Int?