Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
F
fund_report
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
彭熊
fund_report
Commits
1b407b48
Commit
1b407b48
authored
4 years ago
by
赵杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nan充值为0
parent
a8ad4861
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
result_service_v2.py
app/service/result_service_v2.py
+3
-3
week_evaluation.py
app/utils/week_evaluation.py
+2
-0
No files found.
app/service/result_service_v2.py
View file @
1b407b48
...
@@ -91,7 +91,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
...
@@ -91,7 +91,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
# 波动率
# 波动率
volatility_
=
volatility
(
resample_df
[
"cum_return_ratio"
],
n_freq
)
volatility_
=
volatility
(
resample_df
[
"cum_return_ratio"
],
n_freq
)
folio_report_data
[
"volatility"
]
=
float
(
volatility_
)
folio_report_data
[
"volatility"
]
=
float
(
volatility_
)
if
not
math
.
isnan
(
volatility_
)
else
0.0
# 最大回撤
# 最大回撤
drawdown
=
max_drawdown
(
resample_df
[
"cum_return_ratio"
])
drawdown
=
max_drawdown
(
resample_df
[
"cum_return_ratio"
])
...
@@ -104,7 +104,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
...
@@ -104,7 +104,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
sharpe
=
sharpe_ratio
(
exc
,
sim
,
n_freq
)
sharpe
=
sharpe_ratio
(
exc
,
sim
,
n_freq
)
except
ZeroDivisionError
:
except
ZeroDivisionError
:
sharpe
=
0.0
sharpe
=
0.0
folio_report_data
[
"sharpe"
]
=
float
(
sharpe
)
folio_report_data
[
"sharpe"
]
=
float
(
sharpe
)
if
not
math
.
isnan
(
sharpe
)
else
0.0
# 期末资产
# 期末资产
ending_assets
=
cumulative_profit
+
total_cost
ending_assets
=
cumulative_profit
+
total_cost
...
@@ -581,7 +581,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
...
@@ -581,7 +581,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
# 波动率
# 波动率
volatility_
=
volatility
(
fund_nav_df
[
"cum_return_ratio"
],
n_freq
)
volatility_
=
volatility
(
fund_nav_df
[
"cum_return_ratio"
],
n_freq
)
result
[
"volatility"
]
=
float
(
volatility_
)
result
[
"volatility"
]
=
float
(
volatility_
)
if
not
math
.
isnan
(
volatility_
)
else
0.0
# 最大回撤
# 最大回撤
drawdown
=
max_drawdown
(
fund_nav_df
[
"cum_return_ratio"
])
drawdown
=
max_drawdown
(
fund_nav_df
[
"cum_return_ratio"
])
...
...
This diff is collapsed.
Click to expand it.
app/utils/week_evaluation.py
View file @
1b407b48
...
@@ -53,6 +53,8 @@ def sharpe_ratio(excess_return, simple_return, n):
...
@@ -53,6 +53,8 @@ def sharpe_ratio(excess_return, simple_return, n):
d
=
math
.
sqrt
(
n
)
*
excess_return
/
simple_return
.
std
(
ddof
=
1
)
d
=
math
.
sqrt
(
n
)
*
excess_return
/
simple_return
.
std
(
ddof
=
1
)
if
d
==
float
(
"inf"
)
or
d
==
float
(
"-inf"
):
if
d
==
float
(
"inf"
)
or
d
==
float
(
"-inf"
):
return
0.0
return
0.0
if
math
.
isnan
(
d
):
return
0.0
except
:
except
:
return
0.0
return
0.0
return
d
return
d
...
...
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