imicpe 1.0.12__tar.gz → 1.0.14__tar.gz

{imicpe-1.0.12 → imicpe-1.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imicpe
-Version: 1.0.12
+Version: 1.0.14
 Summary: Toolbox for Maths,Signal,Image Teaching @ CPE
 Author-email: Marion Foare <marion.foare@cpe.fr>, Eric Van Reeth <eric.vanreeth@cpe.fr>, Arthur Gautheron <arthur.gautheron@cpe.fr>
 License: MIT License

{imicpe-1.0.12 → imicpe-1.0.14}/pyproject.toml

@@ -14,7 +14,7 @@ mypkg = ["*.txt", "*.mat", "*.npy"]
 #[tool.setuptools_scm]
 
 [project]
-version="1.0.12"
+version="1.0.14"
 name = "imicpe"
 authors = [
   { name="Marion Foare", email="marion.foare@cpe.fr" },

imicpe-1.0.14/src/imicpe/_version.py

@@ -0,0 +1 @@
+__version__="1.0.14"

{imicpe-1.0.12 → imicpe-1.0.14}/src/imicpe/optim/metrics.py

@@ -1,6 +1,6 @@
 import numpy as np
 import torch
-from skimage.metrics import structural_similarity as ssim
+from skimage.metrics import structural_similarity
 
 def mse(I,ref):
     """ Calcule la MSE
@@ -59,5 +59,5 @@ def ssim(I,ref):
         Valeur de SSIM
     """
 
-    return np.round(ssim(ref, I, data_range=ref.max() - ref.min()),3)
+    return np.round(structural_similarity(ref, I, data_range=ref.max() - ref.min()),3)
 

{imicpe-1.0.12 → imicpe-1.0.14}/src/imicpe/optim/operators.py

@@ -95,12 +95,12 @@ def L(x):
     """
     
     if x.ndim == 1:
-        ker = np.array([1, -2, 1])
+        ker = np.array([1, -2, 1])/4
         #lap = np.convolve(x,ker,'same')
         lap = ndimage.convolve1d(x,ker,mode='nearest')
     elif x.ndim == 2:
-        ker = np.array([[0, 1, 0], [1, -4, 1], [0, 1, 0]])    # V4
-        #ker = np.array([[1, 1, 1], [1, -8, 1], [1, 1, 1]])    # V8
+        ker = np.array([[0, 1, 0], [1, -4, 1], [0, 1, 0]])/8    # V4
+        #ker = np.array([[1, 1, 1], [1, -8, 1], [1, 1, 1]])/16    # V8
         lap = ndimage.convolve(x,ker,mode='nearest')
     return lap
 
@@ -120,12 +120,12 @@ def Lt(x):
     """
     
     if x.ndim == 1:
-        ker = np.array([1, -2, 1])
+        ker = np.array([1, -2, 1])/4
         #lap = np.correlate(x,ker,'same')
         lap = ndimage.correlate1d(x,ker,mode='nearest')
     elif x.ndim == 2:
-        ker = np.array([[0, 1, 0], [1, -4, 1], [0, 1, 0]])    # V4
-        #ker = np.array([[1, 1, 1], [1, -8, 1], [1, 1, 1]])    # V8
+        ker = np.array([[0, 1, 0], [1, -4, 1], [0, 1, 0]])/8    # V4
+        #ker = np.array([[1, 1, 1], [1, -8, 1], [1, 1, 1]])/16    # V8
         lap = ndimage.correlate(x,ker,mode='nearest')
     return lap
 

{imicpe-1.0.12 → imicpe-1.0.14}/src/imicpe.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imicpe
-Version: 1.0.12
+Version: 1.0.14
 Summary: Toolbox for Maths,Signal,Image Teaching @ CPE
 Author-email: Marion Foare <marion.foare@cpe.fr>, Eric Van Reeth <eric.vanreeth@cpe.fr>, Arthur Gautheron <arthur.gautheron@cpe.fr>
 License: MIT License

imicpe-1.0.12/src/imicpe/_version.py

@@ -1 +0,0 @@
-__version__="1.0.12"