Skip to content

Commit 8314779

Browse files
committed
tests: replace sum(level=0) with groupby and sum
See pandas-dev/pandas#39983
1 parent cffd890 commit 8314779

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

test/test_cluster_order.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,19 @@ def test_cluster_order():
8181

8282
# sort the typical days in order to avoid error assertion due to different order
8383
sortedDaysOrig1 = (
84-
orig_raw_predefClusterOrder.sum(axis=0, level=0).sort_values("GHI").index
84+
orig_raw_predefClusterOrder.groupby(level=0).sum().sort_values("GHI").index
8585
)
8686
sortedDaysTest1 = (
87-
typPeriods_predefClusterOrder.sum(axis=0, level=0).sort_values("GHI").index
87+
typPeriods_predefClusterOrder.groupby(level=0).sum().sort_values("GHI").index
8888
)
8989

9090
sortedDaysOrig2 = (
91-
orig_raw_predefClusterOrderAndClusterCenters.sum(axis=0, level=0)
91+
orig_raw_predefClusterOrderAndClusterCenters.groupby(level=0).sum()
9292
.sort_values("GHI")
9393
.index
9494
)
9595
sortedDaysTest2 = (
96-
typPeriods_predefClusterOrderAndClusterCenters.sum(axis=0, level=0)
96+
typPeriods_predefClusterOrderAndClusterCenters.groupby(level=0).sum()
9797
.sort_values("GHI")
9898
.index
9999
)

test/test_hierarchical.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ def test_hierarchical():
4242
print("Clustering took " + str(time.time() - starttime))
4343

4444
# sort the typical days in order to avoid error assertion due to different order
45-
sortedDaysOrig = orig_raw.sum(axis=0, level=0).sort_values("GHI").index
46-
sortedDaysTest = typPeriods.sum(axis=0, level=0).sort_values("GHI").index
45+
sortedDaysOrig = orig_raw.groupby(level=0).sum().sort_values("GHI").index
46+
sortedDaysTest = typPeriods.groupby(level=0).sum().sort_values("GHI").index
4747

4848
# rearange their order
4949
orig = orig_raw[typPeriods.columns].unstack().loc[sortedDaysOrig, :].stack()

test/test_k_medoids.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ def test_k_medoids():
3939
print("Clustering took " + str(time.time() - starttime))
4040

4141
# sort the typical days in order to avoid error assertion due to different order
42-
sortedDaysOrig = orig_raw.sum(axis=0, level=0).sort_values("GHI").index
43-
sortedDaysTest = typPeriods.sum(axis=0, level=0).sort_values("GHI").index
42+
sortedDaysOrig = orig_raw.groupby(level=0).sum().sort_values("GHI").index
43+
sortedDaysTest = typPeriods.groupby(level=0).sum().sort_values("GHI").index
4444

4545
# rearange their order
4646
orig = orig_raw[typPeriods.columns].unstack().loc[sortedDaysOrig, :].stack()

test/test_segmentation.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def test_segmentation():
4141
print("Clustering took " + str(time.time() - starttime))
4242

4343
# sort the typical days in order to avoid error assertion due to different order
44-
sortedDaysOrig = orig_raw.sum(axis=0, level=0).sort_values("GHI").index
45-
sortedDaysTest = typPeriods.sum(axis=0, level=0).sort_values("GHI").index
44+
sortedDaysOrig = orig_raw.groupby(level=0).sum().sort_values("GHI").index
45+
sortedDaysTest = typPeriods.groupby(level=0).sum().sort_values("GHI").index
4646

4747
# rearange their order
4848
orig = orig_raw[typPeriods.columns].unstack().loc[sortedDaysOrig, :].stack()

0 commit comments

Comments
 (0)