Merge pull request #706 from analysiscenter/normalizer_update

Move inplace parameter

Author: SergeyTsimfer

batchflow/plotter/plot.py

@@ -195,7 +195,7 @@ def update(self, data):
             data = self.preprocess(data)
             self.main_object.set_data(data)
 
-            vmin, vmax = self._parse_v_ranges(data)
+            vmin, vmax = self._parse_vrange(data)
             self.main_object.set_clim([vmin, vmax])
 
         if self.mode == 'histogram':
@@ -255,7 +255,7 @@ def image(self, data):
         image_keys = ['alpha', 'vmin', 'vmax', 'extent']
         image_config = self.config.filter(keys=image_keys, prefix='image_')
 
-        vmin, vmax = self._parse_v_ranges(data)
+        vmin, vmax = self._parse_vrange(data)
         image_config['vmin'] = vmin
         image_config['vmax'] = vmax
 
@@ -268,7 +268,7 @@ def matrix(self, data):
         matrix_keys = ['cmap', 'vmin', 'vmax']
         matrix_config = self.config.filter(keys=matrix_keys, prefix='matrix_')
 
-        vmin, vmax = self._parse_v_ranges(data)
+        vmin, vmax = self._parse_vrange(data)
         matrix_config['vmin'] = vmin
         matrix_config['vmax'] = vmax
 

batchflow/utils_transforms.py

@@ -20,19 +20,17 @@ class Normalizer:
     normalization_stats : dict, optional
         If provided, then used to get statistics for normalization.
         Otherwise, compute them from a given array.
-    inplace : bool
-        Whether to apply operation inplace or return a new array.
     """
 
     def __init__(self, mode='meanstd', clip_to_quantiles=False, q=(0.01, 0.99),
-                 normalization_stats=None, inplace=False):
+                 normalization_stats=None):
         self.mode = mode
         self.clip_to_quantiles = clip_to_quantiles
         self.q = q
         self.normalization_stats = normalization_stats
-        self.inplace = inplace
 
-    def normalize(self, array, normalization_stats=None, mode=None, return_stats=False):
+    def normalize(self, array, normalization_stats=None, mode=None, return_stats=False, inplace=False,
+                  clip_to_quantiles=None):
         """ Normalize image with provided stats.
 
         Parameters
@@ -45,14 +43,16 @@ def normalize(self, array, normalization_stats=None, mode=None, return_stats=Fal
             If self.normalization_stats is also None, then statistics will by computed by array.
         return_stats : bool, optional
             Whether to return stats used for normalization, by default False
+        inplace : bool
+            Whether to apply operation inplace or return a new array.
 
         Returns
         -------
         numpy.ndarray or (numpy.ndarray, dict)
         """
-        clip_to_quantiles = self.clip_to_quantiles
+        clip_to_quantiles = self.clip_to_quantiles if clip_to_quantiles is None else clip_to_quantiles
         mode = self.mode if mode is None else mode
-        array = array if self.inplace else array.copy()
+        array = array if inplace else array.copy()
 
         normalization_stats = normalization_stats if normalization_stats is not None else self.normalization_stats
 
@@ -101,7 +101,7 @@ def normalize(self, array, normalization_stats=None, mode=None, return_stats=Fal
 
     __call__ = normalize
 
-    def denormalize(self, array, normalization_stats=None, mode=None):
+    def denormalize(self, array, normalization_stats=None, mode=None, inplace=False):
         """ Denormalize image with provided stats.
 
         Parameters
@@ -118,7 +118,7 @@ def denormalize(self, array, normalization_stats=None, mode=None):
         -------
         numpy.ndarray or (numpy.ndarray, dict)
         """
-        array = array if self.inplace else array.copy()
+        array = array if inplace else array.copy()
         mode = self.mode if mode is None else mode
 
         if self.normalization_stats is not None: