deepsensor 0.4.0__tar.gz → 0.4.2__tar.gz

{deepsensor-0.4.0 → deepsensor-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepsensor
-Version: 0.4.0
+Version: 0.4.2
 Summary: A Python package for modelling xarray and pandas data with neural processes.
 Home-page: https://github.com/alan-turing-institute/deepsensor
 Author: Tom R. Andersson
@@ -44,7 +44,7 @@ data with neural processes</p>
 
 -----------
 
-[![release](https://img.shields.io/badge/release-v0.4.0-green?logo=github)](https://github.com/alan-turing-institute/deepsensor/releases)
+[![release](https://img.shields.io/badge/release-v0.4.2-green?logo=github)](https://github.com/alan-turing-institute/deepsensor/releases)
 [![Latest Docs](https://img.shields.io/badge/docs-latest-blue.svg)](https://alan-turing-institute.github.io/deepsensor/)
 ![Tests](https://github.com/alan-turing-institute/deepsensor/actions/workflows/tests.yml/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/alan-turing-institute/deepsensor/badge.svg?branch=main)](https://coveralls.io/github/alan-turing-institute/deepsensor?branch=main)

{deepsensor-0.4.0 → deepsensor-0.4.2}/README.md

@@ -11,7 +11,7 @@ data with neural processes</p>
 
 -----------
 
-[![release](https://img.shields.io/badge/release-v0.4.0-green?logo=github)](https://github.com/alan-turing-institute/deepsensor/releases)
+[![release](https://img.shields.io/badge/release-v0.4.2-green?logo=github)](https://github.com/alan-turing-institute/deepsensor/releases)
 [![Latest Docs](https://img.shields.io/badge/docs-latest-blue.svg)](https://alan-turing-institute.github.io/deepsensor/)
 ![Tests](https://github.com/alan-turing-institute/deepsensor/actions/workflows/tests.yml/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/alan-turing-institute/deepsensor/badge.svg?branch=main)](https://coveralls.io/github/alan-turing-institute/deepsensor?branch=main)

{deepsensor-0.4.0 → deepsensor-0.4.2}/deepsensor/model/model.py

@@ -652,7 +652,7 @@ class DeepSensorModel(ProbabilisticModel):
                         )
 
         if forecasting_mode:
-            pred = add_valid_time_coord_to_pred(pred)
+            pred = add_valid_time_coord_to_pred_and_move_time_dims(pred)
 
         if verbose:
             dur = time.time() - tic
@@ -661,10 +661,11 @@ class DeepSensorModel(ProbabilisticModel):
         return pred
 
 
-def add_valid_time_coord_to_pred(pred: Prediction) -> Prediction:
+def add_valid_time_coord_to_pred_and_move_time_dims(pred: Prediction) -> Prediction:
     """
     Add a valid time coordinate "time" to a Prediction object based on the
-    initialisation times "init_time" and lead times "lead_time".
+    initialisation times "init_time" and lead times "lead_time", and
+    reorder the time dims from ("lead_time", "init_time") to ("init_time", "lead_time").
 
     Args:
         pred (:class:`~.model.pred.Prediction`):
@@ -678,13 +679,14 @@ def add_valid_time_coord_to_pred(pred: Prediction) -> Prediction:
         if isinstance(pred[var_ID], pd.DataFrame):
             x = pred[var_ID].reset_index()
             pred[var_ID]["time"] = (x["lead_time"] + x["init_time"]).values
-            print(f"{x}")
-            print(f"{x.dtypes}")
+            pred[var_ID] = pred[var_ID].swaplevel("init_time", "lead_time")
+            pred[var_ID] = pred[var_ID].sort_index()
         elif isinstance(pred[var_ID], xr.Dataset):
             x = pred[var_ID]
             pred[var_ID] = pred[var_ID].assign_coords(
                 time=x["lead_time"] + x["init_time"]
             )
+            pred[var_ID] = pred[var_ID].transpose("init_time", "lead_time", ...)
         else:
             raise ValueError(f"Unsupported prediction type {type(pred[var_ID])}.")
     return pred

{deepsensor-0.4.0 → deepsensor-0.4.2}/deepsensor/model/pred.py

@@ -205,7 +205,7 @@ class Prediction(dict):
                         index = (lead_times[i], date)
                     else:
                         index = date
-                    self[var_ID][prediction_parameter].loc[index] = pred
+                    self[var_ID].loc[index, prediction_parameter] = pred
             elif prediction_parameter == "samples":
                 assert len(data.shape) == 3, (
                     f"If prediction_parameter is 'samples', and mode is 'off-grid', data must"
@@ -219,7 +219,7 @@ class Prediction(dict):
                             index = (lead_times[i], date)
                         else:
                             index = date
-                        self[var_ID][f"sample_{sample_i}"].loc[index] = pred
+                        self[var_ID].loc[index, f"sample_{sample_i}"] = pred
 
 
 def create_empty_spatiotemporal_xarray(

{deepsensor-0.4.0 → deepsensor-0.4.2}/deepsensor/plot.py

@@ -954,6 +954,8 @@ def prediction(
             ax = axes[row_i, col_i]
 
             if pred.mode == "on-grid":
+                if "init_time" in pred[0].indexes:
+                    raise ValueError("Plotting forecasts not currently supported.")
                 if param == "std":
                     vmin = 0
                 else:
@@ -1000,6 +1002,8 @@ def prediction(
                     # )
 
             elif pred.mode == "off-grid":
+                if "init_time" in pred[0].index.names:
+                    raise ValueError("Plotting forecasts not currently supported.")
                 import seaborn as sns
 
                 hue = (

{deepsensor-0.4.0 → deepsensor-0.4.2}/deepsensor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepsensor
-Version: 0.4.0
+Version: 0.4.2
 Summary: A Python package for modelling xarray and pandas data with neural processes.
 Home-page: https://github.com/alan-turing-institute/deepsensor
 Author: Tom R. Andersson
@@ -44,7 +44,7 @@ data with neural processes</p>
 
 -----------
 
-[![release](https://img.shields.io/badge/release-v0.4.0-green?logo=github)](https://github.com/alan-turing-institute/deepsensor/releases)
+[![release](https://img.shields.io/badge/release-v0.4.2-green?logo=github)](https://github.com/alan-turing-institute/deepsensor/releases)
 [![Latest Docs](https://img.shields.io/badge/docs-latest-blue.svg)](https://alan-turing-institute.github.io/deepsensor/)
 ![Tests](https://github.com/alan-turing-institute/deepsensor/actions/workflows/tests.yml/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/alan-turing-institute/deepsensor/badge.svg?branch=main)](https://coveralls.io/github/alan-turing-institute/deepsensor?branch=main)

{deepsensor-0.4.0 → deepsensor-0.4.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = deepsensor
-version = 0.4.0
+version = 0.4.2
 author = Tom R. Andersson
 author_email = tomandersson3@gmail.com
 description = A Python package for modelling xarray and pandas data with neural processes.

{deepsensor-0.4.0 → deepsensor-0.4.2}/tests/test_model.py

@@ -659,7 +659,7 @@ class TestModel(unittest.TestCase):
         )
 
         expected_valid_times = np.array(
-            expected_lead_times[:, None] + expected_init_times[None, :]
+            expected_init_times[:, None] + expected_lead_times[None, :]
         )
 
         tl = TaskLoader(
@@ -690,8 +690,8 @@ class TestModel(unittest.TestCase):
                 errors = compute_errors(pred, self.da.to_dataset())
                 for var_ID in errors.keys():
                     assert tuple(errors[var_ID].dims) == (
-                        "lead_time",
                         "init_time",
+                        "lead_time",
                         "x1",
                         "x2",
                     )