Removing the display test from tests (#75)

* Removing the display test from tests

* Removing the display test from test_propeller.py

* Fixing test_blade.py and adding a test on the presence of the display method in test_shaft.py and test_propeller.py

* Removing smesh from .travis.yml and the deprecated generate_stl_smesh method from blade.py with corresponding tests in test_blade.py

Author: ggurioli

.travis.yml

@@ -54,7 +54,7 @@ install:
     - echo $DYLD_LIBRARY_PATH
     - echo $PATH
     - python --version
-    - conda install --yes -c conda-forge pythonocc-core=7.4.0 smesh numpy scipy matplotlib pip nose sip=4.18 setuptools coveralls python=3.7;
+    - conda install --yes -c conda-forge pythonocc-core=7.4.0 numpy scipy matplotlib pip nose sip=4.18 setuptools coveralls python=3.7;
     - python setup.py install
 
 script:

bladex/blade.py

@@ -927,111 +927,6 @@ def generate_solid(self,
         result_solid = solid_maker.Solid()
        	return result_solid
 
-    def generate_stl_smesh(self, min_length=None, max_length=None, outfile_stl=None):
-        """
-        Generate and export the .STL surface mesh for the blade as a whole,
-        including the upper face, lower face and tip. The method utilizes
-        modules from OCC SMESH which is standalone mesh framework based on
-        SALOME mesher project. Please refer to https://github.com/tpaviot
-        and http://docs.salome-platform.org/7/gui/SMESH/index.html for
-        further details.
-
-        This method requires PythonOCC and SMESH to be installed.
-
-        :param double min_length: smallest distance between two nodes. Default
-            value is None
-        :param double max_length: largest distance between two nodes. Default
-            value is None
-        :param string outfile_stl: if string is passed then the method exports
-            the generated 2D surface mesh into .stl file holding the name
-            <outfile_stl>.stl. Default value is None
-
-        We note that since the current implementation performs triangulation
-        based on a topological compound that combines the blade 3 generated
-        shapes without "fusion", it may happen that the generated triangulation
-        of the upper and lower blade faces do not share the same exact nodes
-        on the joint edge/wire resulting from the faces intersection. The
-        current implementation can be enough for visualization purpose. However
-        if the generated mesh is intended for computational analysis then a
-        manual mesh healing is recommended by the user (e.g. see
-        "Repair > Sewing" in SALOME GUI) for a proper mesh closure.
-        """
-        from OCC.SMESH import SMESH_Gen
-        from OCC.StdMeshers import (
-            StdMeshers_Arithmetic1D, StdMeshers_TrianglePreference,
-            StdMeshers_Regular_1D, StdMeshers_MEFISTO_2D)
-        from OCC.Core.BRep import BRep_Builder
-        from OCC.Core.TopoDS import TopoDS_Shape, TopoDS_Compound
-
-        if min_length <= 0 or max_length <= 0:
-            raise ValueError('min_length and max_length must be positive.')
-        if min_length >= max_length:
-            raise ValueError('min_length can not be greater than max_length')
-
-        # First we check that blade shapes are generated, otherwise we generate
-        # them. After that we combine the generated_upper_face,
-        # generated_lower_face, and generated_tip into a topological compound
-        # that we use to compute the surface mesh
-        if (self.generated_upper_face is None) or not isinstance(
-                self.generated_upper_face, TopoDS_Shape):
-            # Upper face is generated with a maximal U degree = 1
-            self._generate_upper_face(max_deg=1)
-        if (self.generated_lower_face is None) or not isinstance(
-                self.generated_lower_face, TopoDS_Shape):
-            # Upper face is generated with a maximal U degree = 1
-            self._generate_lower_face(max_deg=1)
-        if (self.generated_tip is None) or not isinstance(
-                self.generated_tip, TopoDS_Shape):
-            # Upper face is generated with a maximal U degree = 1
-            self._generate_tip(max_deg=1)
-
-        # Now we regroup all the shapes into a TopoDS_Compound
-        aCompound = TopoDS_Compound()
-        aBuilder = BRep_Builder()
-        aBuilder.MakeCompound(aCompound)
-        # Add shapes
-        aBuilder.Add(aCompound, self.generated_upper_face)
-        aBuilder.Add(aCompound, self.generated_lower_face)
-        aBuilder.Add(aCompound, self.generated_tip)
-
-        # In the following we build the surface mesh according to the given
-        # hypotheses
-        aMeshGen = SMESH_Gen()
-        aMesh = aMeshGen.CreateMesh(0, True)
-        # Adding 1D hypothesis and algorithms
-        # Wire discretization. Nodes are distributed based on Arithmetic1D
-        # hypothesis which allows to split edges into segments with a length
-        # that changes in arithmetic progression (Lk = Lk-1 + d) beginning
-        # from a given min length and up to a given max length. More about
-        # 1D hypotheses can be viewed through:
-        # http://docs.salome-platform.org/7/gui/SMESH/a1d_meshing_hypo_page.html
-        an1DHypothesis = StdMeshers_Arithmetic1D(0, 0, aMeshGen)
-        # Smallest distance between 2 points
-        an1DHypothesis.SetLength(min_length, False)
-        # Longest distance between 2 points
-        an1DHypothesis.SetLength(max_length, True)
-        # Regular Interpolation
-        # Adding 2D hypothesis and algorithms
-        # 2D surface mesh -- Triangulations
-
-        #Calculate mesh for the topological compound containing the 3 shapes
-        aMesh.ShapeToMesh(aCompound)
-
-        #Assign hyptothesis to mesh
-        aMesh.AddHypothesis(aCompound, 0)
-        aMesh.AddHypothesis(aCompound, 1)
-        aMesh.AddHypothesis(aCompound, 2)
-        aMesh.AddHypothesis(aCompound, 3)
-
-        if outfile_stl is not None:
-            if not isinstance(outfile_stl, str):
-                raise ValueError('outfile_stl must be a valid string.')
-
-            #Compute the data
-            aMeshGen.Compute(aMesh, aMesh.GetShapeToMesh())
-            # Export STL
-            aMesh.ExportSTL(outfile_stl + '.stl', False)
-
     def generate_stl(self, upper_face=None,
                       lower_face=None,
                       tip=None,
@@ -1079,6 +974,9 @@ def generate_stl(self, upper_face=None,
         from OCC.Extend.DataExchange import write_stl_file
         from OCC.Display.SimpleGui import init_display
 
+        if max_deg <= 0:
+            raise ValueError('max_deg argument must be a positive integer.')
+
         if upper_face:
             self._check_string(filename=upper_face)
             self._generate_upper_face(max_deg=max_deg)
@@ -1297,4 +1195,4 @@ def __str__(self):
                   ' sections = {}'.format(self.pitch_angles)
         string += '\nInduced rake from skew (in unit length)'\
                   ' for the sections = {}'.format(self.induced_rake)
-        return string
+        return string

tests/test_blade.py

@@ -353,8 +353,8 @@ def test_rotate_deg_section_0_xup(self):
         blade.apply_transformations()
         blade.rotate(deg_angle=90)
         rotated_coordinates = np.array([
-            0.23913475, 0.20945559, 0.16609993, 0.11970761, 0.07154874,
-            0.02221577, -0.02796314, -0.07881877, -0.13030229, -0.18246808
+            0.2969784,  0.2653103,  0.2146533, 0.1597801, 0.1024542,
+            0.0434981, -0.0166326, -0.0777027, -0.1396447, -0.202534
         ])
         np.testing.assert_almost_equal(blade.blade_coordinates_up[0][0],
                                        rotated_coordinates)
@@ -364,8 +364,8 @@ def test_rotate_deg_section_0_yup(self):
         blade.apply_transformations()
         blade.rotate(deg_angle=90)
         rotated_coordinates = np.array([
-            0.3488408, 0.37407923, 0.38722075, 0.39526658, 0.39928492,
-            0.39980927, 0.39716902, 0.39160916, 0.38335976, 0.3726862
+            -0.409087 , -0.449122 , -0.4720087, -0.4872923, -0.4963637,
+            -0.4999122, -0.4983684, -0.4920609, -0.4813081, -0.4664844
         ])
         np.testing.assert_almost_equal(blade.blade_coordinates_up[0][1],
                                        rotated_coordinates)
@@ -375,8 +375,8 @@ def test_rotate_deg_section_0_zup(self):
         blade.apply_transformations()
         blade.rotate(deg_angle=90)
         rotated_coordinates = np.array([
-            0.19572966, 0.14165003, 0.1003, 0.06135417, 0.02390711, -0.01235116,
-            -0.04750545, -0.08150009, -0.11417222, -0.14527558
+            0.2874853, 0.2197486, 0.1649479, 0.1120097, 0.0601922,
+            0.0093686, -0.04036, -0.0887472, -0.1354346, -0.1799786
         ])
         np.testing.assert_almost_equal(blade.blade_coordinates_up[0][2],
                                        rotated_coordinates)
@@ -386,8 +386,8 @@ def test_rotate_rad_section_1_xdown(self):
         blade.apply_transformations()
         blade.rotate(rad_angle=np.pi / 2.0)
         rotated_coordinates = np.array([
-            0.29697841, 0.2176438, 0.15729805, 0.10116849, 0.04749167,
-            -0.00455499, -0.05542713, -0.10535969, -0.15442047, -0.20253397
+            0.23913475, 0.17512439, 0.12479053, 0.07749333, 0.03196268,
+            -0.01239386, -0.05590447, -0.09873836, -0.14094435, -0.18246808
         ])
         np.testing.assert_almost_equal(blade.blade_coordinates_down[1][0],
                                        rotated_coordinates)
@@ -397,8 +397,8 @@ def test_rotate_rad_section_1_ydown(self):
         blade.apply_transformations()
         blade.rotate(rad_angle=np.pi / 2.0)
         rotated_coordinates = np.array([
-            0.40908705, 0.42570092, 0.44956113, 0.47048031, 0.48652991,
-            0.49660315, 0.49999921, 0.49627767, 0.48516614, 0.4664844
+            -0.3488408, -0.3576312, -0.3719492, -0.3844258, -0.3936846,
+            -0.3989522, -0.3997457, -0.3957593, -0.3867917, -0.3726862
         ])
         np.testing.assert_almost_equal(blade.blade_coordinates_down[1][1],
                                        rotated_coordinates)
@@ -408,8 +408,8 @@ def test_rotate_rad_section_1_zdown(self):
         blade.apply_transformations()
         blade.rotate(rad_angle=np.pi / 2.0)
         rotated_coordinates = np.array([
-            0.28748529, 0.26225699, 0.21884879, 0.16925801, 0.11527639,
-            0.05818345, -0.00088808, -0.0608972, -0.1208876, -0.17997863
+            0.19572966, 0.17916459, 0.14715217, 0.11052969, 0.07079877,
+            0.02893379, -0.01426232, -0.05809137, -0.10194212, -0.14527558
         ])
         np.testing.assert_almost_equal(blade.blade_coordinates_down[1][2],
                                        rotated_coordinates)
@@ -734,48 +734,6 @@ def test_stl_generate_errors_lower(self):
         self.assertTrue(os.path.isfile('tests/test_datasets/errors.txt'))
         self.addCleanup(os.remove, 'tests/test_datasets/errors.txt')
 
-    def test_stl_smesh_exception_1(self):
-        blade = create_sample_blade_NACA()
-        blade.apply_transformations()
-        with self.assertRaises(ValueError):
-            blade.generate_stl_smesh(min_length=-1, max_length=1, outfile_stl=None)
-
-    def test_stl_smesh_exception_2(self):
-        blade = create_sample_blade_NACA()
-        blade.apply_transformations()
-        with self.assertRaises(ValueError):
-            blade.generate_stl_smesh(min_length=2, max_length=1, outfile_stl=None)
-
-    def test_stl_smesh_generated_upper(self):
-        # Requires OCC to be installed
-        blade = create_sample_blade_NACA()
-        blade.apply_transformations()
-        blade.generated_upper_face = 5
-        blade.generate_stl_smesh(min_length=1, max_length=10, outfile_stl=None)
-        self.assertIsInstance(blade.generated_upper_face, TopoDS_Shape)
-
-    def test_stl_smesh_generated_lower(self):
-        # Requires OCC to be installed
-        blade = create_sample_blade_NACA()
-        blade.apply_transformations()
-        blade.generated_lower_face = None
-        blade.generate_stl_smesh(min_length=1, max_length=10, outfile_stl=None)
-        self.assertIsInstance(blade.generated_lower_face, TopoDS_Shape)
-
-    def test_stl_smesh_generated_tip(self):
-        # Requires OCC to be installed
-        blade = create_sample_blade_NACA()
-        blade.apply_transformations()
-        blade.generated_tip = 0
-        blade.generate_stl_smesh(min_length=1, max_length=10, outfile_stl=None)
-        self.assertIsInstance(blade.generated_tip, TopoDS_Shape)
-
-    def test_stl_smesh_export_exception(self):
-        blade = create_sample_blade_NACA()
-        blade.apply_transformations()
-        with self.assertRaises(ValueError):
-            blade.generate_stl_smesh(min_length=1, max_length=10, outfile_stl=55)
-
     def test_solid_max_deg_exception(self):
         blade = create_sample_blade_NACA()
         blade.apply_transformations()
@@ -876,4 +834,4 @@ def test_blade_str_method(self):
                   ' sections = {}'.format(blade.pitch_angles)
         string += '\nInduced rake from skew (in unit length)'\
                   ' for the sections = {}'.format(blade.induced_rake)
-        assert blade.__str__() == string
+        assert blade.__str__() == string

tests/test_datasets/blade_down_after_transformation_no_reflect.npy

@@ -155,9 +155,6 @@ def test_generate_stl(self):
         prop.generate_stl("tests/test_datasets/propeller_and_shaft.stl")
         self.assertTrue(os.path.isfile('tests/test_datasets/propeller_and_shaft.stl'))
         self.addCleanup(os.remove, 'tests/test_datasets/propeller_and_shaft.stl')
-        
-    def test_display(self):
-        sh = Shaft("tests/test_datasets/shaft.iges")
-        prop = create_sample_blade_NACApptc()
-        prop = Propeller(sh, prop, 4)
-        prop.display()
+
+    def test_isdisplay(self):
+        assert hasattr(Propeller, "display") == True