BUG: add H,T,S as subperiods of H #1732

Author: changhiskhan

pandas/tseries/frequencies.py

@@ -944,6 +944,12 @@ def is_subperiod(source, target):
         return source in ['B', 'H', 'T', 'S']
     elif target == 'D':
         return source in ['D', 'H', 'T', 'S']
+    elif target == 'H':
+        return source in ['H', 'T', 'S']
+    elif target == 'T':
+        return source in ['T', 'S']
+    elif target == 'S':
+        return source in ['S']
 
 def is_superperiod(source, target):
     """
@@ -988,6 +994,12 @@ def is_superperiod(source, target):
         return target in ['D', 'B', 'H', 'T', 'S']
     elif source == 'D':
         return target in ['D', 'B', 'H', 'T', 'S']
+    elif source == 'H':
+        return target in ['H', 'T', 'S']
+    elif source == 'T':
+        return target in ['T', 'S']
+    elif source == 'S':
+        return target in ['S']
 
 def _get_rule_month(source, default='DEC'):
     source = source.upper()

pandas/tseries/tests/test_frequencies.py

@@ -202,8 +202,10 @@ def test_is_superperiod_subperiod():
     assert(fmod.is_superperiod(offsets.YearEnd(), offsets.MonthEnd()))
     assert(fmod.is_subperiod(offsets.MonthEnd(), offsets.YearEnd()))
 
+    assert(fmod.is_superperiod(offsets.Hour(), offsets.Minute()))
+    assert(fmod.is_subperiod(offsets.Minute(), offsets.Hour()))
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=[__file__,'-vvs','-x','--pdb', '--pdb-failure'],
                    exit=False)
-

pandas/tseries/tests/test_plotting.py

@@ -616,6 +616,16 @@ def test_mixed_freq_lf_first(self):
         for l in ax.get_lines():
             self.assert_(l.get_xdata().freq == 'D')
 
+        plt.close('all')
+        idxh = date_range('1/1/1999', periods=240, freq='T')
+        idxl = date_range('1/1/1999', periods=4, freq='H')
+        high = Series(np.random.randn(len(idxh)), idxh)
+        low = Series(np.random.randn(len(idxl)), idxl)
+        low.plot()
+        ax = high.plot()
+        for l in ax.get_lines():
+            self.assert_(l.get_xdata().freq == 'T')
+
     @slow
     def test_mixed_freq_irreg_period(self):
         ts = tm.makeTimeSeries()