Commit 67cb7f48 authored by Dr.李's avatar Dr.李

fixed a bug in fetch dx return

parent 183a13a4
...@@ -207,17 +207,18 @@ class SqlEngine(object): ...@@ -207,17 +207,18 @@ class SqlEngine(object):
cond = universe._query_statements(start_date, end_date, None) cond = universe._query_statements(start_date, end_date, None)
big_table = join(Market, UniverseTable, t = select([Market.trade_date, Market.code, stats]).where(
Market.trade_date.between(start_date, end_date)
).alias('t')
big_table = join(t, UniverseTable,
and_( and_(
Market.trade_date == UniverseTable.trade_date, t.columns['trade_date'] == UniverseTable.trade_date,
Market.code == UniverseTable.code, t.columns['code'] == UniverseTable.code,
cond cond
) )
) )
query = select([Market.trade_date, Market.code, stats]) \ query = select([t]).select_from(big_table)
.select_from(big_table)
df = pd.read_sql(query, self.session.bind).dropna() df = pd.read_sql(query, self.session.bind).dropna()
if universe.is_filtered: if universe.is_filtered:
...@@ -929,8 +930,6 @@ class SqlEngine(object): ...@@ -929,8 +930,6 @@ class SqlEngine(object):
if __name__ == '__main__': if __name__ == '__main__':
engine = SqlEngine() engine = SqlEngine()
ref_date = '2018-02-08' ref_date = '2017-06-29'
df = engine.fetch_model(ref_date, universe = Universe('', ['zz800'])
model_type='LassoRegression', p_returns = engine.fetch_dx_return_range(universe, ref_date, ref_date, horizon=0)
model_version=2)
print(df)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment