From 7bf715618650c4e1557e040737031c54ebedf869 Mon Sep 17 00:00:00 2001 From: Jacob Date: Thu, 9 Jan 2025 21:39:04 -0600 Subject: [PATCH 1/2] fix imports --- torchcast/kalman_filter/binomial_filter.py | 4 ++-- torchcast/kalman_filter/ekf.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/torchcast/kalman_filter/binomial_filter.py b/torchcast/kalman_filter/binomial_filter.py index 61ac74d..a965f45 100644 --- a/torchcast/kalman_filter/binomial_filter.py +++ b/torchcast/kalman_filter/binomial_filter.py @@ -10,11 +10,11 @@ from torchcast.covariance import Covariance from torchcast.covariance.util import mini_cov_mask -from torchcast.internals.utils import identity +from torchcast.internals.utils import identity, class_or_instancemethod from torchcast.kalman_filter import KalmanFilter from torchcast.kalman_filter.ekf import EKFStep, EKFPredictions from torchcast.process import Process -from torchcast.utils import conf2bounds, class_or_instancemethod +from torchcast.state_space.predictions import conf2bounds if TYPE_CHECKING: from pandas import DataFrame diff --git a/torchcast/kalman_filter/ekf.py b/torchcast/kalman_filter/ekf.py index 501c544..bca7edf 100644 --- a/torchcast/kalman_filter/ekf.py +++ b/torchcast/kalman_filter/ekf.py @@ -6,8 +6,9 @@ from torch import Tensor from .kalman_filter import KalmanStep +from ..internals.utils import class_or_instancemethod from ..state_space import Predictions -from ..utils import TimeSeriesDataset, class_or_instancemethod +from ..utils import TimeSeriesDataset class EKFStep(KalmanStep): From e5ab1b4cc4c87f68dc5a0065b2346090edacbc40 Mon Sep 17 00:00:00 2001 From: Jacob Date: Thu, 9 Jan 2025 21:55:45 -0600 Subject: [PATCH 2/2] fix lower/upper vs std --- torchcast/__init__.py | 2 +- torchcast/state_space/predictions.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/torchcast/__init__.py b/torchcast/__init__.py index 2b8877c..93b60a1 100644 --- a/torchcast/__init__.py +++ b/torchcast/__init__.py @@ -1 +1 @@ -__version__ = '0.5.0' +__version__ = '0.5.1' diff --git a/torchcast/state_space/predictions.py b/torchcast/state_space/predictions.py index 7dd6239..0e49e82 100644 --- a/torchcast/state_space/predictions.py +++ b/torchcast/state_space/predictions.py @@ -463,7 +463,11 @@ def _tensor_to_df(tens, measures): raise ValueError("Expected `type` to be 'predictions' or 'components'.") out = pd.concat(out).reset_index(drop=True) - _out_cols = [group_colname, time_colname, 'measure', 'mean', 'lower', 'upper'] + _out_cols = [group_colname, time_colname, 'measure', 'mean'] + if conf is None: + _out_cols.append('std') + else: + _out_cols.extend(['lower', 'upper']) if type.startswith('comp'): _out_cols = _out_cols[0:3] + ['process', 'state_element'] + _out_cols[3:] if 'actual' in out.columns: