|
|
@@ -404,9 +404,9 @@ impl Strategy {
|
|
|
|
|
|
let mut msg = String::new();
|
|
|
msg.push_str("当前状态: ");
|
|
|
- msg.push_str(format!("[品种 {}, 现价 {:?}, 定价 {:?}, 偏差 {:?}%, 杠杆 {:?}, 动态{:?}, 最大{:?}, 预测 {:?}, 预估24H成交额 {:?}万], ",
|
|
|
+ msg.push_str(format!("[品种 {}, 现价 {:?}, 定价 {:?}, 偏差 {:?}%, 杠杆 {:?}, 动态{:?}, 预估24H成交额 {:?}万], ",
|
|
|
self.params.pair, self.mp, self.ref_price, price_bias, self.lever_rate,
|
|
|
- self.adjust_lever_rate, self.max_pos_rate, self.predict, self.trade_vol_24h_w).as_str());
|
|
|
+ self.adjust_lever_rate, self.trade_vol_24h_w).as_str());
|
|
|
msg.push_str(format!("[净值 {:?}, Cash {:?}, Coin(价值) {:?}, 日化 {:?}%], ", self.equity, self.cash, value, self.daily_return).as_str());
|
|
|
msg.push_str(format!("[推算利润 {:?}, 盈亏 {:?}%, 做多杠杆 {:?}%, 做多浮盈 {:?}%, 做空杠杆 {:?}%, 做空浮盈 {:?}%], ",
|
|
|
self.local_profit, self.profit, long_pos_leverage, self.long_pos_bias, short_pos_leverage, self.short_pos_bias).as_str());
|
|
|
@@ -1077,7 +1077,7 @@ impl Strategy {
|
|
|
let amount = if predictor.inventory < Decimal::ZERO {
|
|
|
predictor.pos_amount.abs()
|
|
|
} else {
|
|
|
- utils::get_amount_by_min_amount_value(self.min_amount_value, target_buy_price, self.step_size)
|
|
|
+ utils::get_amount_by_min_amount_value(self.cash, target_buy_price, self.step_size)
|
|
|
};
|
|
|
// let amount = if predictor.inventory < Decimal::ZERO {
|
|
|
// // utils::fix_amount(self.step_size * predictor.inventory.abs(), self.step_size)
|
|
|
@@ -1121,7 +1121,7 @@ impl Strategy {
|
|
|
let amount = if predictor.inventory > Decimal::ZERO {
|
|
|
predictor.pos_amount.abs()
|
|
|
} else {
|
|
|
- utils::get_amount_by_min_amount_value(self.min_amount_value, target_sell_price, self.step_size)
|
|
|
+ utils::get_amount_by_min_amount_value(self.cash, target_sell_price, self.step_size)
|
|
|
};
|
|
|
// let amount = if predictor.inventory > Decimal::ZERO {
|
|
|
// if predictor.level >= dec!(3) {
|