dea-tools 0.3.5.dev13__tar.gz → 0.3.5.dev21__tar.gz

{dea_tools-0.3.5.dev13/dea_tools.egg-info → dea_tools-0.3.5.dev21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dea-tools
-Version: 0.3.5.dev13
+Version: 0.3.5.dev21
 Summary: Functions and algorithms for analysing Digital Earth Australia data.
 Home-page: https://github.com/GeoscienceAustralia/dea-notebooks
 Author: Geoscience Australia
@@ -44,7 +44,7 @@ Requires-Dist: pyproj
 Requires-Dist: pystac-client
 Requires-Dist: planetary-computer
 Requires-Dist: python-dateutil
-Requires-Dist: pyTMD>=2.0.0
+Requires-Dist: pyTMD<2.1.5,>=2.0.0
 Requires-Dist: pytz
 Requires-Dist: rasterio
 Requires-Dist: rasterstats

{dea_tools-0.3.5.dev13 → dea_tools-0.3.5.dev21}/dea_tools/classification.py

@@ -226,6 +226,7 @@ def predict_xr(
     chunk_size=None,
     persist=False,
     proba=False,
+    max_proba=True,
     clean=False,
     return_input=False,
 ):
@@ -255,6 +256,11 @@ def predict_xr(
         distributed RAM.
     proba : bool
         If True, predict probabilities
+    max_proba : bool
+        If True, the probabilities array will be flattened to contain
+        only the probabiltiy for the "Predictions" class. If False, 
+        the "Probabilities" object will be an array of prediction
+        probaiblities for each classes
     clean : bool
         If True, remove Infs and NaNs from input and output arrays
     return_input : bool
@@ -282,7 +288,7 @@ def predict_xr(
             input_xr.chunks["y"][0]
         )
 
-    def _predict_func(model, input_xr, persist, proba, clean, return_input):
+    def _predict_func(model, input_xr, persist, proba, max_proba, clean, return_input):
         x, y, crs = input_xr.x, input_xr.y, input_xr.geobox.crs
 
         input_data = []
@@ -330,18 +336,35 @@ def predict_xr(
             print("   probabilities...")
             out_proba = model.predict_proba(input_data_flattened)
 
-            # convert to %
-            out_proba = da.max(out_proba, axis=1) * 100.0
+            # return either one band with the max probability, or the whole probability array
+            if max_proba == True:
+                print("  returning single probability band.")
+                out_proba = da.max(out_proba, axis=1) * 100.0
+                out_proba = out_proba.reshape(len(y), len(x))
+                out_proba = xr.DataArray(
+                    out_proba, coords={"x": x, "y": y}, dims=["y", "x"]
+                )
+                output_xr["Probabilities"] = out_proba
+            else:
+                print("  returning class probability array.")
+                out_proba = out_proba * 100.0
+                class_names = model.classes_  # Get the unique class names from the fitted classifier
+
+                # Loop through each class (band)
+                probabilities_dataset = xr.Dataset()
+                for i, class_name in enumerate(class_names):
+                    reshaped_band = out_proba[:, i].reshape(len(y), len(x))
+                    reshaped_da = xr.DataArray(
+                        reshaped_band, coords={"x": x, "y": y}, dims=["y", "x"]
+                    )
+                    probabilities_dataset[f"prob_{class_name}"] = reshaped_da
 
+                # merge in the probabilities
+                output_xr = xr.merge([output_xr, probabilities_dataset])
+            
             if clean == True:
                 out_proba = da.where(da.isfinite(out_proba), out_proba, 0)
-
-            out_proba = out_proba.reshape(len(y), len(x))
-
-            out_proba = xr.DataArray(
-                out_proba, coords={"x": x, "y": y}, dims=["y", "x"]
-            )
-            output_xr["Probabilities"] = out_proba
+            
 
         if return_input == True:
             print("   input features...")
@@ -391,12 +414,12 @@ def predict_xr(
         model = ParallelPostFit(model)
         with joblib.parallel_backend("dask"):
             output_xr = _predict_func(
-                model, input_xr, persist, proba, clean, return_input
+                model, input_xr, persist, proba, max_proba, clean, return_input
             )
 
     else:
         output_xr = _predict_func(
-            model, input_xr, persist, proba, clean, return_input
+            model, input_xr, persist, proba, max_proba, clean, return_input
         ).compute()
 
     return output_xr

{dea_tools-0.3.5.dev13 → dea_tools-0.3.5.dev21/dea_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dea-tools
-Version: 0.3.5.dev13
+Version: 0.3.5.dev21
 Summary: Functions and algorithms for analysing Digital Earth Australia data.
 Home-page: https://github.com/GeoscienceAustralia/dea-notebooks
 Author: Geoscience Australia
@@ -44,7 +44,7 @@ Requires-Dist: pyproj
 Requires-Dist: pystac-client
 Requires-Dist: planetary-computer
 Requires-Dist: python-dateutil
-Requires-Dist: pyTMD>=2.0.0
+Requires-Dist: pyTMD<2.1.5,>=2.0.0
 Requires-Dist: pytz
 Requires-Dist: rasterio
 Requires-Dist: rasterstats

{dea_tools-0.3.5.dev13 → dea_tools-0.3.5.dev21}/dea_tools.egg-info/requires.txt

@@ -26,7 +26,7 @@ pyproj
 pystac-client
 planetary-computer
 python-dateutil
-pyTMD>=2.0.0
+pyTMD<2.1.5,>=2.0.0
 pytz
 rasterio
 rasterstats

{dea_tools-0.3.5.dev13 → dea_tools-0.3.5.dev21}/setup.py

@@ -56,7 +56,7 @@ REQUIRED = [
     'pystac-client',
     'planetary-computer',
     'python-dateutil',
-    'pyTMD>=2.0.0',    
+    'pyTMD>=2.0.0,<2.1.5',    
     'pytz',
     'rasterio',
     'rasterstats',