Skip to content

Commit 9b150ac

Browse files
committed
[test] migrate from round to assertAlmostEqual
1 parent 5cf18e4 commit 9b150ac

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

test/run_test.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ def test_meshabox(self):
3535

3636
def test_meshunitsphere(self):
3737
no, fc, el = meshunitsphere(0.05, 100)
38-
self.assertAlmostEqual(round(sum(elemvolume(no, fc[:, :3])), 3), 12.553)
39-
self.assertAlmostEqual(round(sum(elemvolume(no, el[:, :4])), 3), 4.180)
38+
self.assertAlmostEqual(sum(elemvolume(no, fc[:, :3])), 12.553, 3)
39+
self.assertAlmostEqual(sum(elemvolume(no, el[:, :4])), 4.180, 3)
4040

4141
def test_meshasphere(self):
4242
no, fc, el = meshasphere([1, 1, 1], 2, 0.1, 100)
43-
self.assertAlmostEqual(round(sum(elemvolume(no, fc[:, :3])), 1), 50.2)
44-
self.assertAlmostEqual(round(sum(elemvolume(no, el[:, :4])), 1), 33.4)
43+
self.assertAlmostEqual(sum(elemvolume(no, fc[:, :3])), 50.2, 1)
44+
self.assertAlmostEqual(sum(elemvolume(no, el[:, :4])), 33.4, 1)
4545

4646
def test_meshgrid5(self):
4747
no, el = meshgrid5(np.arange(1, 3), np.arange(-1, 1), np.arange(2, 4))
@@ -133,8 +133,8 @@ def test_latticegrid(self):
133133

134134
def test_meshanellip(self):
135135
no, fc, el = meshanellip([1, 1, 1], [2, 4, 1], 0.05, 100)
136-
self.assertEqual(round(sum(elemvolume(no, fc[:, :3])), 2), 63.41)
137-
self.assertEqual(round(sum(elemvolume(no, el[:, :4])), 2), 33.44)
136+
self.assertAlmostEqual(sum(elemvolume(no, fc[:, :3])), 63.41, 2)
137+
self.assertAlmostEqual(sum(elemvolume(no, el[:, :4])), 33.44, 2)
138138

139139
def test_meshacylinder_plc(self):
140140
(
@@ -157,8 +157,8 @@ def test_meshacylinder_plc(self):
157157

158158
def test_meshacylinder(self):
159159
no, fc, el = meshacylinder([1, 1, 1], [2, 3, 4], [10, 12], 0.1, 10)
160-
self.assertEqual(round(sum(elemvolume(no, fc)), 4), 1045.2322)
161-
self.assertEqual(round(sum(elemvolume(no, el[:, :4])), 4), 1402.8993)
160+
self.assertAlmostEqual(sum(elemvolume(no, fc)), 1045.2322, 4)
161+
self.assertAlmostEqual(sum(elemvolume(no, el[:, :4])), 1402.8993, 4)
162162

163163
def test_meshacylinders_plc(self):
164164
(
@@ -998,7 +998,7 @@ def test_surfboolean_and(self):
998998
no3, el3 = surfboolean(self.no1, self.el1, "and", self.no2, self.el2)
999999
no3, el3 = meshcheckrepair(no3, el3, "dup", tolerance=1e-4)
10001000
node, elem, _ = s2m(no3, el3, 1, 100)
1001-
self.assertEqual(round(sum(elemvolume(node, elem[:, :4])), 5), 0.027)
1001+
self.assertAlmostEqual(sum(elemvolume(node, elem[:, :4])), 0.027, 5)
10021002

10031003
def test_surfboolean_or(self):
10041004
no3, el3 = surfboolean(self.no1, self.el1, "or", self.no2, self.el2)
@@ -1010,17 +1010,17 @@ def test_surfboolean_diff(self):
10101010
no3, el3 = surfboolean(self.no1, self.el1, "diff", self.no2, self.el2)
10111011
no3, el3 = meshcheckrepair(no3, el3, "dup", tolerance=1e-4)
10121012
node, elem, _ = s2m(no3, el3, 1, 100)
1013-
self.assertEqual(round(sum(elemvolume(node, elem[:, :4])), 5), 0.973)
1013+
self.assertAlmostEqual(sum(elemvolume(node, elem[:, :4])), 0.973, 5)
10141014

10151015
def test_surfboolean_first(self):
10161016
no3, el3 = surfboolean(self.no1, self.el1, "first", self.no2, self.el2)
10171017
no3, el3 = meshcheckrepair(no3, el3, "dup", tolerance=1e-4)
10181018
node, elem, _ = s2m(no3, el3, 1, 100, "tetgen", np.array([1.5, 1.5, 1.5]))
1019-
self.assertEqual(
1020-
round(sum(elemvolume(node, elem[elem[:, 4] == 1, :4])), 5), 0.973
1019+
self.assertAlmostEqual(
1020+
sum(elemvolume(node, elem[elem[:, 4] == 1, :4])), 0.973, 5
10211021
)
1022-
self.assertEqual(
1023-
round(sum(elemvolume(node, elem[elem[:, 4] == 0, :4])), 5), 0.027
1022+
self.assertAlmostEqual(
1023+
sum(elemvolume(node, elem[elem[:, 4] == 0, :4])), 0.027, 5
10241024
)
10251025

10261026
def test_surfboolean_second(self):
@@ -1166,8 +1166,8 @@ def test_v2s(self):
11661166

11671167
def test_v2m(self):
11681168
no, el, fc = v2m(self.im, 0.5, 0.03, 10)
1169-
self.assertAlmostEqual(round(sum(elemvolume(no, fc[:, :3])), 2), 5.01)
1170-
self.assertAlmostEqual(round(sum(elemvolume(no, el[:, :4])), 4), 0.8786)
1169+
self.assertAlmostEqual(sum(elemvolume(no, fc[:, :3])), 5.01, 2)
1170+
self.assertAlmostEqual(sum(elemvolume(no, el[:, :4])), 0.8786, 4)
11711171

11721172
def test_cgalv2m(self):
11731173
no, el, fc = v2m(

0 commit comments

Comments
 (0)