alexis.drai
/
Graduator
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

♻️ Implement DRY on weighted average calculation

Browse Source
pull/8/head
Alexis Drai 2 years ago
parent 54fc430dce
commit 4c657bbfe1
6 changed files with 54 additions and 35 deletions
Show Stats Download Patch File Download Diff File

8
Graduator/Graduator.xcodeproj/project.pbxproj
Unescape View File

@ -20,6 +20,8 @@
EC242B8A2A1FCECA006FE760 /* AverageBlockView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC242B892A1FCECA006FE760 /* AverageBlockView.swift */; };
EC5FE5A52A20882F0028AA5F /* Formatters.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC5FE5A42A20882F0028AA5F /* Formatters.swift */; };
EC8BAD162A3465230062226B /* UnitsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC8BAD152A3465230062226B /* UnitsStore.swift */; };
EC8BAD1A2A34BC170062226B /* WeightedGrade.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC8BAD192A34BC170062226B /* WeightedGrade.swift */; };
EC8BAD1C2A34BE4C0062226B /* WeightedAverageCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC8BAD1B2A34BE4C0062226B /* WeightedAverageCalculator.swift */; };
ECB2FFCE2A23C4A700FF9F91 /* SubjectFormView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECB2FFCD2A23C4A700FF9F91 /* SubjectFormView.swift */; };
ECB2FFD02A23C4B700FF9F91 /* SubjectFormVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECB2FFCF2A23C4B700FF9F91 /* SubjectFormVM.swift */; };
ECC581D22A1D085B006C55EF /* GraduatorApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECC581D12A1D085B006C55EF /* GraduatorApp.swift */; };
@ -43,6 +45,8 @@
EC242B892A1FCECA006FE760 /* AverageBlockView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AverageBlockView.swift; sourceTree = "<group>"; };
EC5FE5A42A20882F0028AA5F /* Formatters.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Formatters.swift; sourceTree = "<group>"; };
EC8BAD152A3465230062226B /* UnitsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitsStore.swift; sourceTree = "<group>"; };
EC8BAD192A34BC170062226B /* WeightedGrade.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeightedGrade.swift; sourceTree = "<group>"; };
EC8BAD1B2A34BE4C0062226B /* WeightedAverageCalculator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeightedAverageCalculator.swift; sourceTree = "<group>"; };
ECB2FFCD2A23C4A700FF9F91 /* SubjectFormView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubjectFormView.swift; sourceTree = "<group>"; };
ECB2FFCF2A23C4B700FF9F91 /* SubjectFormVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubjectFormVM.swift; sourceTree = "<group>"; };
ECC581CE2A1D085B006C55EF /* Graduator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Graduator.app; sourceTree = BUILT_PRODUCTS_DIR; };
@ -183,6 +187,8 @@
EC242B6B2A1F81AE006FE760 /* Subject.swift */,
EC242B692A1F8189006FE760 /* Unit.swift */,
EC242B6D2A1F81CC006FE760 /* UnitsManager.swift */,
EC8BAD192A34BC170062226B /* WeightedGrade.swift */,
EC8BAD1B2A34BE4C0062226B /* WeightedAverageCalculator.swift */,
);
path = Model;
sourceTree = "<group>";
@ -265,6 +271,8 @@
EC8BAD162A3465230062226B /* UnitsStore.swift in Sources */,
EC242B7F2A1F83BF006FE760 /* UnitsManagerVM.swift in Sources */,
EC242B7B2A1F838C006FE760 /* UnitViewCell.swift in Sources */,
EC8BAD1C2A34BE4C0062226B /* WeightedAverageCalculator.swift in Sources */,
EC8BAD1A2A34BC170062226B /* WeightedGrade.swift in Sources */,
EC242B6C2A1F81AE006FE760 /* Subject.swift in Sources */,
EC242B8A2A1FCECA006FE760 /* AverageBlockView.swift in Sources */,
ECB2FFD02A23C4B700FF9F91 /* SubjectFormVM.swift in Sources */,

2
Graduator/Graduator/Model/Subject.swift
Unescape View File

@ -7,7 +7,7 @@
import Foundation
struct Subject : Identifiable, Codable {
struct Subject : Identifiable, Codable, WeightedGrade {
let id: UUID
var name: String
var weight: Int

18
Graduator/Graduator/Model/Unit.swift
Unescape View File

@ -7,28 +7,16 @@
import Foundation
struct Unit : Identifiable, Codable {
struct Unit : Identifiable, Codable, WeightedGrade {
let id: UUID
var name: String
var weight: Int
var grade: Double? { getAverage() }
var isProfessional: Bool
var code: Int
var subjects: [Subject]
// FIXME DRY
func getAverage() -> Double? {
var totalWeight = 0
var weightedSum = 0.0
for subject in subjects {
if let grade = subject.grade {
totalWeight += subject.weight
weightedSum += grade * Double(subject.weight)
}
}
guard totalWeight > 0 else { return nil }
return weightedSum / Double(totalWeight)
return WeightedAverageCalculator.average(elements: subjects)
}
}

22
Graduator/Graduator/Model/UnitsManager.swift
Unescape View File

@ -36,27 +36,11 @@ struct UnitsManager {
}
func getTotalAverage() -> Double? {
return getAverage(units: units)
return WeightedAverageCalculator.average(elements: units)
}
func getProfessionalAverage() -> Double? {
return getAverage(units: units.filter { $0.isProfessional })
}
// FIXME DRY
func getAverage(units: [Unit]) -> Double? {
var totalWeight = 0
var weightedSum = 0.0
for unit in units {
if let grade = unit.getAverage() {
totalWeight += unit.weight
weightedSum += grade * Double(unit.weight)
}
}
guard totalWeight > 0 else { return nil }
return weightedSum / Double(totalWeight)
let professionalUnits = units.filter { $0.isProfessional }
return WeightedAverageCalculator.average(elements: professionalUnits)
}
}

26
Graduator/Graduator/Model/WeightedAverageCalculator.swift
Unescape View File

@ -0,0 +1,26 @@
//
// WeightedAverageCalculator.swift
// Graduator
//
// Created by etudiant on 2023-06-10.
//
import Foundation
struct WeightedAverageCalculator {
static func average<T: WeightedGrade>(elements: [T]) -> Double? {
var totalWeight = 0
var weightedSum = 0.0
for element in elements {
if let grade = element.grade {
totalWeight += element.weight
weightedSum += grade * Double(element.weight)
}
}
guard totalWeight > 0 else { return nil }
return weightedSum / Double(totalWeight)
}
}

13
Graduator/Graduator/Model/WeightedGrade.swift
Unescape View File

@ -0,0 +1,13 @@
//
// WeightedGrade.swift
// Graduator
//
// Created by etudiant on 2023-06-10.
//
import Foundation
protocol WeightedGrade {
var weight: Int { get }
var grade: Double? { get }
}
Write Preview
Loading…
Cancel
Save