Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
A
alpha-mind
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dr.李
alpha-mind
Commits
67cb7f48
Commit
67cb7f48
authored
Feb 13, 2018
by
Dr.李
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed a bug in fetch dx return
parent
183a13a4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
11 deletions
+10
-11
sqlengine.py
alphamind/data/engines/sqlengine.py
+10
-11
No files found.
alphamind/data/engines/sqlengine.py
View file @
67cb7f48
...
@@ -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
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment