Skip to content

Commit e6bcce9

Browse files
dcheriandcherian
committed
some fixes
1 parent 35944e4 commit e6bcce9

File tree

1 file changed

+61
-60
lines changed

1 file changed

+61
-60
lines changed

‎xarray/core/groupby.py

Lines changed: 61 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -890,114 +890,125 @@ def reduce_array(ar):
890890

891891
if XARRAY_NUMPY_GROUPIES:
892892

893-
def sum(self, dim=None, *, fill_value=None, blockwise=False):
893+
def count(self, dim=None, *, keep_attrs=True, fill_value=None):
894+
return xarray_reduce(
895+
self._obj,
896+
self._group,
897+
func="count",
898+
blockwise=False,
899+
dim=dim,
900+
fill_value=fill_value,
901+
keep_attrs=keep_attrs,
902+
)
903+
904+
def sum(self, dim=None, *, keep_attrs=True, fill_value=None):
894905
return xarray_reduce(
895906
self._obj,
896907
self._group,
897908
func="sum",
898-
blockwise=blockwise,
909+
blockwise=False,
899910
dim=dim,
900911
fill_value=fill_value,
901-
expected_groups=(self._unique_coord.data,),
912+
keep_attrs=keep_attrs,
902913
)
903914

904-
def mean(self, dim=None, *, fill_value=None, blockwise=False):
915+
def mean(self, dim=None, *, keep_attrs=True, fill_value=None):
905916
return xarray_reduce(
906917
self._obj,
907918
self._group,
908919
func="mean",
909-
blockwise=blockwise,
920+
blockwise=False,
910921
dim=dim,
911922
fill_value=fill_value,
912-
expected_groups=(self._unique_coord.data,),
923+
keep_attrs=keep_attrs,
913924
)
914925

915-
def std(self, dim=None, *, fill_value=None, blockwise=False):
926+
def std(self, dim=None, *, keep_attrs=True, fill_value=None):
916927
return xarray_reduce(
917928
self._obj,
918929
self._group,
919930
func="std",
920-
blockwise=blockwise,
931+
blockwise=False,
921932
dim=dim,
922933
fill_value=fill_value,
923-
expected_groups=(self._unique_coord.data,),
934+
keep_attrs=keep_attrs,
924935
)
925936

926-
def var(self, dim=None, *, fill_value=None, blockwise=False):
937+
def var(self, dim=None, *, keep_attrs=True, fill_value=None):
927938
return xarray_reduce(
928939
self._obj,
929940
self._group,
930941
func="var",
931-
blockwise=blockwise,
942+
blockwise=False,
932943
dim=dim,
933944
fill_value=fill_value,
934-
expected_groups=(self._unique_coord.data,),
945+
keep_attrs=keep_attrs,
935946
)
936947

937-
def max(self, dim=None, *, fill_value=None, blockwise=False):
948+
def max(self, dim=None, *, keep_attrs=True, fill_value=None):
938949
return xarray_reduce(
939950
self._obj,
940951
self._group,
941952
func="max",
942-
blockwise=blockwise,
953+
blockwise=False,
943954
dim=dim,
944955
fill_value=fill_value,
945-
expected_groups=(self._unique_coord.data,),
956+
keep_attrs=keep_attrs,
946957
)
947958

948-
def min(self, dim=None, *, fill_value=None, blockwise=False):
959+
def min(self, dim=None, *, keep_attrs=True, fill_value=None):
949960
return xarray_reduce(
950961
self._obj,
951962
self._group,
952963
func="min",
953-
blockwise=blockwise,
964+
blockwise=False,
954965
dim=dim,
955966
fill_value=fill_value,
956-
expected_groups=(self._unique_coord.data,),
967+
keep_attrs=keep_attrs,
957968
)
958969

959-
def argmin(self, dim=None, *, fill_value=None, blockwise=False):
970+
def argmin(self, dim=None, *, keep_attrs=True, fill_value=None):
960971
return xarray_reduce(
961972
self._obj,
962973
self._group,
963974
func="argmin",
964-
blockwise=blockwise,
975+
blockwise=False,
965976
dim=dim,
966977
fill_value=fill_value,
967-
expected_groups=(self._unique_coord.data,),
978+
keep_attrs=keep_attrs,
968979
)
969980

970-
def argmax(self, dim=None, *, fill_value=None, blockwise=False):
981+
def argmax(self, dim=None, *, keep_attrs=True, fill_value=None):
971982
return xarray_reduce(
972983
self._obj,
973984
self._group,
974985
func="argmax",
975-
blockwise=blockwise,
986+
blockwise=False,
976987
dim=dim,
977988
fill_value=fill_value,
978-
expected_groups=(self._unique_coord.data,),
989+
keep_attrs=keep_attrs,
979990
)
980991

981-
def frist(self, dim=None, *, fill_value=None, blockwise=False):
992+
def first(self, dim=None, *, keep_attrs=True, fill_value=None):
982993
return xarray_reduce(
983994
self._obj,
984995
self._group,
985996
func="first",
986-
blockwise=blockwise,
997+
blockwise=False,
987998
dim=dim,
988999
fill_value=fill_value,
989-
expected_groups=(self._unique_coord.data,),
1000+
keep_attrs=keep_attrs,
9901001
)
9911002

992-
def last(self, dim=None, *, fill_value=None, blockwise=False):
1003+
def last(self, dim=None, *, keep_attrs=True, fill_value=None):
9931004
return xarray_reduce(
9941005
self._obj,
9951006
self._group,
9961007
func="last",
997-
blockwise=blockwise,
1008+
blockwise=False,
9981009
dim=dim,
9991010
fill_value=fill_value,
1000-
expected_groups=(self._unique_coord.data,),
1011+
keep_attrs=keep_attrs,
10011012
)
10021013

10031014
else:
@@ -1107,114 +1118,104 @@ def _combine(self, applied):
11071118

11081119
if XARRAY_NUMPY_GROUPIES:
11091120

1110-
def sum(self, dim=None, *, fill_value=None, blockwise=False):
1121+
def sum(self, dim=None, *, keep_attrs=True, fill_value=None):
11111122
return xarray_reduce(
11121123
self._obj,
11131124
self._group,
11141125
func="sum",
1115-
blockwise=blockwise,
1126+
blockwise=False,
11161127
dim=dim,
11171128
fill_value=fill_value,
1118-
expected_groups=(self._unique_coord.data,),
11191129
)
11201130

1121-
def mean(self, dim=None, *, fill_value=None, blockwise=False):
1131+
def mean(self, dim=None, *, keep_attrs=True, fill_value=None):
11221132
return xarray_reduce(
11231133
self._obj,
11241134
self._group,
11251135
func="mean",
1126-
blockwise=blockwise,
1136+
blockwise=False,
11271137
dim=dim,
11281138
fill_value=fill_value,
1129-
expected_groups=(self._unique_coord.data,),
11301139
)
11311140

1132-
def std(self, dim=None, *, fill_value=None, blockwise=False):
1141+
def std(self, dim=None, *, keep_attrs=True, fill_value=None):
11331142
return xarray_reduce(
11341143
self._obj,
11351144
self._group,
11361145
func="std",
1137-
blockwise=blockwise,
1146+
blockwise=False,
11381147
dim=dim,
11391148
fill_value=fill_value,
1140-
expected_groups=(self._unique_coord.data,),
11411149
)
11421150

1143-
def var(self, dim=None, *, fill_value=None, blockwise=False):
1151+
def var(self, dim=None, *, keep_attrs=True, fill_value=None):
11441152
return xarray_reduce(
11451153
self._obj,
11461154
self._group,
11471155
func="var",
1148-
blockwise=blockwise,
1156+
blockwise=False,
11491157
dim=dim,
11501158
fill_value=fill_value,
1151-
expected_groups=(self._unique_coord.data,),
11521159
)
11531160

1154-
def max(self, dim=None, *, fill_value=None, blockwise=False):
1161+
def max(self, dim=None, *, keep_attrs=True, fill_value=None):
11551162
return xarray_reduce(
11561163
self._obj,
11571164
self._group,
11581165
func="max",
1159-
blockwise=blockwise,
1166+
blockwise=False,
11601167
dim=dim,
11611168
fill_value=fill_value,
1162-
expected_groups=(self._unique_coord.data,),
11631169
)
11641170

1165-
def min(self, dim=None, *, fill_value=None, blockwise=False):
1171+
def min(self, dim=None, *, keep_attrs=True, fill_value=None):
11661172
return xarray_reduce(
11671173
self._obj,
11681174
self._group,
11691175
func="min",
1170-
blockwise=blockwise,
1176+
blockwise=False,
11711177
dim=dim,
11721178
fill_value=fill_value,
1173-
expected_groups=(self._unique_coord.data,),
11741179
)
11751180

1176-
def argmin(self, dim=None, *, fill_value=None, blockwise=False):
1181+
def argmin(self, dim=None, *, keep_attrs=True, fill_value=None):
11771182
return xarray_reduce(
11781183
self._obj,
11791184
self._group,
11801185
func="argmin",
1181-
blockwise=blockwise,
1186+
blockwise=False,
11821187
dim=dim,
11831188
fill_value=fill_value,
1184-
expected_groups=(self._unique_coord.data,),
11851189
)
11861190

1187-
def argmax(self, dim=None, *, fill_value=None, blockwise=False):
1191+
def argmax(self, dim=None, *, keep_attrs=True, fill_value=None):
11881192
return xarray_reduce(
11891193
self._obj,
11901194
self._group,
11911195
func="argmax",
1192-
blockwise=blockwise,
1196+
blockwise=False,
11931197
dim=dim,
11941198
fill_value=fill_value,
1195-
expected_groups=(self._unique_coord.data,),
11961199
)
11971200

1198-
def frist(self, dim=None, *, fill_value=None, blockwise=False):
1201+
def first(self, dim=None, *, keep_attrs=True, fill_value=None):
11991202
return xarray_reduce(
12001203
self._obj,
12011204
self._group,
12021205
func="first",
1203-
blockwise=blockwise,
1206+
blockwise=False,
12041207
dim=dim,
12051208
fill_value=fill_value,
1206-
expected_groups=(self._unique_coord.data,),
12071209
)
12081210

1209-
def last(self, dim=None, *, fill_value=None, blockwise=False):
1211+
def last(self, dim=None, *, keep_attrs=True, fill_value=None):
12101212
return xarray_reduce(
12111213
self._obj,
12121214
self._group,
12131215
func="last",
1214-
blockwise=blockwise,
1216+
blockwise=False,
12151217
dim=dim,
12161218
fill_value=fill_value,
1217-
expected_groups=(self._unique_coord.data,),
12181219
)
12191220

12201221
else:

0 commit comments

Comments
 (0)