imicpe 1.0.12__py3-none-any.whl → 1.0.14__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. imicpe/_version.py +1 -1
  2. imicpe/optim/metrics.py +2 -2
  3. imicpe/optim/operators.py +6 -6
  4. {imicpe-1.0.12.dist-info → imicpe-1.0.14.dist-info}/METADATA +1 -1
  5. {imicpe-1.0.12.dist-info → imicpe-1.0.14.dist-info}/RECORD +8 -8
  6. {imicpe-1.0.12.dist-info → imicpe-1.0.14.dist-info}/WHEEL +0 -0
  7. {imicpe-1.0.12.dist-info → imicpe-1.0.14.dist-info}/licenses/LICENSE +0 -0
  8. {imicpe-1.0.12.dist-info → imicpe-1.0.14.dist-info}/top_level.txt +0 -0
imicpe/_version.py CHANGED
@@ -1 +1 @@
1
- __version__="1.0.12"
1
+ __version__="1.0.14"
imicpe/optim/metrics.py CHANGED
@@ -1,6 +1,6 @@
1
1
  import numpy as np
2
2
  import torch
3
- from skimage.metrics import structural_similarity as ssim
3
+ from skimage.metrics import structural_similarity
4
4
 
5
5
  def mse(I,ref):
6
6
  """ Calcule la MSE
@@ -59,5 +59,5 @@ def ssim(I,ref):
59
59
  Valeur de SSIM
60
60
  """
61
61
 
62
- return np.round(ssim(ref, I, data_range=ref.max() - ref.min()),3)
62
+ return np.round(structural_similarity(ref, I, data_range=ref.max() - ref.min()),3)
63
63
 
imicpe/optim/operators.py CHANGED
@@ -95,12 +95,12 @@ def L(x):
95
95
  """
96
96
 
97
97
  if x.ndim == 1:
98
- ker = np.array([1, -2, 1])
98
+ ker = np.array([1, -2, 1])/4
99
99
  #lap = np.convolve(x,ker,'same')
100
100
  lap = ndimage.convolve1d(x,ker,mode='nearest')
101
101
  elif x.ndim == 2:
102
- ker = np.array([[0, 1, 0], [1, -4, 1], [0, 1, 0]]) # V4
103
- #ker = np.array([[1, 1, 1], [1, -8, 1], [1, 1, 1]]) # V8
102
+ ker = np.array([[0, 1, 0], [1, -4, 1], [0, 1, 0]])/8 # V4
103
+ #ker = np.array([[1, 1, 1], [1, -8, 1], [1, 1, 1]])/16 # V8
104
104
  lap = ndimage.convolve(x,ker,mode='nearest')
105
105
  return lap
106
106
 
@@ -120,12 +120,12 @@ def Lt(x):
120
120
  """
121
121
 
122
122
  if x.ndim == 1:
123
- ker = np.array([1, -2, 1])
123
+ ker = np.array([1, -2, 1])/4
124
124
  #lap = np.correlate(x,ker,'same')
125
125
  lap = ndimage.correlate1d(x,ker,mode='nearest')
126
126
  elif x.ndim == 2:
127
- ker = np.array([[0, 1, 0], [1, -4, 1], [0, 1, 0]]) # V4
128
- #ker = np.array([[1, 1, 1], [1, -8, 1], [1, 1, 1]]) # V8
127
+ ker = np.array([[0, 1, 0], [1, -4, 1], [0, 1, 0]])/8 # V4
128
+ #ker = np.array([[1, 1, 1], [1, -8, 1], [1, 1, 1]])/16 # V8
129
129
  lap = ndimage.correlate(x,ker,mode='nearest')
130
130
  return lap
131
131
 
{imicpe-1.0.12.dist-info → imicpe-1.0.14.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: imicpe
3
- Version: 1.0.12
3
+ Version: 1.0.14
4
4
  Summary: Toolbox for Maths,Signal,Image Teaching @ CPE
5
5
  Author-email: Marion Foare <marion.foare@cpe.fr>, Eric Van Reeth <eric.vanreeth@cpe.fr>, Arthur Gautheron <arthur.gautheron@cpe.fr>
6
6
  License: MIT License
{imicpe-1.0.12.dist-info → imicpe-1.0.14.dist-info}/RECORD RENAMED
@@ -1,5 +1,5 @@
1
1
  imicpe/__init__.py,sha256=WjDmvecyDIyJLYp4rCV9vsSYbQDc4L1EpYqORvEXliI,33
2
- imicpe/_version.py,sha256=3chbJVcAqS6Mdt5Y3Nw6RT_gpHGvY8uMaRq8iKyb_RU,21
2
+ imicpe/_version.py,sha256=rlELONxm3enigypcbhPhzPZPd2NpkMyTCrpKersmLQ0,21
3
3
  imicpe/cs/__init__.py,sha256=fLe1o5jNvrB4qEVBE6amEV9i3NFwM3E_uGiiiHXrph0,339
4
4
  imicpe/cs/l1.py,sha256=5bTNM8JG8J8srTamh-gl3ShhFoJjqCvVwlteN_M6Uak,3236
5
5
  imicpe/cs/masks.py,sha256=5ehQ-QnYY4trBt7BIx0Pp8DUa3x5KApkc7TPp9LA9Pc,2030
@@ -8,8 +8,8 @@ imicpe/cs/operators.py,sha256=pTA8gu_17yoBD4Hs7Cvg0PWUX4xrcMr6DJxyNYX9yBA,9028
8
8
  imicpe/cs/shepp_logan_phantom.py,sha256=_RDHimZI6R8uyAwXNyB3BldYjCiNDRorDmPYoJR0T6Q,485
9
9
  imicpe/cs/tikhonov.py,sha256=NokBVdMsErWrf4pHZ3jWFwyRVaP7Z9z4qqujuisjyF4,2488
10
10
  imicpe/optim/__init__.py,sha256=t8M8iIS0Q3bZMxG4rblM1xPFJBuVZKOhZPGdjQHx7Do,366
11
- imicpe/optim/metrics.py,sha256=3IzMEeW-5j8T5CL0BUg-L3KbaQ0iGclMsYl43UgaBQw,1348
12
- imicpe/optim/operators.py,sha256=xrV0AUQ2PyntguuIcnmL4cVultqMn4c9gsbl5oMO_Qs,12573
11
+ imicpe/optim/metrics.py,sha256=zyf2rsz3SVGIFRvt2iE-Z9cemjhz5TBoZxaAPIxvUoE,1357
12
+ imicpe/optim/operators.py,sha256=dZEoDBfcvdCSOcxvNxlCUHFJ_VjM8Q5GcP_mcEhUsvw,12587
13
13
  imicpe/optim/pnnDataset.py,sha256=PFh5u0SXx761O6N6vVfWfEDmzmCm87eYzAL7mWHBRrw,3971
14
14
  imicpe/optim/pnnTrainer.py,sha256=3ygh9XwFJN7jMPsEG3LHLa8sgBbDd9Yu_QWg4ZtM_DM,4571
15
15
  imicpe/optim/pnnUtils.py,sha256=9ImcZboIXWEzMC2_16BgzEImD9SqtjfU_xlDmPr2mMk,1600
@@ -18,8 +18,8 @@ imicpe/reco3D/angles.py,sha256=lv9I0_YBJTCWoesu7dHuAFHqRpY6gmlj9CmDskAri4E,3448
18
18
  imicpe/reco3D/calculPose.py,sha256=QHqBESjWa6JpTQycRSGOZEu6BWRfFF5o7O96IsPPruw,9262
19
19
  imicpe/reco3D/evalTrajecto.py,sha256=ICdXBlDBJmLC6uFPvFFd5qmWm2F7STx7i-bD1w4RB-w,6770
20
20
  imicpe/reco3D/vue3D.py,sha256=_5upl5rJ-LYRbk4Dk2G6qZYnmPvKLaJYgL3wnU3it6o,7525
21
- imicpe-1.0.12.dist-info/licenses/LICENSE,sha256=ACwmltkrXIz5VsEQcrqljq-fat6ZXAMepjXGoe40KtE,1069
22
- imicpe-1.0.12.dist-info/METADATA,sha256=5locM3xm8SZUbBtCLAe2nYBRtNeWH6MSlGjxibpCUsI,1340
23
- imicpe-1.0.12.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
24
- imicpe-1.0.12.dist-info/top_level.txt,sha256=6_gSXCYolzjXHaIDeAsZ_M3nLXdqrMKt48XCz3reJc0,7
25
- imicpe-1.0.12.dist-info/RECORD,,
21
+ imicpe-1.0.14.dist-info/licenses/LICENSE,sha256=ACwmltkrXIz5VsEQcrqljq-fat6ZXAMepjXGoe40KtE,1069
22
+ imicpe-1.0.14.dist-info/METADATA,sha256=OJn4ZD17GWueFJwixYTkLb4DBgnGMCpXsXWvio1nwJU,1340
23
+ imicpe-1.0.14.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
24
+ imicpe-1.0.14.dist-info/top_level.txt,sha256=6_gSXCYolzjXHaIDeAsZ_M3nLXdqrMKt48XCz3reJc0,7
25
+ imicpe-1.0.14.dist-info/RECORD,,