Merge pull request #15 from kdheepak/kd/fix-decimal-check

Update test to remove decimal approximation in assertion

Author: AnjoMan

tests/test_carsons.py

@@ -14,41 +14,41 @@
 OHM_PER_MILE_TO_OHM_PER_METER = 1 / 1609.344
 
 
-class ABCN_geometry_line():
+class ACBN_geometry_line():
     """ IEEE 13 Configuration 601 Line Geometry """
     @property
     def resistance(self):
         return {
             'A': 0.000115575,
-            'B': 0.000115575,
             'C': 0.000115575,
+            'B': 0.000115575,
             'N': 0.000367852,
         }
 
     @property
     def geometric_mean_radius(self):
         return {
             'A': 0.00947938,
-            'B': 0.00947938,
             'C': 0.00947938,
+            'B': 0.00947938,
             'N': 0.00248107,
         }
 
     @property
     def wire_positions(self):
         return {
             'A': (0.762, 8.5344),
-            'B': (2.1336, 8.5344),
-            'C': (0, 8.5344),
+            'C': (2.1336, 8.5344),
+            'B': (0, 8.5344),
             'N': (1.2192, 7.3152),
         }
 
     @property
     def phases(self):
         return [
             'A',
-            'B',
             'C',
+            'B',
             'N',
         ]
 
@@ -160,15 +160,15 @@ def phases(self):
         ]
 
 
-def ABCN_line_geometry_phase_impedance():
+def ACBN_line_geometry_phase_impedance():
     """ IEEE 13 Configuration 601 Impedance Solution """
     return OHM_PER_MILE_TO_OHM_PER_METER * array([
             [0.3465 + 1.0179j, 0.1560 + 0.5017j, 0.1580 + 0.4236j],
             [0.1560 + 0.5017j, 0.3375 + 1.0478j, 0.1535 + 0.3849j],
             [0.1580 + 0.4236j, 0.1535 + 0.3849j, 0.3414 + 1.0348j]])
 
 
-def ABCN_line_z_primitive():
+def ACBN_line_z_primitive():
     return array([
         [1.74792626e-04+0.00085989j,
          5.92176264e-05+0.00052913j,
@@ -272,19 +272,18 @@ def expected_z_abc_three_neutrals():
 
 @pytest.mark.parametrize(
     "line,expected_impedance",
-    [(ABCN_geometry_line(), ABCN_line_geometry_phase_impedance()),
+    [(ACBN_geometry_line(), ACBN_line_geometry_phase_impedance()),
      (CBN_geometry_line(), CBN_line_geometry_phase_impedance()),
      (CN_geometry_line(), CN_line_geometry_phase_impedance())])
 def test_converts_geometry_to_phase_impedance(line, expected_impedance):
     actual_impedance = convert_geometric_model(line)
     assert_array_almost_equal(expected_impedance,
-                              actual_impedance,
-                              decimal=4)
+                              actual_impedance)
 
 
 @pytest.mark.parametrize(
     "line,z_primitive_expected",
-    [(ABCN_geometry_line(), ABCN_line_z_primitive()),
+    [(ACBN_geometry_line(), ACBN_line_z_primitive()),
      (CN_geometry_line(), CN_line_z_primitive())])
 def test_unbalanced_carsons_equations(line, z_primitive_expected):
     model = CarsonsEquations(line)

tests/test_dict_compatibility.py

@@ -1,6 +1,6 @@
 from numpy.testing import assert_array_almost_equal
 
-from .test_carsons import ABCN_line_z_primitive
+from .test_carsons import ACBN_line_z_primitive
 from carsons.carsons import CarsonsEquations
 
 
@@ -9,22 +9,22 @@ class BackwardsCompatibleModel():
         def __init__(self):
             self.resistance = {
                 "A": 0.000115575,
-                "B": 0.000115575,
                 "C": 0.000115575,
+                "B": 0.000115575,
                 "N": 0.000367852,
             }
 
             self.geometric_mean_radius = {
                 "A": 0.00947938,
-                "B": 0.00947938,
                 "C": 0.00947938,
+                "B": 0.00947938,
                 "N": 0.00248107,
             }
 
             self.wire_positions = {
                 "A": (0.762, 8.5344),
-                "B": (2.1336, 8.5344),
-                "C": (0, 8.5344),
+                "C": (2.1336, 8.5344),
+                "B": (0, 8.5344),
                 "N": (1.2192, 7.3152),
             }
             self.phases = {
@@ -38,9 +38,5 @@ def __init__(self):
 
     model = BackwardsCompatibleModel()
 
-    z_primative = CarsonsEquations(model).build_z_primitive()
-    assert_array_almost_equal(
-        z_primative,
-        ABCN_line_z_primitive(),
-        decimal=4
-    )
+    z_primitive = CarsonsEquations(model).build_z_primitive()
+    assert_array_almost_equal(z_primitive, ACBN_line_z_primitive())

tests/test_multiple_neutrals.py

@@ -3,7 +3,7 @@
 
 from carsons.carsons import CarsonsEquations
 from tests.helpers import LineModel
-from tests.test_carsons import ABCN_line_z_primitive
+from tests.test_carsons import ACBN_line_z_primitive
 
 
 def test_dual_neutral_model():
@@ -31,7 +31,7 @@ def test_dual_neutral_model():
     z_equivalent = z_primitive.copy()
     z_equivalent = numpy.delete(z_equivalent, 2, 0)
     z_equivalent = numpy.delete(z_equivalent, 2, 1)
-    z_expected = ABCN_line_z_primitive()
+    z_expected = ACBN_line_z_primitive()
     assert_array_almost_equal(z_equivalent, z_expected, decimal=4)
 
 
@@ -50,5 +50,5 @@ def test_malformed_neutrals_are_ignored():
 
     assert z_primitive.shape == (4, 4)
 
-    z_expected = ABCN_line_z_primitive()
+    z_expected = ACBN_line_z_primitive()
     assert_array_almost_equal(z_primitive, z_expected, decimal=4)