File tree 4 files changed +10
-10
lines changed
4 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -81,19 +81,19 @@ def test_cluster_order():
81
81
82
82
# sort the typical days in order to avoid error assertion due to different order
83
83
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
85
85
)
86
86
sortedDaysTest1 = (
87
- typPeriods_predefClusterOrder .sum ( axis = 0 , level = 0 ).sort_values ("GHI" ).index
87
+ typPeriods_predefClusterOrder .groupby ( level = 0 ). sum ( ).sort_values ("GHI" ).index
88
88
)
89
89
90
90
sortedDaysOrig2 = (
91
- orig_raw_predefClusterOrderAndClusterCenters .sum ( axis = 0 , level = 0 )
91
+ orig_raw_predefClusterOrderAndClusterCenters .groupby ( level = 0 ). sum ( )
92
92
.sort_values ("GHI" )
93
93
.index
94
94
)
95
95
sortedDaysTest2 = (
96
- typPeriods_predefClusterOrderAndClusterCenters .sum ( axis = 0 , level = 0 )
96
+ typPeriods_predefClusterOrderAndClusterCenters .groupby ( level = 0 ). sum ( )
97
97
.sort_values ("GHI" )
98
98
.index
99
99
)
Original file line number Diff line number Diff line change @@ -42,8 +42,8 @@ def test_hierarchical():
42
42
print ("Clustering took " + str (time .time () - starttime ))
43
43
44
44
# 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
47
47
48
48
# rearange their order
49
49
orig = orig_raw [typPeriods .columns ].unstack ().loc [sortedDaysOrig , :].stack ()
Original file line number Diff line number Diff line change @@ -39,8 +39,8 @@ def test_k_medoids():
39
39
print ("Clustering took " + str (time .time () - starttime ))
40
40
41
41
# 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
44
44
45
45
# rearange their order
46
46
orig = orig_raw [typPeriods .columns ].unstack ().loc [sortedDaysOrig , :].stack ()
Original file line number Diff line number Diff line change @@ -41,8 +41,8 @@ def test_segmentation():
41
41
print ("Clustering took " + str (time .time () - starttime ))
42
42
43
43
# 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
46
46
47
47
# rearange their order
48
48
orig = orig_raw [typPeriods .columns ].unstack ().loc [sortedDaysOrig , :].stack ()
You can’t perform that action at this time.
0 commit comments