ByoungSooPark/cadquery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use nested lists instead of flat ones for Matrix initialization

Browse Source 
Input looks like:
[[a, b],
 [c, d]]

instead of [a, b, c, d].
This commit is contained in:
Justin Buchanan
2018-12-12 00:21:56 -08:00
parent f8d38caa90
commit f422a2cda4
2 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/TestCadObjects.py
View File

@ -117,19 +117,19 @@ class TestCadObjects(BaseTest):
def testMatrixCreationAndAccess(self):
def matrix_vals(m):
return [m[r,c] for r in range(4) for c in range(4)]
return [[m[r,c] for c in range(4)] for r in range(4)]
# default constructor creates a 4x4 identity matrix
m = Matrix()
identity = [1., 0., 0., 0.,
0., 1., 0., 0.,
0., 0., 1., 0.,
0., 0., 0., 1.]
identity = [[1., 0., 0., 0.],
[0., 1., 0., 0.],
[0., 0., 1., 0.],
[0., 0., 0., 1.]]
self.assertEqual(identity, matrix_vals(m))
vals4x4 = [1., 0., 0., 1.,
0., 1., 0., 2.,
0., 0., 1., 3.,
0., 0., 0., 1.,]
vals4x4 = [[1., 0., 0., 1.],
[0., 1., 0., 2.],
[0., 0., 1., 3.],
[0., 0., 0., 1.]]
# test constructor with 16-value input
m = Matrix(vals4x4)
@ -141,10 +141,10 @@ class TestCadObjects(BaseTest):
self.assertEqual(vals4x4, matrix_vals(m))
# Test 16-value input with invalid values for the last 4
invalid = [1., 0., 0., 1.,
0., 1., 0., 2.,
0., 0., 1., 3.,
1., 2., 3., 4.,]
invalid = [[1., 0., 0., 1.],
[0., 1., 0., 2.],
[0., 0., 1., 3.],
[1., 2., 3., 4.]]
with self.assertRaises(ValueError):
Matrix(invalid)