Skip to content

TYP: Window code #40293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 12, 2021
Merged

TYP: Window code #40293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e4b9d5
TYPE: Window code
mroeschke Mar 8, 2021
b52ab17
type apply and constrcutor
mroeschke Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pandas/core/window/ewm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from pandas._libs.tslibs import Timedelta
import pandas._libs.window.aggregations as window_aggregations
from pandas._typing import (
Axis,
FrameOrSeries,
FrameOrSeriesUnion,
TimedeltaConvertibleTypes,
Expand Down Expand Up @@ -227,15 +228,15 @@ class ExponentialMovingWindow(BaseWindow):

def __init__(
self,
obj,
obj: FrameOrSeries,
com: Optional[float] = None,
span: Optional[float] = None,
halflife: Optional[Union[float, TimedeltaConvertibleTypes]] = None,
alpha: Optional[float] = None,
min_periods: int = 0,
adjust: bool = True,
ignore_na: bool = False,
axis: int = 0,
axis: Axis = 0,
times: Optional[Union[str, np.ndarray, FrameOrSeries]] = None,
):
super().__init__(
Expand Down
62 changes: 51 additions & 11 deletions pandas/core/window/expanding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

import numpy as np

from pandas._typing import FrameOrSeries
from pandas._typing import (
Axis,
FrameOrSeries,
FrameOrSeriesUnion,
)
from pandas.compat.numpy import function as nv
from pandas.util._decorators import doc

Expand Down Expand Up @@ -94,7 +98,14 @@ class Expanding(RollingAndExpandingMixin):

_attributes = ["min_periods", "center", "axis", "method"]

def __init__(self, obj, min_periods=1, center=None, axis=0, method="single"):
def __init__(
self,
obj: FrameOrSeries,
min_periods: int = 1,
center=None,
axis: Axis = 0,
method: str = "single",
):
super().__init__(
obj=obj, min_periods=min_periods, center=center, axis=axis, method=method
)
Expand Down Expand Up @@ -200,7 +211,13 @@ def apply(
aggregation_description="sum",
agg_method="sum",
)
def sum(self, *args, engine=None, engine_kwargs=None, **kwargs):
def sum(
self,
*args,
engine: Optional[str] = None,
engine_kwargs: Optional[Dict[str, bool]] = None,
**kwargs,
):
nv.validate_expanding_func("sum", args, kwargs)
return super().sum(*args, engine=engine, engine_kwargs=engine_kwargs, **kwargs)

Expand All @@ -220,7 +237,13 @@ def sum(self, *args, engine=None, engine_kwargs=None, **kwargs):
aggregation_description="maximum",
agg_method="max",
)
def max(self, *args, engine=None, engine_kwargs=None, **kwargs):
def max(
self,
*args,
engine: Optional[str] = None,
engine_kwargs: Optional[Dict[str, bool]] = None,
**kwargs,
):
nv.validate_expanding_func("max", args, kwargs)
return super().max(*args, engine=engine, engine_kwargs=engine_kwargs, **kwargs)

Expand All @@ -240,7 +263,13 @@ def max(self, *args, engine=None, engine_kwargs=None, **kwargs):
aggregation_description="minimum",
agg_method="min",
)
def min(self, *args, engine=None, engine_kwargs=None, **kwargs):
def min(
self,
*args,
engine: Optional[str] = None,
engine_kwargs: Optional[Dict[str, bool]] = None,
**kwargs,
):
nv.validate_expanding_func("min", args, kwargs)
return super().min(*args, engine=engine, engine_kwargs=engine_kwargs, **kwargs)

Expand All @@ -260,7 +289,13 @@ def min(self, *args, engine=None, engine_kwargs=None, **kwargs):
aggregation_description="mean",
agg_method="mean",
)
def mean(self, *args, engine=None, engine_kwargs=None, **kwargs):
def mean(
self,
*args,
engine: Optional[str] = None,
engine_kwargs: Optional[Dict[str, bool]] = None,
**kwargs,
):
nv.validate_expanding_func("mean", args, kwargs)
return super().mean(*args, engine=engine, engine_kwargs=engine_kwargs, **kwargs)

Expand All @@ -279,7 +314,12 @@ def mean(self, *args, engine=None, engine_kwargs=None, **kwargs):
aggregation_description="median",
agg_method="median",
)
def median(self, engine=None, engine_kwargs=None, **kwargs):
def median(
self,
engine: Optional[str] = None,
engine_kwargs: Optional[Dict[str, bool]] = None,
**kwargs,
):
return super().median(engine=engine, engine_kwargs=engine_kwargs, **kwargs)

@doc(
Expand Down Expand Up @@ -508,8 +548,8 @@ def kurt(self, **kwargs):
)
def quantile(
self,
quantile,
interpolation="linear",
quantile: float,
interpolation: str = "linear",
**kwargs,
):
return super().quantile(
Expand Down Expand Up @@ -549,7 +589,7 @@ def quantile(
)
def cov(
self,
other: Optional[Union[np.ndarray, FrameOrSeries]] = None,
other: Optional[Union[np.ndarray, FrameOrSeriesUnion]] = None,
pairwise: Optional[bool] = None,
ddof: int = 1,
**kwargs,
Expand Down Expand Up @@ -614,7 +654,7 @@ def cov(
)
def corr(
self,
other: Optional[Union[np.ndarray, FrameOrSeries]] = None,
other: Optional[Union[np.ndarray, FrameOrSeriesUnion]] = None,
pairwise: Optional[bool] = None,
ddof: int = 1,
**kwargs,
Expand Down
Loading