fix: missing fragstats abbrevs for core (also use f-strings)

pylandstats/landscape.py

@@ -256,11 +256,15 @@ def __init__(
         "euclidean_nearest_neighbor",
     ]  # 'contiguity_index', 'proximity'
 
-    # iterate all patch metrics except "number_of_core_areas"
+    # iterate all patch metrics except "number_of_core_areas", and add
+    # "disjunct_core_area"
     _PATCH_METRICS = PATCH_METRICS.copy()
     _PATCH_METRICS.remove("number_of_core_areas")
+    _PATCH_METRICS.append("disjunct_core_area")
+    # we could define the list of suffixes as a class-constant but using it in settings
+    # would cause a singular import
     DISTR_METRICS = [
-        patch_metric + "_" + suffix
+        f"{patch_metric}_{suffix}"
         for patch_metric in _PATCH_METRICS
         for suffix in ["mn", "am", "md", "ra", "sd", "cv"]
     ]

pylandstats/settings.py

@@ -42,18 +42,23 @@
 }
 # add the class/landscape distribution statistics metrics to the fragstats abbreviation
 # dictionary
+
 for metric in [
     "area",
     "perimeter",
     "perimeter_area_ratio",
     "shape_index",
     "fractal_dimension",
+    "core_area",
+    "core_area_index",
     "euclidean_nearest_neighbor",
 ]:
     for suffix in ["mn", "am", "md", "ra", "sd", "cv"]:
-        fragstats_abbrev_dict["{}_{}".format(metric, suffix)] = "{}_{}".format(
-            fragstats_abbrev_dict[metric], suffix.upper()
-        )
+        fragstats_abbrev_dict[
+            f"{metric}_{suffix}"
+        ] = f"{fragstats_abbrev_dict[metric]}_{suffix.upper()}"
+for suffix in ["mn", "am", "md", "ra", "sd", "cv"]:
+    fragstats_abbrev_dict[f"disjunct_core_area_{suffix}"] = f"DCORE_{suffix}"
 
 # SETTINGS
 # TODO: is it worth integrating `metrics` and `metrics_kws` into the settings scheme?