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
8839d11c
Commit
8839d11c
authored
May 05, 2018
by
Dr.李
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug for returning wrong variable
parent
d0c98b33
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
sqlengine.py
alphamind/data/engines/sqlengine.py
+1
-1
test_sql_engine.py
alphamind/tests/data/engines/test_sql_engine.py
+4
-2
No files found.
alphamind/data/engines/sqlengine.py
View file @
8839d11c
...
...
@@ -376,7 +376,7 @@ class SqlEngine(object):
res
[
'isOpen'
]
=
df
.
isOpen
.
astype
(
bool
)
res
=
res
.
loc
[
ref_date
]
res
.
index
=
list
(
range
(
len
(
res
)))
return
df
.
drop_duplicates
([
'trade_date'
,
'code'
])
return
res
.
drop_duplicates
([
'trade_date'
,
'code'
])
def
fetch_factor_range
(
self
,
universe
:
Universe
,
...
...
alphamind/tests/data/engines/test_sql_engine.py
View file @
8839d11c
...
...
@@ -56,7 +56,9 @@ class TestSqlEngine(unittest.TestCase):
self
.
assertListEqual
(
codes
,
list
(
df
.
code
.
values
))
def
test_sql_engine_fetch_codes_range
(
self
):
ref_dates
=
makeSchedule
(
'2017-01-01'
,
'2017-06-30'
,
'60b'
,
'china.sse'
)
ref_dates
=
makeSchedule
(
advanceDateByCalendar
(
'china.sse'
,
self
.
ref_date
,
'-6m'
),
self
.
ref_date
,
'60b'
,
'china.sse'
)
universe
=
Universe
(
'custom'
,
[
'zz500'
,
'zz1000'
])
codes
=
self
.
engine
.
fetch_codes_range
(
universe
,
dates
=
ref_dates
)
...
...
@@ -374,7 +376,7 @@ class TestSqlEngine(unittest.TestCase):
cols
=
sorted
(
ind_matrix
.
columns
[
2
:]
.
tolist
())
series
=
(
ind_matrix
[
cols
]
*
np
.
array
(
range
(
1
,
len
(
cols
)
+
1
)))
.
sum
(
axis
=
1
)
df3
[
'cat'
]
=
series
df3
[
'cat'
]
=
series
.
values
expected_rank
=
df3
[[
'ROE'
,
'cat'
]]
.
groupby
(
'cat'
)
.
transform
(
lambda
x
:
rankdata
(
x
.
values
)
-
1.
)
expected_rank
[
np
.
isnan
(
df3
.
ROE
)]
=
np
.
nan
...
...
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