From 7bff8e20d212d73eccaaf98a83b090277c04414f Mon Sep 17 00:00:00 2001 From: Karamaz0V1 Date: Sat, 30 May 2020 11:06:20 +0200 Subject: [PATCH] Add coords in pipeline --- minigrida/descriptors/pixel.py | 6 +++--- minigrida/loader/coord_tiles.py | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/minigrida/descriptors/pixel.py b/minigrida/descriptors/pixel.py index cf329fa..ff37bef 100644 --- a/minigrida/descriptors/pixel.py +++ b/minigrida/descriptors/pixel.py @@ -11,12 +11,12 @@ doc. import numpy as np -def run(gt, rasters, remove=None): +def run(gt, rasters, coords, remove=None): X = [] y = [] groups = [] - for i, (gti, rastersi) in enumerate(zip(gt, rasters)): + for i, (gti, rastersi, coordsi) in enumerate(zip(gt, rasters, coords)): # Create vectors X_raw = np.moveaxis(np.array(list(rastersi.values())), 0, -1) y_raw = gti @@ -28,7 +28,7 @@ def run(gt, rasters, remove=None): X += [X_raw[lbl]] y += [y_raw[lbl]] - groups += [np.repeat(i, lbl.sum())] + groups += [np.repeat(coordsi, lbl.sum())] X = np.concatenate(X) y = np.concatenate(y) diff --git a/minigrida/loader/coord_tiles.py b/minigrida/loader/coord_tiles.py index dfcdb8c..df83394 100644 --- a/minigrida/loader/coord_tiles.py +++ b/minigrida/loader/coord_tiles.py @@ -9,8 +9,8 @@ doc. """ from pathlib import Path -import rasterio as rio import logging +import rasterio as rio log = logging.getLogger(__name__) @@ -21,6 +21,7 @@ def run(rasters_path, rasters_name, gt_suffix='gt.tif'): gt = [] rasters = [] + coords = [] for gtn in gt_names: gt += [load_tif(gtn)] @@ -29,7 +30,9 @@ def run(rasters_path, rasters_name, gt_suffix='gt.tif'): load_tif(gtn.as_posix().replace(gt_suffix, '') + n) for n in rasters_name}] - return gt, rasters + coords += ['_'.join(gtn.stem.split('_')[:2])] + + return gt, rasters, coords def load_tif(path):