code abstraction

Author: Si Wei How

pandas/tseries/offsets.py

@@ -591,9 +591,12 @@ def __init__(self, start='09:00', end='17:00', offset=timedelta(0)):
             raise ValueError('number of starting time and ending time'
                              'must be the same')
         num_openings = len(start)
-        openings = sorted(zip(start, end))
-        start = tuple(x for x, _ in openings)
-        end = tuple(x for _, x in openings)
+
+        # sort starting and ending time by starting time
+        index = np.argsort(start)
+        start = tuple(np.array(start)[index])
+        end = tuple(np.array(end)[index])
+
         total_secs = 0
         for i in range(num_openings):
             total_secs += self._get_business_hours_by_sec(start[i], end[i])
@@ -627,7 +630,7 @@ def next_bday(self):
     def _get_daytime_flag(self, start, end):
         return start < end
 
-    def _next_opening_time(self, other):
+    def _next_opening_time(self, other, dir=1):
         """
         If n is positive, return tomorrow's business day opening time.
         Otherwise yesterday's business day's opening time.
@@ -638,23 +641,23 @@ def _next_opening_time(self, other):
         earliest_start = self.start[0]
         latest_start = self.start[-1]
         if not self.next_bday.onOffset(other):
-            other = other + self.next_bday
-            if self.n >= 0:
+            other = other + dir * self.next_bday
+            if self.n * dir >= 0:
                 return datetime(other.year, other.month, other.day,
                                 earliest_start.hour, earliest_start.minute)
             else:
                 return datetime(other.year, other.month, other.day,
                                 latest_start.hour, latest_start.minute)
         else:
-            if self.n >= 0 and latest_start < other.time():
-                other = other + self.next_bday
+            if self.n * dir >= 0 and latest_start < other.time():
+                other = other + dir * self.next_bday
                 return datetime(other.year, other.month, other.day,
                                 earliest_start.hour, earliest_start.minute)
-            elif self.n < 0 and other.time() < earliest_start:
-                other = other + self.next_bday
+            elif self.n * dir < 0 and other.time() < earliest_start:
+                other = other + dir * self.next_bday
                 return datetime(other.year, other.month, other.day,
                                 latest_start.hour, latest_start.minute)
-        if self.n >= 0:
+        if self.n * dir >= 0:
             for st in self.start:
                 if other.time() <= st:
                     return datetime(other.year, other.month, other.day,
@@ -670,35 +673,7 @@ def _prev_opening_time(self, other):
         If n is positive, return yesterday's business day opening time.
         Otherwise yesterday business day's opening time.
         """
-        earliest_start = self.start[0]
-        latest_start = self.start[-1]
-        if not self.next_bday.onOffset(other):
-            other = other - self.next_bday
-            if self.n < 0:
-                return datetime(other.year, other.month, other.day,
-                                earliest_start.hour, earliest_start.minute)
-            else:
-                return datetime(other.year, other.month, other.day,
-                                latest_start.hour, latest_start.minute)
-        else:
-            if self.n < 0 and latest_start < other.time():
-                other = other - self.next_bday
-                return datetime(other.year, other.month, other.day,
-                                earliest_start.hour, earliest_start.minute)
-            elif self.n >= 0 and other.time() < earliest_start:
-                other = other - self.next_bday
-                return datetime(other.year, other.month, other.day,
-                                latest_start.hour, latest_start.minute)
-        if self.n < 0:
-            for st in self.start:
-                if other.time() <= st:
-                    return datetime(other.year, other.month, other.day,
-                                    st.hour, st.minute)
-        else:
-            for st in reversed(self.start):
-                if other.time() >= st:
-                    return datetime(other.year, other.month, other.day,
-                                    st.hour, st.minute)
+        return self._next_opening_time(other, dir=-1)
 
     def _get_business_hours_by_sec(self, start, end):
         """
@@ -862,10 +837,10 @@ def _onOffset(self, dt):
 
     def _repr_attrs(self):
         out = super()._repr_attrs()
-        hours = ','.join('{}-{}'.format(st.strftime('%H:%M'), en.strftime('%H:%M'))
+        hours = ','.join('{}-{}'.format(
+            st.strftime('%H:%M'), en.strftime('%H:%M'))
             for st, en in zip(self.start, self.end))
-        attrs = ['{prefix}={hours}'.format(prefix=self._prefix,
-                                                 hours=hours)]
+        attrs = ['{prefix}={hours}'.format(prefix=self._prefix, hours=hours)]
         out += ': ' + ', '.join(attrs)
         return out