|
@@ -23,13 +23,12 @@ cal_method = 2;
|
|
|
*/
|
|
|
|
|
|
// calculate navs
|
|
|
-tb_portfolio_ret = cal_portfolio_return(portfolio_ids, very_old_date, cal_method);
|
|
|
-tb_portfolio_ret.sortBy!(['portfolio_id', 'price_date'], [1, 1]);
|
|
|
+tb_portfolio_nav = cal_portfolio_nav(portfolio_ids, very_old_date, cal_method);
|
|
|
+tb_portfolio_nav.sortBy!(['portfolio_id', 'price_date'], [1, 1]);
|
|
|
|
|
|
// calculate indicators
|
|
|
-end_day = 2024.08.31
|
|
|
-
|
|
|
-tb_indicators = cal_portfolio_indicators(portfolio_ids, end_day, cal_method, true);
|
|
|
-
|
|
|
-select * from tb_indicators[0]
|
|
|
+d_indicators = cal_portfolio_indicators(portfolio_ids, 2024.08.31, cal_method, true);
|
|
|
+d_bfi_indicators = cal_portfolio_bfi_indicators(portfolio_ids, 2024.08.31, cal_method, true);
|
|
|
|
|
|
+select * from d_indicators['PBI-1Y']
|
|
|
+select * from d_bfi_indicators['PBI-INCEP']
|