Commit 91094cf6 authored by pengxiong@wealthgrow.cn's avatar pengxiong@wealthgrow.cn

Merge remote-tracking branch 'origin/dev' into dev

parents 5f3eb33e 71396163
...@@ -154,7 +154,7 @@ class DataIntegrate: ...@@ -154,7 +154,7 @@ class DataIntegrate:
self.volatility = round(group_result["volatility"]*100, 2) self.volatility = round(group_result["volatility"]*100, 2)
self.max_withdrawal = round(group_result["max_drawdown"][0]*100, 2) self.max_withdrawal = round(group_result["max_drawdown"][0]*100, 2)
self.sharpe_ratio = round(group_result["sharpe"], 2) self.sharpe_ratio = round(group_result["sharpe"], 2)
self.cost_of_investment = int(group_result["total_cost"]) # 投资成本 self.cost_of_investment = round(group_result["total_cost"]/10000.0, 2) # 投资成本
self.final_balance = int(group_result["total_cost"] + group_result["cumulative_profit"]) # 期末资产 self.final_balance = int(group_result["total_cost"] + group_result["cumulative_profit"]) # 期末资产
self.total_profit = int(group_result["cumulative_profit"]) # 累计盈利 self.total_profit = int(group_result["cumulative_profit"]) # 累计盈利
......
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