Skip to content
Snippets Groups Projects
Commit 34ed5e38 authored by David Schäfer's avatar David Schäfer
Browse files

Revert "interpol-options"

parent 0699367a
No related branches found
No related tags found
3 merge requests!685Release 2.4,!684Release 2.4,!646Revert "interpol-options"
......@@ -11,7 +11,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
### Added
- Methods `logicalAnd` and `logicalOr`
- `Flags` supports slicing and column selection with `list` or a `pd.Index`.
- added option `limit` to functions `interpolate` and `linear`.
### Changed
### Removed
### Fixed
......
......@@ -287,7 +287,7 @@ class InterpolationMixin:
freq: str,
method: _SUPPORTED_METHODS,
order: int = 2,
limit: int | str | None = 2,
limit: int | None = 2,
extrapolate: Literal["forward", "backward", "both"] = None,
**kwargs,
) -> "SaQC":
......
......@@ -40,7 +40,6 @@ class ResamplingMixin:
self: "SaQC",
field: str,
freq: str,
limit: int | str | None = None,
**kwargs,
) -> "SaQC":
"""
......@@ -63,30 +62,21 @@ class ResamplingMixin:
freq : str
An offset string. The frequency of the grid you want to interpolate your data at.
limit : int or str, optional
Upper limit of missing values (with respect to `freq`) to fill. The limit can either be expressed
as the number of consecutive missing values (integer) or temporal extension of the gaps to be filled
(Offset String).
If `None` is passed, no Limit is set.
Returns
-------
saqc.SaQC
"""
reserved = ["method", "order", "downgrade"]
reserved = ["method", "order", "limit", "downgrade"]
kwargs = filterKwargs(kwargs, reserved)
return self.interpolateIndex(
field=field, freq=freq, method="time", limit=limit, **kwargs
)
return self.interpolateIndex(field, freq, "time", **kwargs)
@register(mask=["field"], demask=[], squeeze=[])
def interpolate(
self: "SaQC",
field: str,
freq: str,
method: _SUPPORTED_METHODS = "linear",
method: _SUPPORTED_METHODS,
order: int = 1,
limit: int | str | None = None,
**kwargs,
) -> "SaQC":
"""
......@@ -116,28 +106,20 @@ class ResamplingMixin:
An offset string. The frequency of the grid you want to interpolate your data at.
method : {"linear", "time", "nearest", "zero", "slinear", "quadratic", "cubic", "spline", "barycentric",
"polynomial", "krogh", "piecewise_polynomial", "spline", "pchip", "akima"}, default "linear"
"polynomial", "krogh", "piecewise_polynomial", "spline", "pchip", "akima"}
The interpolation method you want to apply.
order : int, default 1
If your selected interpolation method can be performed at different *orders* - here you pass the desired
order.
limit : int or str, optional
Upper limit of missing values (with respect to `freq`) to fill. The limit can either be expressed
as the number of consecutive missing values (integer) or temporal extension of the gaps to be filled
(Offset String).
If `None` is passed, no Limit is set.
Returns
-------
saqc.SaQC
"""
reserved = ["downgrade"]
reserved = ["limit", "downgrade"]
kwargs = filterKwargs(kwargs, reserved)
return self.interpolateIndex(
field=field, freq=freq, method=method, limit=limit, order=order, **kwargs
)
return self.interpolateIndex(field, freq, method=method, order=order, **kwargs)
@register(mask=["field"], demask=[], squeeze=[])
def shift(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment