Skip to content
Snippets Groups Projects
Commit 4b58e2a5 authored by Mads M. Pedersen's avatar Mads M. Pedersen
Browse files

removed cython_import from rainflow count

parent 2b0d906a
No related branches found
No related tags found
No related merge requests found
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')
...@@ -6,7 +6,7 @@ from builtins import str ...@@ -6,7 +6,7 @@ from builtins import str
from future import standard_library from future import standard_library
standard_library.install_aliases() standard_library.install_aliases()
import numpy as np import numpy as np
from wetb.utils.cython_compile.cython_compile import cython_import
def check_signal(signal): def check_signal(signal):
...@@ -73,9 +73,6 @@ def rainflow_windap(signal, levels=255., thresshold=(255 / 50)): ...@@ -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 # 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.peak_trough import peak_trough
from wetb.fatigue_tools.rainflowcounting.pair_range import pair_range_amplitude_mean from wetb.fatigue_tools.rainflowcounting.pair_range import pair_range_amplitude_mean
...@@ -129,7 +126,7 @@ def rainflow_astm(signal): ...@@ -129,7 +126,7 @@ def rainflow_astm(signal):
# Import find extremes and rainflow. # Import find extremes and rainflow.
# If possible the module is compiled using cython otherwise the python implementation is used # 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 from wetb.fatigue_tools.rainflowcounting.rainflowcount_astm import find_extremes, rainflowcount
# Remove points which is not local minimum/maximum # Remove points which is not local minimum/maximum
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment