Merge branch 'release/2.13.0' into master

Author: wolph

pytest.ini

@@ -17,7 +17,7 @@ addopts =
     --ignore=build
 
 flake8-ignore =
-    *.py W391
+    *.py W391 W504
     docs/*.py ALL
 
 looponfailroots =

stl/__about__.py

@@ -1,6 +1,6 @@
 __package_name__ = 'numpy-stl'
 __import_name__ = 'stl'
-__version__ = '2.12.0'
+__version__ = '2.13.0'
 __author__ = 'Rick van Hattem'
 __author_email__ = '[email protected]'
 __description__ = ' '.join('''

stl/_speedups.pyx

@@ -1,3 +1,4 @@
+# cython: language_level=2
 from libc.stdio cimport *                                                                
 from libc.string cimport memcpy, strcmp, strstr, strcpy
 
@@ -33,7 +34,7 @@ cdef packed struct Facet:
 dtype = np.dtype([
     ('normals', np.float32, 3),
     ('vectors', np.float32, (3, 3)),
-    ('attr', np.uint16, 1),
+    ('attr', np.uint16, (1,)),
 ])
 
 DEF ALLOC_SIZE = 200000

stl/base.py

@@ -589,4 +589,60 @@ def __iter__(self):
         for point in self.points:
             yield point
 
+    def get_mass_properties_with_density(self, density):
+        # add density for mesh,density unit kg/m3 when mesh is unit is m
+        self.check()
+
+        def subexpression(x):
+            w0, w1, w2 = x[:, 0], x[:, 1], x[:, 2]
+            temp0 = w0 + w1
+            f1 = temp0 + w2
+            temp1 = w0 * w0
+            temp2 = temp1 + w1 * temp0
+            f2 = temp2 + w2 * f1
+            f3 = w0 * temp1 + w1 * temp2 + w2 * f2
+            g0 = f2 + w0 * (f1 + w0)
+            g1 = f2 + w1 * (f1 + w1)
+            g2 = f2 + w2 * (f1 + w2)
+            return f1, f2, f3, g0, g1, g2
+
+        x0, x1, x2 = self.x[:, 0], self.x[:, 1], self.x[:, 2]
+        y0, y1, y2 = self.y[:, 0], self.y[:, 1], self.y[:, 2]
+        z0, z1, z2 = self.z[:, 0], self.z[:, 1], self.z[:, 2]
+        a1, b1, c1 = x1 - x0, y1 - y0, z1 - z0
+        a2, b2, c2 = x2 - x0, y2 - y0, z2 - z0
+        d0, d1, d2 = b1 * c2 - b2 * c1, a2 * c1 - a1 * c2, a1 * b2 - a2 * b1
+
+        f1x, f2x, f3x, g0x, g1x, g2x = subexpression(self.x)
+        f1y, f2y, f3y, g0y, g1y, g2y = subexpression(self.y)
+        f1z, f2z, f3z, g0z, g1z, g2z = subexpression(self.z)
+
+        intg = numpy.zeros((10))
+        intg[0] = sum(d0 * f1x)
+        intg[1:4] = sum(d0 * f2x), sum(d1 * f2y), sum(d2 * f2z)
+        intg[4:7] = sum(d0 * f3x), sum(d1 * f3y), sum(d2 * f3z)
+        intg[7] = sum(d0 * (y0 * g0x + y1 * g1x + y2 * g2x))
+        intg[8] = sum(d1 * (z0 * g0y + z1 * g1y + z2 * g2y))
+        intg[9] = sum(d2 * (x0 * g0z + x1 * g1z + x2 * g2z))
+        intg /= numpy.array([6, 24, 24, 24, 60, 60, 60, 120, 120, 120])
+        volume = intg[0]
+        cog = intg[1:4] / volume
+        cogsq = cog ** 2
+        vmass = volume * density
+        inertia = numpy.zeros((3, 3))
+
+        inertia[0, 0] = (intg[5] + intg[6]) * density - vmass * (
+            cogsq[1] + cogsq[2])
+        inertia[1, 1] = (intg[4] + intg[6]) * density - vmass * (
+            cogsq[2] + cogsq[0])
+        inertia[2, 2] = (intg[4] + intg[5]) * density - vmass * (
+            cogsq[0] + cogsq[1])
+        inertia[0, 1] = inertia[1, 0] = -(
+            intg[7] * density - vmass * cog[0] * cog[1])
+        inertia[1, 2] = inertia[2, 1] = -(
+            intg[8] * density - vmass * cog[1] * cog[2])
+        inertia[0, 2] = inertia[2, 0] = -(
+            intg[9] * density - vmass * cog[2] * cog[0])
+
+        return volume, vmass, cog, inertia
 

tests/test_meshProperties.py

@@ -7,68 +7,83 @@
 tolerance = 1e-6
 
 
+def close(a, b):
+    return numpy.allclose(a, b, atol=tolerance)
+
+
 def test_mass_properties_for_half_donut(binary_ascii_path, speedups):
-    """
+    '''
     Checks the results of method get_mass_properties() on
     STL ASCII and binary files HalfDonut.stl
     One checks the results obtained with stl
     with the ones obtained with meshlab
-    """
+    '''
     filename = binary_ascii_path.join('HalfDonut.stl')
     mesh = stl.StlMesh(str(filename), speedups=speedups)
     volume, cog, inertia = mesh.get_mass_properties()
-    assert(abs(volume - 2.343149) < tolerance)
-    assert(numpy.allclose(cog,
-           numpy.array([1.500001, 0.209472, 1.500001]),
-           atol=tolerance))
-    assert(numpy.allclose(inertia,
-           numpy.array([[+1.390429, +0.000000, +0.000000],
-                        [+0.000000, +2.701025, +0.000000],
-                        [+0.000000, +0.000000, +1.390429]]),
-           atol=tolerance))
+    assert close([volume], [2.343149])
+    assert close(cog, [1.500001, 0.209472, 1.500001])
+    assert close(inertia, [[+1.390429, +0.000000, +0.000000],
+                           [+0.000000, +2.701025, +0.000000],
+                           [+0.000000, +0.000000, +1.390429]])
 
 
 def test_mass_properties_for_moon(binary_ascii_path, speedups):
-    """
+    '''
     Checks the results of method get_mass_properties() on
     STL ASCII and binary files Moon.stl
     One checks the results obtained with stl
     with the ones obtained with meshlab
-    """
+    '''
     filename = binary_ascii_path.join('Moon.stl')
     mesh = stl.StlMesh(str(filename), speedups=speedups)
     volume, cog, inertia = mesh.get_mass_properties()
-    assert(abs(volume - 0.888723) < tolerance)
-    assert(numpy.allclose(cog,
-           numpy.array([0.906913, 0.170731, 1.500001]),
-           atol=tolerance))
-    assert(numpy.allclose(inertia,
-           numpy.array([[+0.562097, -0.000457, +0.000000],
-                        [-0.000457, +0.656851, +0.000000],
-                        [+0.000000, +0.000000, +0.112465]]),
-           atol=tolerance))
+    assert close([volume], [0.888723])
+    assert close(cog, [0.906913, 0.170731, 1.500001])
+    assert close(inertia, [[+0.562097, -0.000457, +0.000000],
+                           [-0.000457, +0.656851, +0.000000],
+                           [+0.000000, +0.000000, +0.112465]])
 
 
 @pytest.mark.parametrize('filename', ('Star.stl', 'StarWithEmptyHeader.stl'))
 def test_mass_properties_for_star(binary_ascii_path, filename, speedups):
-    """
+    '''
     Checks the results of method get_mass_properties() on
     STL ASCII and binary files Star.stl and
     STL binary file StarWithEmptyHeader.stl (with no header)
     One checks the results obtained with stl
     with the ones obtained with meshlab
-    """
+    '''
     filename = binary_ascii_path.join(filename)
     if not filename.exists():
         pytest.skip('STL file does not exist')
     mesh = stl.StlMesh(str(filename), speedups=speedups)
     volume, cog, inertia = mesh.get_mass_properties()
-    assert(abs(volume - 1.416599) < tolerance)
-    assert(numpy.allclose(cog,
-           numpy.array([1.299040, 0.170197, 1.499999]),
-           atol=tolerance))
-    assert(numpy.allclose(inertia,
-           numpy.array([[+0.509549, +0.000000, -0.000000],
-                        [+0.000000, +0.991236, +0.000000],
-                        [-0.000000, +0.000000, +0.509550]]),
-           atol=tolerance))
+    assert close([volume], [1.416599])
+    assert close(cog, [1.299040, 0.170197, 1.499999])
+    assert close(inertia, [[+0.509549, +0.000000, -0.000000],
+                           [+0.000000, +0.991236, +0.000000],
+                           [-0.000000, +0.000000, +0.509550]])
+
+
+def test_mass_properties_for_half_donut_with_density(
+        binary_ascii_path, speedups):
+    '''
+    Checks the results of method get_mass_properties_with_density() on
+    STL ASCII and binary files HalfDonut.stl
+    One checks the results obtained with stl
+    with the ones obtained with meshlab
+    '''
+    filename = binary_ascii_path.join('HalfDonut.stl')
+    mesh = stl.StlMesh(str(filename), speedups=speedups)
+    volume, mass, cog, inertia = mesh.get_mass_properties_with_density(1.23)
+
+    assert close([mass], [2.882083302268982])
+    assert close([volume], [2.343149026234945])
+    assert close(cog, [1.500001, 0.209472, 1.500001])
+    print('inertia')
+    numpy.set_printoptions(suppress=True)
+    print(inertia)
+    assert close(inertia, [[+1.71022851, +0.00000001, -0.00000011],
+                           [+0.00000001, +3.32226227, +0.00000002],
+                           [-0.00000011, +0.00000002, +1.71022859]])