Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
FactorCalculate
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
李煜
FactorCalculate
Commits
189f5447
Commit
189f5447
authored
Jul 18, 2019
by
李煜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rm bk file
parent
c886f704
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
268 deletions
+2
-268
factor_scale_value.py
client/factor_scale_value.py
+2
-2
factor_cash_flow_bak.py
factor/factor_cash_flow_bak.py
+0
-266
No files found.
client/factor_scale_value.py
View file @
189f5447
...
...
@@ -117,7 +117,7 @@ class FactorScaleValue(FactorBase):
return
valuation_sets
,
ttm_factor_sets
,
income_sets
,
balance_set
def
prepa
er
_calculate
(
self
,
trade_date
):
def
prepa
re
_calculate
(
self
,
trade_date
):
valuation_sets
,
ttm_factor_sets
,
income_sets
,
balance_set
=
self
.
get_basic_data
(
trade_date
)
# valuation_sets = pd.merge(valuation_sets, income_sets, on='symbol')
valuation_sets
=
pd
.
merge
(
valuation_sets
,
ttm_factor_sets
,
on
=
'symbol'
)
...
...
@@ -136,7 +136,7 @@ class FactorScaleValue(FactorBase):
trade_date_sets
=
self
.
_trade_date
.
trade_date_sets_ago
(
start_date
,
end_date
,
count
)
for
trade_date
in
trade_date_sets
:
print
(
'因子计算日期:
%
s'
%
trade_date
)
self
.
prepa
er
_calculate
(
trade_date
)
self
.
prepa
re
_calculate
(
trade_date
)
print
(
'----->'
)
...
...
factor/factor_cash_flow_bak.py
deleted
100644 → 0
View file @
c886f704
This diff is collapsed.
Click to expand it.
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