florent/minigrida
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Attributes new in sdaps

Browse Source
This commit is contained in:
Florent Guiotte 2020-05-31 20:49:46 +02:00
parent 8eed99109b
commit 4cffb2fc73
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
minigrida/descriptors/aps.py
View File

@ -34,9 +34,9 @@ def run(gt, rasters, coords, remove, attributes, adjacency='4', filtering='direc
eap += [_attribute_profiles(raster, attribute, adjacency, name, filtering)]
eap = sap.concatenate(eap)
Xn = [' '.join((a['tree']['image_name'],
a['attribute'],
*[str(v) for v in p.values()]))
Xn = [' '.join((a['tree']['image_name'],
a['attribute'],
*[str(v) for v in p.values()]))
for a in eap.description for p in a['profiles']] if not Xn else Xn
# Create vectors

5
minigrida/descriptors/sdaps.py
View File

@ -28,9 +28,10 @@ def run(gt, rasters, coords, remove, attributes, adjacency='4', filtering='direc
for i, (gti, rastersi, coordsi) in enumerate(zip(gt, rasters, coords)):
# Compute EAP
attributes = [attributes] * len(rastersi) if isinstance(attributes, dict) else attributes
eap = []
for name, raster in rastersi.items():
eap += [_self_dual_attribute_profiles(raster, attributes, adjacency, name, filtering)]
for (name, raster), attribute in zip(rastersi.items(), attributes):
eap += [_self_dual_attribute_profiles(raster, attribute, adjacency, name, filtering)]
eap = sap.concatenate(eap)
Xn = [' '.join((a['tree']['image_name'],