From 4b58e2a5452238b66555a4b2021c833e16ee5a6d Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Fri, 4 Nov 2016 08:50:11 +0100
Subject: [PATCH] removed cython_import from rainflow count
---
wetb/fatigue_tools/rainflowcounting/compile.py | 11 -----------
wetb/fatigue_tools/rainflowcounting/rainflowcount.py | 7 ++-----
2 files changed, 2 insertions(+), 16 deletions(-)
delete mode 100644 wetb/fatigue_tools/rainflowcounting/compile.py
diff --git a/wetb/fatigue_tools/rainflowcounting/compile.py b/wetb/fatigue_tools/rainflowcounting/compile.py
deleted file mode 100644
index 0c77dbd..0000000
--- 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 645da85..8d1bdd7 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
--
GitLab