@@ -16,8 +16,8 @@ def test_combine_metrics(self):
1616 (1.5 , datetime (2020 , 6 , 30 )),
1717 (2.0 , datetime (2020 , 12 , 31 )),
1818 ],
19- growth = 1000.0 ,
20- growth_percentage = 100.0 ,
19+ total_growth = 1000.0 ,
20+ total_growth_percentage = 100.0 ,
2121 total_net_gain = 1000.0 ,
2222 total_net_gain_percentage = 100.0 ,
2323 final_value = 2000.0 ,
@@ -43,10 +43,10 @@ def test_combine_metrics(self):
4343 trades_per_year = 50 ,
4444 trade_per_day = 0.2 ,
4545 exposure_ratio = 0.75 ,
46- trades_average_gain = 200 ,
47- trades_average_gain_percentage = 0.1 ,
48- trades_average_loss = 100 ,
49- trades_average_loss_percentage = 0.1 ,
46+ average_trade_gain = 200 ,
47+ average_trade_gain_percentage = 0.1 ,
48+ average_trade_loss = 100 ,
49+ average_trade_loss_percentage = 0.1 ,
5050 best_trade = Trade (id = 1 , open_price = 100 ,
5151 opened_at = datetime (2020 , 1 , 1 ),
5252 closed_at = datetime (2020 , 2 , 1 ), orders = [],
@@ -85,8 +85,8 @@ def test_combine_metrics(self):
8585 (1.2 , datetime (2020 , 6 , 30 )),
8686 (1.4 , datetime (2020 , 12 , 31 )),
8787 ],
88- growth = 400.0 ,
89- growth_percentage = 40.0 ,
88+ total_growth = 400.0 ,
89+ total_growth_percentage = 40.0 ,
9090 total_net_gain = 400.0 ,
9191 total_net_gain_percentage = 40.0 ,
9292 final_value = 1400.0 ,
@@ -112,10 +112,10 @@ def test_combine_metrics(self):
112112 trades_per_year = 30 ,
113113 trade_per_day = 0.12 ,
114114 exposure_ratio = 0.6 ,
115- trades_average_gain_percentage = 0.07 ,
116- trades_average_gain = 140.0 ,
117- trades_average_loss = - 80.0 ,
118- trades_average_loss_percentage = - 0.04 ,
115+ average_trade_gain_percentage = 0.07 ,
116+ average_trade_gain = 140.0 ,
117+ average_trade_loss = - 80.0 ,
118+ average_trade_loss_percentage = - 0.04 ,
119119 best_trade = Trade (id = 3 , open_price = 120 ,
120120 opened_at = datetime (2020 , 5 , 1 ),
121121 closed_at = datetime (2020 , 6 , 1 ), orders = [],
@@ -151,6 +151,6 @@ def test_combine_metrics(self):
151151
152152 self .assertEqual (700 , combined .total_net_gain )
153153 self .assertAlmostEqual (70.0 , combined .total_net_gain_percentage )
154- self .assertAlmostEqual (70.0 , combined .growth_percentage )
155- self .assertEqual (700.0 , combined .growth )
154+ self .assertAlmostEqual (70.0 , combined .total_growth_percentage )
155+ self .assertEqual (700.0 , combined .total_growth )
156156 self .assertEqual (0.5 , combined .win_rate )
0 commit comments