funcnodes-span 0.1.1__tar.gz → 0.1.2__tar.gz

{funcnodes_span-0.1.1 → funcnodes_span-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funcnodes-span
-Version: 0.1.1
+Version: 0.1.2
 Summary: 
 Author: Kourosh Rezaei
 Author-email: kouroshrezaei90@gmail.com

{funcnodes_span-0.1.1 → funcnodes_span-0.1.2}/funcnodes_span/__init__.py

@@ -4,7 +4,7 @@ from .normalization import NORM_NODE_SHELF as NORM
 from .smoothing import SMOOTH_NODE_SHELF as SMOOTH
 
 
-__version__ = "0.1.1"
+__version__ = "0.1.2"
 
 NODE_SHELF = fn.Shelf(
     name="Spectral Analysis",

{funcnodes_span-0.1.1 → funcnodes_span-0.1.2}/funcnodes_span/normalization.py

@@ -15,10 +15,10 @@ class NormMode(Enum):
     @classmethod
     def default(cls) -> "NormMode":
         """Returns the default normalization mode."""
-        return cls.ZERO_ONE
+        return cls.ZERO_ONE.value
 
 
-@NodeDecorator(id="span.basics.norm", name="Normalizations")
+@NodeDecorator(id="span.basics.norm", name="Normalization node")
 def _norm(array: np.ndarray, mode: NormMode = NormMode.default()) -> np.ndarray:
     # """
     # Apply different normalizations to the array.
@@ -33,23 +33,21 @@ def _norm(array: np.ndarray, mode: NormMode = NormMode.default()) -> np.ndarray:
     # Raises:
     #     ValueError: If an unsupported normalization mode is provided.
     # """
+    if isinstance(mode, NormMode):
+        mode = mode.value
     normalization_methods = {
-        NormMode.ZERO_ONE: lambda x: (x - np.amin(x)) / (np.amax(x) - np.amin(x)),
-        NormMode.MINUS_ONE_ONE: lambda x: 2
-        * ((x - np.amin(x)) / (np.amax(x) - np.amin(x)))
-        - 1,
-        NormMode.SUM_ABS: lambda x: x / np.abs(x).sum(),
-        NormMode.SUM: lambda x: x / x.sum(),
-        NormMode.EUCLIDEAN: lambda x: x / np.sqrt((x**2).sum()),
-        NormMode.MEAN_STD: lambda x: (x - x.mean()) / x.std(),
-        NormMode.MAX: lambda x: x / x.max(),
+        NormMode.ZERO_ONE.value: lambda x: (x - np.amin(x)) / (np.amax(x) - np.amin(x)),
+        NormMode.MINUS_ONE_ONE.value: lambda x: 2 * ((x - np.amin(x)) / (np.amax(x) - np.amin(x))) - 1,
+        NormMode.SUM_ABS.value: lambda x: x / np.abs(x).sum(),
+        NormMode.SUM.value: lambda x: x / x.sum(),
+        NormMode.EUCLIDEAN.value: lambda x: x / np.sqrt((x**2).sum()),
+        NormMode.MEAN_STD.value: lambda x: (x - x.mean()) / x.std(),
+        NormMode.MAX.value: lambda x: x / x.max()
     }
-    if mode not in normalization_methods:
+    if mode not in normalization_methods.keys():
         raise ValueError(f"Unsupported normalization mode: {mode}")
-
     return normalization_methods[mode](array)
 
-
 NORM_NODE_SHELF = Shelf(
     nodes=[_norm],
     subshelves=[],

{funcnodes_span-0.1.1 → funcnodes_span-0.1.2}/funcnodes_span/smoothing.py

@@ -18,7 +18,7 @@ class SmoothMode(Enum):
     @classmethod
     def default(cls) -> 'SmoothMode':
         """Returns the default smoothing mode."""
-        return cls.SAVITZKY_GOLAY
+        return cls.SAVITZKY_GOLAY.value
 
 @NodeDecorator("span.basics.smooth", name="Smoothing")
 
@@ -37,7 +37,8 @@ def _smooth(array: np.ndarray, mode: SmoothMode = SmoothMode.default(), window:
     # Raises:
     #     ValueError: If an unsupported smoothing mode is provided.
     # """
-    
+    if isinstance(mode, SmoothMode):
+        mode = mode.value
     def smooth_savgol(x: np.ndarray) -> np.ndarray:
         return savgol_filter(x, window, 2)
     
@@ -68,14 +69,14 @@ def _smooth(array: np.ndarray, mode: SmoothMode = SmoothMode.default(), window:
         return medfilt(x, window)
     
     smoothing_methods = {
-        SmoothMode.SAVITZKY_GOLAY: smooth_savgol,
-        SmoothMode.GAUSSIAN: smooth_gaussian,
-        SmoothMode.MOVING_AVERAGE: smooth_ma,
-        SmoothMode.EXPONENTIAL_MOVING_AVERAGE: smooth_ema,
-        SmoothMode.MEDIAN: smooth_median
+        SmoothMode.SAVITZKY_GOLAY.value: smooth_savgol,
+        SmoothMode.GAUSSIAN.value: smooth_gaussian,
+        SmoothMode.MOVING_AVERAGE.value: smooth_ma,
+        SmoothMode.EXPONENTIAL_MOVING_AVERAGE.value: smooth_ema,
+        SmoothMode.MEDIAN.value: smooth_median
     }
     
-    if mode not in smoothing_methods:
+    if mode not in smoothing_methods.keys():
         raise ValueError(f"Unsupported smoothing mode: {mode}")
     
     return smoothing_methods[mode](array)

{funcnodes_span-0.1.1 → funcnodes_span-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "funcnodes-span"
-version = "0.1.1"
+version = "0.1.2"
 description = ""
 authors = ["Kourosh Rezaei <kouroshrezaei90@gmail.com>"]
 readme = "README.md"