Modal-Decomposition 0.1.0__tar.gz → 0.1.2__tar.gz

{modal_decomposition-0.1.0 → modal_decomposition-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Modal-Decomposition
-Version: 0.1.0
+Version: 0.1.2
 Summary: a package for modal decomposition
 Author-email: Mao_HaoChuan <2215269365@qq.com>
 License: Apache-2.0

{modal_decomposition-0.1.0 → modal_decomposition-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Modal-Decomposition"
-version = "0.1.0"
+version = "0.1.2"
 requires-python = ">=3.8"
 
 authors = [

{modal_decomposition-0.1.0 → modal_decomposition-0.1.2}/src/Modal_Decomposition/CEEFD.py

@@ -14,6 +14,7 @@ Description: (if None write None)
 Modify:  (must)
     2026.3.25 - Create
     2026.3.30 - Desperate the CEEMDAN and the CEEFD, and rename the Cyclic_CEEFD as CEEFD, del the origin CEEFD.
+    2026.4.7  - Fix the problem when the freq_bins include 0 will make the idx out of list. And change _extract_imf to staticmethod.
 """
 
 import numpy as np
@@ -44,13 +45,15 @@ class ceefd:
             envelope = np.maximum(envelope, mag_spectrum)
         return envelope
 
-    def _extract_imf(self, signal, freq_bins):
+    @staticmethod
+    def _extract_imf(signal, freq_bins):
         N = len(signal)
         fft_signal = np.fft.fft(signal)
 
         mask = np.zeros(N, dtype=bool)
         mask[freq_bins] = True
-        mask[N - np.array(freq_bins)] = True
+        # mask[N - np.array(freq_bins)] = True -> \  # 2026.4.7
+        mask[(N - np.array(freq_bins)) % N] = True
 
         imf_fft = fft_signal * mask
         imf = np.fft.ifft(imf_fft).real

{modal_decomposition-0.1.0 → modal_decomposition-0.1.2}/src/Modal_Decomposition/EMD.py

@@ -22,7 +22,7 @@ from .COLOR.colorful_print import printc
 from typing import Tuple, Union
 
 
-def emd(S: Union[list, np.ndarray], T: Union[list, np.ndarray]=None, spline_kind: str = "cubic", nbsym: int = 2, max_imf=-1, fs=None)\
+def emd(S: Union[list, np.ndarray], T: Union[list, np.ndarray]=None, spline_kind: str = "cubic", nbsym: int = 2, max_imf=-1, verbose: bool=False)\
         -> Tuple[np.ndarray, np.ndarray]:
     """
     EMD: Empirical Mode Decomposition
@@ -32,7 +32,7 @@ def emd(S: Union[list, np.ndarray], T: Union[list, np.ndarray]=None, spline_kind
     :param spline_kind: the kind of spline. default cubic.
     :param nbsym:
     :param max_imf: the max num of IMFs
-    :param fs: the f of T. default 1.
+    :param verbose: True will print info, else no.
     :return: IMFs (2-dim), Res (1-dim)
     """
     if not isinstance(S, np.ndarray):
@@ -52,7 +52,8 @@ def emd(S: Union[list, np.ndarray], T: Union[list, np.ndarray]=None, spline_kind
 
     if T is None:  # if T is None, default generate uniform T-axis.
         T = np.arange(N)  # default fs = 1
-        print(f"Warn: T is None，default T = [0, 1, 2, ..., {N - 1}]")
+        if verbose:
+            print(f"Warn: T is None，default T = [0, 1, 2, ..., {N - 1}]")
 
     else:
         if not isinstance(T, np.ndarray):
@@ -62,4 +63,13 @@ def emd(S: Union[list, np.ndarray], T: Union[list, np.ndarray]=None, spline_kind
 
     IMFs = EMD_cls.emd(S, T, max_imf=max_imf)
 
-    return IMFs[:-1, :], IMFs[-1, :]
+    Res = IMFs[-1, :]
+    IMFs = IMFs[:-1, :]
+
+    if IMFs.ndim == 1:
+        IMFs = IMFs.reshape(1, -1)
+
+    elif IMFs.ndim == 0:
+        IMFs = np.zeros((1, Res.shape[1]))
+
+    return IMFs, Res

{modal_decomposition-0.1.0 → modal_decomposition-0.1.2}/src/Modal_Decomposition/__init__.py

@@ -40,12 +40,21 @@ Modify:
     2026.3.29 - Optimize the SSA.decompose function, time changed from 40min averagely to 2s averagely.
     2026.3.30 - Rebuilding All.
     2026.3.30 - Optimize the function of judging monotonicity.
+    2026.4.3  - Finish the Optimization of the modal decomposition method. Except the MEMD method.
+    2026.4.4  - Add the parameter to describe lib.
+    2026.4.6  - Change the position of the entrance of importing 'threading'. Try to reduce the cost of the import.
 """
 
-import threading
-from importlib import import_module
 
-from .help_function import is_increasing
+__version__ = "0.1.1"
+__author__ = "a-raining-day(Mao)"
+__email__ = "None, Only QQ email."
+__license__ = "Apache 2.0"
+__url__ = "https://github.com/a-raining-day/Modal-Decomposition"
+__description__ = "A comprehensive modal decomposition library"
+
+
+from importlib import import_module
 
 from .CEEFD import ceefd
 from .CEEMD import ceemd
@@ -67,9 +76,22 @@ from .VMD import vmd
 import warnings
 warnings.warn("The MEMD is rebuilding...")
 
-__all__ = ["Function", "Class"]
+
+__all__ = \
+    [
+        "Function", "Class",
+        "__version__",
+        "__author__",
+        "__email__",
+        "__license__",
+        "__url__",
+        "__description__"
+    ]
+
 
 class Class:
+    import threading
+
     __cache = {}
 
     CEEFD = ceefd
@@ -120,6 +142,7 @@ class Function:
     # function | default function for modal decomposition
     # the IMFs (2-dim) means: (K, len(Signal)) (K is the num of IMFs)
     # CEEFD = ceefd_real_cls.ceefd
+
     CEEFD = Class.CEEFD(fs=1.0, min_peak_distance=10, envelop_iter=3)
     CEEMD = ceemd
     CEEMDAN = ceemdan
@@ -136,6 +159,25 @@ class Function:
     SVMD = svmd
     VMD = vmd
 
+    # __cache = \
+    # {
+    #     "CEEFD": CEEFD,
+    #     "CEEMD": CEEMD,
+    #     "CEEMDAN": CEEMDAN,
+    #     "EEMD": EEMD,
+    #     "EFD": EFD,
+    #     "EMD": EMD,
+    #     "EWT": EWT,
+    #     "FMD": FMD,
+    #     "ICEEMDAN": ICEEMDAN,
+    #     "LMD": LMD,
+    #     "MEMD": MEMD,
+    #     "RPSEMD": RPSEMD,
+    #     "SSA": SSA,
+    #     "SVMD": SVMD,
+    #     "VMD": VMD
+    # }
+
 
 if __name__ == '__main__':
-    ...
+    Function.AAA

{modal_decomposition-0.1.0 → modal_decomposition-0.1.2}/src/Modal_Decomposition.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Modal-Decomposition
-Version: 0.1.0
+Version: 0.1.2
 Summary: a package for modal decomposition
 Author-email: Mao_HaoChuan <2215269365@qq.com>
 License: Apache-2.0

{modal_decomposition-0.1.0 → modal_decomposition-0.1.2}/tests/test.py

@@ -69,9 +69,6 @@ def test_SSA(S):
 
 
 if __name__ == '__main__':
-    import numpy as np
-    from scipy.signal import firwin, hilbert, correlate, get_window
-    from scipy.linalg import inv
-    import matplotlib.pyplot as plt
-
+    from src.Modal_Decomposition import Function
 
+    Function.AAA