From 7c0c52d6f424b0c79a16b3817c15e998aff2066a Mon Sep 17 00:00:00 2001 From: Karamaz0V1 Date: Tue, 16 Jun 2020 22:26:23 +0200 Subject: [PATCH] Fix name of features for single AP --- minigrida/descriptors/aps.py | 6 +++--- minigrida/descriptors/sdaps.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/minigrida/descriptors/aps.py b/minigrida/descriptors/aps.py index 8d7d94b..5be71b3 100644 --- a/minigrida/descriptors/aps.py +++ b/minigrida/descriptors/aps.py @@ -36,10 +36,10 @@ def run(gt, rasters, coords, remove, pool.join() eap = sap.concatenate(eap) - Xn = [' '.join((a['tree']['image_name'], - a['attribute'], + Xn = [' '.join((a.description['tree']['image_name'], + a.description['attribute'], *[str(v) for v in p.values()])) - for a in eap.description for p in a['profiles']] if not Xn else Xn + for a in eap for p in a.description['profiles']] if not Xn else Xn # Create vectors X_raw = np.moveaxis(np.array(list(eap.vectorize())), 0, -1).astype(dtype) diff --git a/minigrida/descriptors/sdaps.py b/minigrida/descriptors/sdaps.py index 28d0893..d43ca69 100644 --- a/minigrida/descriptors/sdaps.py +++ b/minigrida/descriptors/sdaps.py @@ -36,10 +36,10 @@ def run(gt, rasters, coords, remove, pool.join() eap = sap.concatenate(eap) - Xn = [' '.join((a['tree']['image_name'], - a['attribute'], + Xn = [' '.join((a.description['tree']['image_name'], + a.description['attribute'], *[str(v) for v in p.values()])) - for a in eap.description for p in a['profiles']] if not Xn else Xn + for a in eap for p in a.description['profiles']] if not Xn else Xn # Create vectors X_raw = np.moveaxis(np.array(list(eap.vectorize())), 0, -1).astype(dtype)