Greater than 90 degrees allowed (#121)

mfikes · Jan 12, 2024 · d038855 · d038855
1 parent 8a13b88
commit d038855
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/Impedance Converter/Impedance Converter/ViewModel.swift b/Impedance Converter/Impedance Converter/ViewModel.swift
@@ -185,7 +185,7 @@ class ViewModel: ObservableObject, Codable {
         }
         set {
             let previousImmittance = immittance
-            immittance = Immittance(impedance: newValue)
+            immittance = Immittance(impedance: ensurePositiveReal(value: newValue))
             if (immittance != previousImmittance) {
                 addCheckpoint()
                 hold = .none
@@ -199,7 +199,7 @@ class ViewModel: ObservableObject, Codable {
         }
         set {
             let previousImmittance = immittance
-            immittance = Immittance(admittance: newValue)
+            immittance = Immittance(admittance: ensurePositiveReal(value: newValue))
             if (immittance != previousImmittance) {
                 addCheckpoint()
                 hold = .none

diff --git a/Impedance Converter/Impedance ConverterTests/ViewModelTests.swift b/Impedance Converter/Impedance ConverterTests/ViewModelTests.swift
@@ -142,7 +142,7 @@ class ImmittanceTests: ViewModelTestBase {
     func testImmittanceWithNegativeValues() {
         // Negative real part in impedance
         viewModel.impedance = Complex(-50, 10)
-        XCTAssertEqual(viewModel.impedance, Complex(-50, 10))
+        XCTAssertEqual(viewModel.impedance, Complex(0, 10))
 
         // Negative imaginary part in admittance
         viewModel.admittance = Complex(0.02, -0.005)
@@ -159,6 +159,26 @@ class ImmittanceTests: ViewModelTestBase {
         XCTAssertEqual(viewModel.admittance, Complex(0.03, 0.04))
     }
 
+    func testImpedanceGreaterThanPos90() {
+        viewModel.impedance = Complex.init(length: 50, phase: Angle(degrees: 95).radians)
+        XCTAssertEqual(Angle(radians: viewModel.impedance.phase).degrees, 90)
+    }
+
+    func testImpedanceLessThanNeg90() {
+        viewModel.impedance = Complex.init(length: 50, phase: Angle(degrees: -95).radians)
+        XCTAssertEqual(Angle(radians: viewModel.impedance.phase).degrees, -90)
+    }
+
+    func testAdmittanceGreaterThanPos90() {
+        viewModel.admittance = Complex.init(length: 50, phase: Angle(degrees: 95).radians)
+        XCTAssertEqual(Angle(radians: viewModel.admittance.phase).degrees, 90)
+    }
+
+    func testAdmittanceLessThanNeg90() {
+        viewModel.admittance = Complex.init(length: 50, phase: Angle(degrees: -95).radians)
+        XCTAssertEqual(Angle(radians: viewModel.admittance.phase).degrees, -90)
+    }
+
     func testReciprocalRelationships() {
         // Impedance and its reciprocal admittance
         let impedance = Complex(100, -50)