|
1 | 1 | import numpy as np |
2 | 2 | import pandas.util.testing as tm |
3 | | -from pandas import (DataFrame, Series, rolling_median, rolling_mean, |
4 | | - rolling_min, rolling_max, rolling_var, rolling_skew, |
5 | | - rolling_kurt, rolling_std, read_csv, factorize, date_range) |
| 3 | +from pandas import DataFrame, Series, read_csv, factorize, date_range |
6 | 4 | from pandas.core.algorithms import take_1d |
7 | 5 | try: |
8 | 6 | from pandas._libs import algos |
@@ -171,44 +169,20 @@ def run(period): |
171 | 169 | class ParallelRolling(object): |
172 | 170 |
|
173 | 171 | goal_time = 0.2 |
174 | | - params = ['rolling_median', 'rolling_mean', 'rolling_min', 'rolling_max', |
175 | | - 'rolling_var', 'rolling_skew', 'rolling_kurt', 'rolling_std'] |
| 172 | + params = ['median', 'mean', 'min', 'max', 'var', 'skew', 'kurt', 'std'] |
176 | 173 | param_names = ['method'] |
177 | 174 |
|
178 | 175 | def setup(self, method): |
179 | 176 | if not have_real_test_parallel: |
180 | 177 | raise NotImplementedError |
181 | 178 | win = 100 |
182 | 179 | arr = np.random.rand(100000) |
183 | | - if hasattr(DataFrame, 'rolling'): |
184 | | - rolling = {'rolling_median': 'median', |
185 | | - 'rolling_mean': 'mean', |
186 | | - 'rolling_min': 'min', |
187 | | - 'rolling_max': 'max', |
188 | | - 'rolling_var': 'var', |
189 | | - 'rolling_skew': 'skew', |
190 | | - 'rolling_kurt': 'kurt', |
191 | | - 'rolling_std': 'std'} |
192 | | - df = DataFrame(arr).rolling(win) |
193 | | - |
194 | | - @test_parallel(num_threads=2) |
195 | | - def parallel_rolling(): |
196 | | - getattr(df, rolling[method])() |
197 | | - self.parallel_rolling = parallel_rolling |
198 | | - else: |
199 | | - rolling = {'rolling_median': rolling_median, |
200 | | - 'rolling_mean': rolling_mean, |
201 | | - 'rolling_min': rolling_min, |
202 | | - 'rolling_max': rolling_max, |
203 | | - 'rolling_var': rolling_var, |
204 | | - 'rolling_skew': rolling_skew, |
205 | | - 'rolling_kurt': rolling_kurt, |
206 | | - 'rolling_std': rolling_std} |
207 | | - |
208 | | - @test_parallel(num_threads=2) |
209 | | - def parallel_rolling(): |
210 | | - rolling[method](arr, win) |
211 | | - self.parallel_rolling = parallel_rolling |
| 180 | + df = DataFrame(arr).rolling(win) |
| 181 | + |
| 182 | + @test_parallel(num_threads=2) |
| 183 | + def parallel_rolling(): |
| 184 | + getattr(df, method)() |
| 185 | + self.parallel_rolling = parallel_rolling |
212 | 186 |
|
213 | 187 | def time_rolling(self, method): |
214 | 188 | self.parallel_rolling() |
|
0 commit comments