Change raster loader to not flatten patches; change flattened pixel v…

…alue extractor to scale based on min max #58
nasaharvest · Oct 17, 2021 · ae0e2b0 · ae0e2b0
1 parent 0b659a2
commit ae0e2b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/dora_exp_pipeline/dora_data_loader.py b/dora_exp_pipeline/dora_data_loader.py
@@ -230,7 +230,7 @@ def _load(self, dir_path: str, patch_size: int, stride: int = 1,
                             # append the patch coordinate as the id
                             data_dict['id'].append('%d-%d' % (i, j))
                             # append the patch data
-                            data_dict['data'].append(patch.flatten())
+                            data_dict['data'].append(patch)
                             j += stride
                     i += stride
         else:

diff --git a/dora_exp_pipeline/dora_feature.py b/dora_exp_pipeline/dora_feature.py
@@ -133,7 +133,10 @@ def extract(self, data_cube, **kwargs):
                 ret_features[ind, :] = data.flatten()
 
         if kwargs.get('normalize_pixels'):
-            ret_features = ret_features / 255.
+            min_val = np.min(ret_features)
+            max_val = np.max(ret_features)
+            scaled = np.subtract(ret_features, min_val) / (max_val - min_val)
+            ret_features = scaled
 
         return ret_features