Merge pull request #26 from wwhenxuan/master

Update New Version

Author: wwhenxuan

README.md

@@ -99,6 +99,7 @@ plot_IMFs_amplitude_spectra(IMFs, smooth="exp")   # use exp smooth
 |  [`BMEMD`](https://github.com/wwhenxuan/PySDKit/blob/main/pysdkit/_emd2d/bmemd.py) (Bidimensional Multivariate Empirical Mode Decomposition)  |   [[paper]](https://ieeexplore.ieee.org/document/8805082)   | [[code]](https://www.mathworks.com/matlabcentral/fileexchange/72343-bidimensional-multivariate-empirical-mode-decomposition?s_tid=FX_rc1_behav) |   ✖️   |
 |        [`CEEMDAN`](https://github.com/wwhenxuan/PySDKit/blob/main/pysdkit/_emd/ceemdan.py) (Complete Ensemble EMD with Adaptive Noise)        |   [[paper]](https://ieeexplore.ieee.org/document/5947265)    | [[code]](https://github.com/laszukdawid/PyEMD/blob/master/PyEMD/EEMD.py) |   ✔️   |
 |              [`TVF_EMD`](https://github.com/wwhenxuan/PySDKit/blob/main/pysdkit/_emd/tvf_emd.py) (Time Varying Filter Based EMD)              | [[paper]](https://www.sciencedirect.com/science/article/pii/S0165168417301135) |   [[code]](https://github.com/stfbnc/pytvfemd/tree/master)   |   ✔️   |
+| [`EFD`](https://github.com/wwhenxuan/PySDKit/blob/main/pysdkit/_emd/efd.py) (Empirical Fourier Decomposition) | [[paper]](https://www.sciencedirect.com/science/article/abs/pii/S0888327021005355) | [[code]](https://www.mathworks.com/matlabcentral/fileexchange/97747-empirical-fourier-decomposition-efd) | ✔️ |
 |                   [`FAEMD`](https://github.com/wwhenxuan/PySDKit/blob/main/pysdkit/_faemd/faemd.py) (Fast and Adaptive EMD)                   |   [[paper]](https://ieeexplore.ieee.org/document/8447300)    | [[code]](https://www.mathworks.com/matlabcentral/fileexchange/71270-fast-and-adaptive-multivariate-and-multidimensional-emd) |   ✔️   |
 |         [`FAEMD2D`](https://github.com/wwhenxuan/PySDKit/blob/main/pysdkit/_faemd/faemd2d.py) (Two-Dimensional Fast and Adaptive EMD)         |   [[paper]](https://ieeexplore.ieee.org/document/8447300)    | [[code]](https://www.mathworks.com/matlabcentral/fileexchange/71270-fast-and-adaptive-multivariate-and-multidimensional-emd) |   ✖️   |
 |        [`FAEMD3D`](https://github.com/wwhenxuan/PySDKit/blob/main/pysdkit/_faemd/faemd3d.py) (Three-Dimensional Fast and Adaptive EMD)        |   [[paper]](https://ieeexplore.ieee.org/document/8447300)    | [[code]](https://www.mathworks.com/matlabcentral/fileexchange/71270-fast-and-adaptive-multivariate-and-multidimensional-emd) |   ✖️   |

pysdkit/__init__.py

@@ -2,7 +2,7 @@
 A Python library for signal decomposition algorithms.
 """
 
-__version__ = "0.4.16"
+__version__ = "0.4.17"
 
 __all__ = [
     "EMD",
@@ -11,6 +11,7 @@
     "REMD",
     "MEMD",
     "TVF_EMD",
+    "EFD",
     "FAEMD",
     "EMD2D",
     "HVD",
@@ -57,6 +58,9 @@
 # Time Varying Filter based Empirical Mode Decomposition
 from ._emd import TVF_EMD
 
+# Empirical Fourier Decomposition
+from ._emd import EFD
+
 # Fast and Adaptive Empirical Mode Decomposition
 from ._faemd import FAEMD
 
@@ -110,3 +114,19 @@
 
 # Moving Average decomposition
 from .tsa import Moving_Decomp
+
+
+def greet():
+    print(
+        """
+ ____          ____   ____   _  __ _  _   
+|  _ \  _   _ / ___| |  _ \ | |/ /(_)| |_ 
+| |_) || | | |\___ \ | | | || ' / | || __|
+|  __/ | |_| | ___) || |_| || . \ | || |_ 
+|_|     \__, ||____/ |____/ |_|\_\|_| \__|
+        |___/                                            
+    
+A Python library for signal decomposition algorithms.
+https://github.com/wwhenxuan/PySDKit
+"""
+    )

pysdkit/_emd/__init__.py

@@ -21,3 +21,5 @@
 from .memd import MEMD
 
 from .tvf_emd import TVF_EMD
+
+from .efd import EFD

pysdkit/_vncmd/incmd.py

@@ -6,7 +6,10 @@
 """
 import numpy as np
 from scipy import linalg
-from scipy.integrate import cumtrapz
+try:
+    from scipy.integrate import cumulative_trapezoid
+except ImportError:
+    from scipy.integrate import cumtrapz as cumulative_trapezoid
 from scipy.sparse import spdiags, diags, identity, csc_matrix
 from scipy.signal import welch
 from scipy.sparse.linalg import inv as sparseinv
@@ -165,14 +168,14 @@ def _welch_method_estimate(signal: np.ndarray, time: np.ndarray) -> np.ndarray:
     @staticmethod
     def _compute_new_phi_1(new_f: np.ndarray, time: np.ndarray) -> np.ndarray:
         """Compute new phi_1"""
-        integrated_f = cumtrapz(new_f, time, initial=0)
+        integrated_f = cumulative_trapezoid(new_f, time, initial=0)
         phi_diag = np.cos(2 * np.pi * integrated_f)
         return diags(phi_diag)
 
     @staticmethod
     def _compute_new_phi_2(new_f: np.ndarray, time: np.ndarray) -> np.ndarray:
         """Compute new phi_2"""
-        integrated_f = cumtrapz(new_f, time, initial=0)
+        integrated_f = cumulative_trapezoid(new_f, time, initial=0)
         phi_diag = np.sin(2 * np.pi * integrated_f)
         return diags(phi_diag)
 

pysdkit/_vncmd/vncmd.py

@@ -9,7 +9,10 @@
 import numpy as np
 from numpy.linalg import solve, norm
 from scipy.sparse import diags, eye
-from scipy.integrate import cumtrapz
+try:
+    from scipy.integrate import cumulative_trapezoid
+except ImportError:
+    from scipy.integrate import cumtrapz as cumulative_trapezoid
 from typing import Tuple, Optional
 from pysdkit._vmd.base import Base
 
@@ -196,10 +199,10 @@ def fit_transform(self, signal: np.ndarray, eIF: Optional[np.ndarray] = None):
         # Initialize the variables defined above through loops
         for i in range(K):
             sinm[i, :] = np.sin(
-                2 * np.pi * cumtrapz(eIF[i, :], t, initial=0), dtype=self.DTYPE
+                2 * np.pi * cumulative_trapezoid(eIF[i, :], t, initial=0), dtype=self.DTYPE
             )
             cosm[i, :] = np.cos(
-                2 * np.pi * cumtrapz(eIF[i, :], t, initial=0), dtype=self.DTYPE
+                2 * np.pi * cumulative_trapezoid(eIF[i, :], t, initial=0), dtype=self.DTYPE
             )
 
             Bm = diags(

setup.py

@@ -6,7 +6,7 @@
 setuptools.setup(
     name="PySDKit",  # 使用包的名称
     packages=setuptools.find_packages(),
-    version="0.4.16",  # 包的版本号，应遵循语义版本控制规则
+    version="0.4.17",  # 包的版本号，应遵循语义版本控制规则
     description="A Python library for signal decomposition algorithms with a unified interface.",  # 包的简短描述
     url="https://github.com/wwhenxuan/PySDKit",  # 项目的地址通常来说是github
     author="whenxuan",
@@ -33,9 +33,9 @@
     ],
     python_requires=">=3.6",  # 最低的Python版本限制
     install_requires=[
-        "numpy>=1.24.3,<=1.26.4",
-        "scipy>=1.11.1,<=1.13.1",
-        "matplotlib>=3.7.2,<=3.8.4",
+        "numpy>=1.24.3",
+        "scipy>=1.11.1",
+        "matplotlib>=3.7.2",
         "tqdm>=4.66.5",
         "requests>=2.32.3",
     ],  # 手动指定依赖的Python以及最低的版本