Parcourir la source

normalization issues fixed using epsilon

Jérôme BUISINE il y a 4 ans
Parent
commit
e4dacec166
41 fichiers modifiés avec 85 ajouts et 91 suppressions
  1. BIN
      docs/build/doctrees/environment.pickle
  2. 1 1
      docs/build/html/.buildinfo
  3. 2 2
      docs/build/html/_modules/index.html
  4. 2 2
      docs/build/html/_modules/ipfml/exceptions.html
  5. 2 2
      docs/build/html/_modules/ipfml/filters/convolution.html
  6. 3 2
      docs/build/html/_modules/ipfml/filters/kernels.html
  7. 2 2
      docs/build/html/_modules/ipfml/filters/noise.html
  8. 2 2
      docs/build/html/_modules/ipfml/iqa/fr.html
  9. 2 2
      docs/build/html/_modules/ipfml/metrics.html
  10. 2 2
      docs/build/html/_modules/ipfml/processing/compression.html
  11. 2 2
      docs/build/html/_modules/ipfml/processing/movement.html
  12. 2 2
      docs/build/html/_modules/ipfml/processing/reconstruction.html
  13. 2 2
      docs/build/html/_modules/ipfml/processing/segmentation.html
  14. 2 2
      docs/build/html/_modules/ipfml/processing/transform.html
  15. 8 12
      docs/build/html/_modules/ipfml/utils.html
  16. 1 1
      docs/build/html/_static/documentation_options.js
  17. 2 2
      docs/build/html/contributing.html
  18. 2 2
      docs/build/html/description.html
  19. 2 2
      docs/build/html/examples.html
  20. 2 2
      docs/build/html/genindex.html
  21. 2 2
      docs/build/html/index.html
  22. 2 2
      docs/build/html/ipfml.html
  23. 2 2
      docs/build/html/ipfml/ipfml.exceptions.html
  24. 2 2
      docs/build/html/ipfml/ipfml.filters.convolution.html
  25. 2 2
      docs/build/html/ipfml/ipfml.filters.kernels.html
  26. 2 2
      docs/build/html/ipfml/ipfml.filters.noise.html
  27. 2 2
      docs/build/html/ipfml/ipfml.iqa.fr.html
  28. 2 2
      docs/build/html/ipfml/ipfml.metrics.html
  29. 2 2
      docs/build/html/ipfml/ipfml.processing.compression.html
  30. 2 2
      docs/build/html/ipfml/ipfml.processing.movement.html
  31. 2 2
      docs/build/html/ipfml/ipfml.processing.reconstruction.html
  32. 2 2
      docs/build/html/ipfml/ipfml.processing.segmentation.html
  33. 2 2
      docs/build/html/ipfml/ipfml.processing.transform.html
  34. 2 2
      docs/build/html/ipfml/ipfml.utils.html
  35. BIN
      docs/build/html/objects.inv
  36. 2 2
      docs/build/html/py-modindex.html
  37. 2 2
      docs/build/html/search.html
  38. 2 2
      docs/source/conf.py
  39. 1 0
      ipfml/filters/kernels.py
  40. 6 10
      ipfml/utils.py
  41. 1 1
      setup.py

BIN
docs/build/doctrees/environment.pickle


+ 1 - 1
docs/build/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 37aa5d24da7c15a63553a5371e611c5e
+config: d19508e4af4ac33ff612fcffa601719d
 tags: 645f666f9bcd5a90fca523b33c5a78b7

+ 2 - 2
docs/build/html/_modules/index.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Overview: module code &mdash; ipfml v0.4.4 documentation</title>
+  <title>Overview: module code &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/_modules/ipfml/exceptions.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.exceptions &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.exceptions &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/_modules/ipfml/filters/convolution.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.filters.convolution &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.filters.convolution &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 3 - 2
docs/build/html/_modules/ipfml/filters/kernels.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.filters.kernels &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.filters.kernels &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           
@@ -155,6 +155,7 @@
 
 <span class="c1"># main imports</span>
 <span class="kn">import</span> <span class="nn">numpy</span> <span class="k">as</span> <span class="nn">np</span>
+<span class="kn">import</span> <span class="nn">sys</span>
 
 
 <div class="viewcode-block" id="plane_mean"><a class="viewcode-back" href="../../../ipfml/ipfml.filters.kernels.html#ipfml.filters.kernels.plane_mean">[docs]</a><span class="k">def</span> <span class="nf">plane_mean</span><span class="p">(</span><span class="n">window</span><span class="p">):</span>

+ 2 - 2
docs/build/html/_modules/ipfml/filters/noise.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.filters.noise &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.filters.noise &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/_modules/ipfml/iqa/fr.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.iqa.fr &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.iqa.fr &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/_modules/ipfml/metrics.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.metrics &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.metrics &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/_modules/ipfml/processing/compression.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.processing.compression &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.processing.compression &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/_modules/ipfml/processing/movement.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.processing.movement &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.processing.movement &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/_modules/ipfml/processing/reconstruction.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.processing.reconstruction &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.processing.reconstruction &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/_modules/ipfml/processing/segmentation.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.processing.segmentation &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.processing.segmentation &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/_modules/ipfml/processing/transform.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.processing.transform &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.processing.transform &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 12
docs/build/html/_modules/ipfml/utils.html


+ 1 - 1
docs/build/html/_static/documentation_options.js

@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: 'v0.4.4',
+    VERSION: 'v0.4.5',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     FILE_SUFFIX: '.html',

+ 2 - 2
docs/build/html/contributing.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Contributing &mdash; ipfml v0.4.4 documentation</title>
+  <title>Contributing &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -57,7 +57,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/description.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Description &mdash; ipfml v0.4.4 documentation</title>
+  <title>Description &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/examples.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Examples &mdash; ipfml v0.4.4 documentation</title>
+  <title>Examples &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/genindex.html

@@ -9,7 +9,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Index &mdash; ipfml v0.4.4 documentation</title>
+  <title>Index &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -57,7 +57,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/index.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Image Processing For Machine Learning &mdash; ipfml v0.4.4 documentation</title>
+  <title>Image Processing For Machine Learning &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -57,7 +57,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Documentation &mdash; ipfml v0.4.4 documentation</title>
+  <title>Documentation &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.exceptions.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.exceptions &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.exceptions &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.filters.convolution.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.filters.convolution &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.filters.convolution &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.filters.kernels.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.filters.kernels &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.filters.kernels &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.filters.noise.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.filters.noise &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.filters.noise &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.iqa.fr.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.iqa.fr &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.iqa.fr &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.metrics.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.metrics &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.metrics &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.processing.compression.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.processing.compression &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.processing.compression &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.processing.movement.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.processing.movement &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.processing.movement &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.processing.reconstruction.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.processing.reconstruction &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.processing.reconstruction &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.processing.segmentation.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.processing.segmentation &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.processing.segmentation &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.processing.transform.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.processing.transform &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.processing.transform &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/ipfml/ipfml.utils.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ipfml.utils &mdash; ipfml v0.4.4 documentation</title>
+  <title>ipfml.utils &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

BIN
docs/build/html/objects.inv


+ 2 - 2
docs/build/html/py-modindex.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Python Module Index &mdash; ipfml v0.4.4 documentation</title>
+  <title>Python Module Index &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -59,7 +59,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/build/html/search.html

@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Search &mdash; ipfml v0.4.4 documentation</title>
+  <title>Search &mdash; ipfml v0.4.5 documentation</title>
   
 
   
@@ -56,7 +56,7 @@
             
             
               <div class="version">
-                0.4.4
+                0.4.5
               </div>
             
           

+ 2 - 2
docs/source/conf.py

@@ -24,9 +24,9 @@ copyright = '2019, Jérôme BUISINE'
 author = 'Jérôme BUISINE'
 
 # The short X.Y version
-version = '0.4.4'
+version = '0.4.5'
 # The full version, including alpha/beta/rc tags
-release = 'v0.4.4'
+release = 'v0.4.5'
 
 
 # -- General configuration ---------------------------------------------------

+ 1 - 0
ipfml/filters/kernels.py

@@ -4,6 +4,7 @@ Kernel to apply on images using convolution
 
 # main imports
 import numpy as np
+import sys
 
 
 def plane_mean(window):

+ 6 - 10
ipfml/utils.py

@@ -35,11 +35,9 @@ def normalize_arr(arr):
     min_value = min(arr)
 
     for v in arr:
-        try:
-            output_arr.append((v - min_value) / (max_value - min_value))
-        except ZeroDivisionError:
-            output_arr.append((v - min_value) /
-                              (max_value - min_value + sys.float_info.epsilon))
+        # add of epsilon value in order to avoid Zero Division
+        output_arr.append(
+            (v - min_value) / (max_value - min_value + sys.float_info.epsilon))
 
     return output_arr
 
@@ -66,10 +64,8 @@ def normalize_arr_with_range(arr, min, max):
     output_arr = []
 
     for v in arr:
-        try:
-            output_arr.append((v - min) / (max - min))
-        except ZeroDivisionError:
-            output_arr.append((v - min) / (max - min + sys.float_info.epsilon))
+        # add of epsilon value in order to avoid Zero Division
+        output_arr.append((v - min) / (max - min + sys.float_info.epsilon))
 
     return output_arr
 
@@ -101,7 +97,7 @@ def normalize_2D_arr(arr):
 
     # normalize each row
     output_array = []
-    width, height = arr.shape
+    _, height = arr.shape
 
     for row_index in range(0, height):
         values = arr[row_index, :]

+ 1 - 1
setup.py

@@ -63,7 +63,7 @@ class BuildTestCommand(setuptools.command.build_py.build_py):
 
 setup(
     name='ipfml',
-    version='0.4.4',
+    version='0.4.5',
     description='Image Processing For Machine Learning',
     long_description=readme(),
     classifiers=[