diff --git a/wetb/fatigue_tools/rainflowcounting/compile.py b/wetb/fatigue_tools/rainflowcounting/compile.py deleted file mode 100644 index 0c77dbd78327ad45cf66363519a0ddcb9a8edd49..0000000000000000000000000000000000000000 --- a/wetb/fatigue_tools/rainflowcounting/compile.py +++ /dev/null @@ -1,11 +0,0 @@ -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import division -from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() -from wetb.utils.cython_compile.cython_compile import cython_import -if __name__=="__main__": - cython_import('pair_range') - cython_import('peak_trough') - cython_import('rainflowcount_astm') diff --git a/wetb/fatigue_tools/rainflowcounting/rainflowcount.py b/wetb/fatigue_tools/rainflowcounting/rainflowcount.py index 645da85e332a8cd5296d602e982c46b1cd79c1cf..8d1bdd76e8bb550114bb552e5ae6985a8c9b427b 100644 --- a/wetb/fatigue_tools/rainflowcounting/rainflowcount.py +++ b/wetb/fatigue_tools/rainflowcounting/rainflowcount.py @@ -6,7 +6,7 @@ from builtins import str from future import standard_library standard_library.install_aliases() import numpy as np -from wetb.utils.cython_compile.cython_compile import cython_import + def check_signal(signal): @@ -73,9 +73,6 @@ def rainflow_windap(signal, levels=255., thresshold=(255 / 50)): # If possible the module is compiled using cython otherwise the python implementation is used - cython_import('wetb.fatigue_tools.rainflowcounting.peak_trough') - cython_import('wetb.fatigue_tools.rainflowcounting.pair_range') - from wetb.fatigue_tools.rainflowcounting.peak_trough import peak_trough from wetb.fatigue_tools.rainflowcounting.pair_range import pair_range_amplitude_mean @@ -129,7 +126,7 @@ def rainflow_astm(signal): # Import find extremes and rainflow. # If possible the module is compiled using cython otherwise the python implementation is used - cython_import('wetb.fatigue_tools.rainflowcounting.rainflowcount_astm') + from wetb.fatigue_tools.rainflowcounting.rainflowcount_astm import find_extremes, rainflowcount # Remove points which is not local minimum/maximum