Move indexing back to index_object

Author: mroeschke

asv_bench/benchmarks/index_object.py

@@ -1,6 +1,7 @@
 import numpy as np
 import pandas.util.testing as tm
-from pandas import date_range, DatetimeIndex, Index, MultiIndex, RangeIndex
+from pandas import (Series, date_range, DatetimeIndex, Index, MultiIndex,
+                    RangeIndex)
 
 from .pandas_vb_common import setup  # noqa
 
@@ -193,3 +194,31 @@ def time_append_int_list(self):
 
     def time_append_obj_list(self):
         self.obj_idx.append(self.object_idxs)
+
+
+class Indexing(object):
+
+    goal_time = 0.2
+    params = ['String', 'Float', 'Int']
+    param_names = ['dtype']
+
+    def setup(self, dtype):
+        N = 10**6
+        self.idx = getattr(tm, 'make{}Index'.format(dtype))(N)
+        self.array_mask = (np.arange(N) % 3) == 0
+        self.series_mask = Series(self.array_mask)
+
+    def time_boolean_array(self, dtype):
+        self.idx[self.array_mask]
+
+    def time_boolean_series(self, dtype):
+        self.idx[self.series_mask]
+
+    def time_get(self, dtype):
+        self.idx[1]
+
+    def time_slice(self, dtype):
+        self.idx[:-1]
+
+    def time_slice_step(self, dtype):
+        self.idx[::2]

asv_bench/benchmarks/indexing.py

@@ -367,49 +367,3 @@ def time_assign_with_setitem(self):
         np.random.seed(1234)
         for i in range(100):
             self.df[i] = np.random.randn(self.N)
-
-
-class Float64(object):
-
-    goal_time = 0.2
-
-    def setup(self):
-        self.idx = tm.makeFloatIndex(1000000)
-        self.mask = ((np.arange(self.idx.size) % 3) == 0)
-        self.series_mask = Series(self.mask)
-
-    def time_boolean_indexer(self):
-        self.idx[self.mask]
-
-    def time_boolean_series_indexer(self):
-        self.idx[self.series_mask]
-
-    def time_get(self):
-        self.idx[1]
-
-    def time_slice_indexer_basic(self):
-        self.idx[:(-1)]
-
-    def time_slice_indexer_even(self):
-        self.idx[::2]
-
-
-class StringIndex(object):
-    goal_time = 0.2
-
-    def setup(self):
-        self.idx = tm.makeStringIndex(1000000)
-        self.mask = ((np.arange(1000000) % 3) == 0)
-        self.series_mask = Series(self.mask)
-
-    def time_boolean_indexer(self):
-        self.idx[self.mask]
-
-    def time_boolean_series_indexer(self):
-        self.idx[self.series_mask]
-
-    def time_slice_indexer_basic(self):
-        self.idx[:(-1)]
-
-    def time_slice_indexer_even(self):
-        self.idx[::2]