Skip to content

Commit

Permalink
update repr of snapshot
Browse files Browse the repository at this point in the history
  • Loading branch information
cedricporter committed Apr 5, 2017
1 parent 88a3ec2 commit 1180271
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
3 changes: 3 additions & 0 deletions rqalpha/model/snapshot.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import numpy as np

from ..utils.datetime_func import convert_int_to_datetime
from ..model.tick import Tick


class SnapshotObject(object):
Expand Down Expand Up @@ -166,6 +167,8 @@ def __repr__(self):
if isinstance(self._data, dict):
# in pt
base.extend([k, v] for k, v in six.iteritems(self._data) if k != 'datetime')
elif isinstance(self._data, Tick):
return repr(self._data).replace('Tick', 'Snapshot')
else:
base.extend((n, self._data[n]) for n in self._data.dtype.names if n != 'datetime')
return "Snapshot({0})".format(', '.join('{0}: {1}'.format(k, v) for k, v in base))
Expand Down
10 changes: 9 additions & 1 deletion rqalpha/model/tick.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,12 @@ def limit_down(self):
return self._tick['limit_down']

def __repr__(self):
return str(self._tick)
items = []
for name in dir(self):
if name.startswith("_"):
continue
items.append((name, getattr(self, name)))
return "Tick({0})".format(', '.join('{0}: {1}'.format(k, v) for k, v in items))

def __getitem__(self, key):
return getattr(self, key)
6 changes: 3 additions & 3 deletions rqalpha/utils/scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def before_trading_(self, event):

def _fill_week(self):
weekday = self._today.isoweekday()
weekend = self._today + datetime.timedelta(days=7-weekday)
weekend = self._today + datetime.timedelta(days=7 - weekday)
week_start = weekend - datetime.timedelta(days=6)

left = self._TRADING_DATES.searchsorted(week_start)
Expand All @@ -226,9 +226,9 @@ def _fill_week(self):

def _fill_month(self):
try:
month_end = self._today.replace(month=self._today.month+1, day=1)
month_end = self._today.replace(month=self._today.month + 1, day=1)
except ValueError:
month_end = self._today.replace(year=self._today.year+1, month=1, day=1)
month_end = self._today.replace(year=self._today.year + 1, month=1, day=1)

month_begin = self._today.replace(day=1)
left, right = self._TRADING_DATES.searchsorted(month_begin), self._TRADING_DATES.searchsorted(month_end)
Expand Down

0 comments on commit 1180271

Please sign in to comment.