imicpe 1.0.4__py3-none-any.whl → 1.0.6__py3-none-any.whl

imicpe/_version.py

@@ -1 +1 @@
-__version__="1.0.4"
+__version__="1.0.6"

imicpe/optim/__init__.py

@@ -1,5 +1,5 @@
 from .metrics import mse, snr
-from .operators import Id, D, Dt, L, Lt, generatePSF, A, At, S, St, opNorm, matNorm
+from .operators import Id, D, Dt, L, Lt, generateDiff3D, generatePSF, A, At, S, St, opNorm, matNorm
 from .pnnDataset import BSDSDataset, NoisyDataset
 from .pnnTrainer import Trainer, Metrics
 from .pnnUtils import chooseDevice, torchImg2Numpy, getData

imicpe/optim/operators.py

@@ -1,6 +1,7 @@
 import numpy as np
 from scipy import ndimage
 #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.4.dist-info → imicpe-1.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imicpe
-Version: 1.0.4
+Version: 1.0.6
 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.4.dist-info → imicpe-1.0.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 imicpe/__init__.py,sha256=WjDmvecyDIyJLYp4rCV9vsSYbQDc4L1EpYqORvEXliI,33
-imicpe/_version.py,sha256=_Mzv05Nk6f7wR8F5KqE69kN9PfdC4uxj5YvG98nbUcs,20
+imicpe/_version.py,sha256=pINtsbN0HBnfwDigU9BkYOfkTQAdnUydSLeEcyBcXBs,20
 imicpe/cs/__init__.py,sha256=fLe1o5jNvrB4qEVBE6amEV9i3NFwM3E_uGiiiHXrph0,339
 imicpe/cs/l1.py,sha256=5bTNM8JG8J8srTamh-gl3ShhFoJjqCvVwlteN_M6Uak,3236
 imicpe/cs/masks.py,sha256=5ehQ-QnYY4trBt7BIx0Pp8DUa3x5KApkc7TPp9LA9Pc,2030
@@ -7,14 +7,14 @@ imicpe/cs/metrics.py,sha256=DuUYpW7s1LkZTDV32D5K4wdSRXpH1Ymunjp2vq6kzfA,148
 imicpe/cs/operators.py,sha256=pTA8gu_17yoBD4Hs7Cvg0PWUX4xrcMr6DJxyNYX9yBA,9028
 imicpe/cs/shepp_logan_phantom.py,sha256=_RDHimZI6R8uyAwXNyB3BldYjCiNDRorDmPYoJR0T6Q,485
 imicpe/cs/tikhonov.py,sha256=NokBVdMsErWrf4pHZ3jWFwyRVaP7Z9z4qqujuisjyF4,2488
-imicpe/optim/__init__.py,sha256=rkguPFq7gdmBgm_Xrry2yr1oquEIxE00On2emjRMgZE,344
+imicpe/optim/__init__.py,sha256=m3A1xTbMnHMqOx8EFWi71BRyVmlCdVL4qtNYWct0rjQ,360
 imicpe/optim/metrics.py,sha256=lcXT5gLtIdGARr5Lq1fWvVQNyqkKgy8BQsV4cHmbnvM,187
-imicpe/optim/operators.py,sha256=qEvFqgmg5uDkdd0MU2bAxIq8Erg6BZsdtnHn0SwXASY,10642
+imicpe/optim/operators.py,sha256=eSiY9X6ZI3dWsMjkWkR3rsi06yfpNHpHFWTVPaNqeWg,12589
 imicpe/optim/pnnDataset.py,sha256=PFh5u0SXx761O6N6vVfWfEDmzmCm87eYzAL7mWHBRrw,3971
 imicpe/optim/pnnTrainer.py,sha256=3ygh9XwFJN7jMPsEG3LHLa8sgBbDd9Yu_QWg4ZtM_DM,4571
 imicpe/optim/pnnUtils.py,sha256=LXU7wRfuEi6t-2VG2NStPAOzu19OKTxzNNnbHESpC2U,1523
-imicpe-1.0.4.dist-info/licenses/LICENSE,sha256=ACwmltkrXIz5VsEQcrqljq-fat6ZXAMepjXGoe40KtE,1069
-imicpe-1.0.4.dist-info/METADATA,sha256=R49h9z7HFp_ZVQF8HiVz68IaHysJFi0eXP-26oOk4Vk,1339
-imicpe-1.0.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-imicpe-1.0.4.dist-info/top_level.txt,sha256=6_gSXCYolzjXHaIDeAsZ_M3nLXdqrMKt48XCz3reJc0,7
-imicpe-1.0.4.dist-info/RECORD,,
+imicpe-1.0.6.dist-info/licenses/LICENSE,sha256=ACwmltkrXIz5VsEQcrqljq-fat6ZXAMepjXGoe40KtE,1069
+imicpe-1.0.6.dist-info/METADATA,sha256=WT7c8C1l6Z0k34bK5Pcm6gjJ5m4MQG2-sIfKSxXcN5M,1339
+imicpe-1.0.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+imicpe-1.0.6.dist-info/top_level.txt,sha256=6_gSXCYolzjXHaIDeAsZ_M3nLXdqrMKt48XCz3reJc0,7
+imicpe-1.0.6.dist-info/RECORD,,