imicpe 1.0.5__tar.gz → 1.0.7__tar.gz

{imicpe-1.0.5 → imicpe-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imicpe
-Version: 1.0.5
+Version: 1.0.7
 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.5 → imicpe-1.0.7}/pyproject.toml

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

imicpe-1.0.7/src/imicpe/_version.py

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

{imicpe-1.0.5 → imicpe-1.0.7}/src/imicpe/optim/operators.py

@@ -1,6 +1,7 @@
 import numpy as np
 from scipy import ndimage
-import igl
+#import igl
+import scipy.sparse as sp
 
 ############################################################
 ## identity operator
@@ -128,9 +129,63 @@ def generateDiff3D(vert, faces, dtype):
     """
     
     if dtype == 'gradient':
-        matG = igl.grad(vert, faces)
+        #matG = igl.grad(vert, faces)
+        n = vert.shape[0]
+        G = sp.lil_matrix((3 * len(faces), n))
+        for f_idx, tri in enumerate(faces):
+            i, j, k = tri
+            vi, vj, vk = vert[i], vert[j], vert[k]
+            # Normale du triangle
+            normal = np.cross(vj - vi, vk - vi)
+            area = np.linalg.norm(normal) / 2.0
+            normal /= np.linalg.norm(normal) if np.linalg.norm(normal) > 0 else 1
+            # Gradients barycentriques
+            G_f = np.zeros((3, 3))
+            G_f[:, 0] = np.cross(normal, vk - vj) / (2 * area)
+            G_f[:, 1] = np.cross(normal, vi - vk) / (2 * area)
+            G_f[:, 2] = np.cross(normal, vj - vi) / (2 * area)
+            # Assignation dans la matrice globale
+            for local_idx, global_idx in enumerate(tri):
+                G[3 * f_idx: 3 * f_idx + 3, global_idx] = G_f[:, local_idx]
+                
+        matG = G.tocsc()
+        
     elif dtype == 'laplacien':    
-        matG = igl.cotmatrix(vert, faces)
+        #matG = igl.cotmatrix(vert, faces)
+        n = vert.shape[0]
+        L = sp.lil_matrix((n, n))
+    
+        for tri in faces:
+            i, j, k = tri
+            vi, vj, vk = vert[i], vert[j], vert[k]
+        
+            # Calcul des arêtes
+            e0 = vj - vk
+            e1 = vk - vi
+            e2 = vi - vj
+        
+            # Longueurs des arêtes
+            l0 = np.linalg.norm(e0)
+            l1 = np.linalg.norm(e1)
+            l2 = np.linalg.norm(e2)
+        
+            # Calcul des angles via le produit scalaire
+            cot0 = np.dot(-e1, e2) / (l1 * l2)
+            cot1 = np.dot(-e2, e0) / (l2 * l0)
+            cot2 = np.dot(-e0, e1) / (l0 * l1)
+        
+            # Construction de la matrice du Laplacien
+            L[i, j] += cot2
+            L[j, i] += cot2
+            L[j, k] += cot0
+            L[k, j] += cot0
+            L[k, i] += cot1
+            L[i, k] += cot1
+            L[i, i] -= (cot1 + cot2)
+            L[j, j] -= (cot0 + cot2)
+            L[k, k] -= (cot0 + cot1)
+    
+        matG = L.tocsc()
     
     return (matG/np.amax(matG)).toarray()
 

{imicpe-1.0.5 → imicpe-1.0.7}/src/imicpe/optim/pnnUtils.py

@@ -38,7 +38,10 @@ def torchImg2Numpy(image):
     if image.shape[-1] == 1:
         image = image[..., 0]
 
-    return image.numpy()
+    np_img = image.numpy()
+
+    return (np_img-np.min(np_img)) / (np.max(np_img)-np.min(np_img))
+    
 
 
 def getData(trainer, mode):

{imicpe-1.0.5 → imicpe-1.0.7}/src/imicpe.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imicpe
-Version: 1.0.5
+Version: 1.0.7
 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.5/src/imicpe/_version.py

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