|
@@ -106,7 +106,7 @@ pub async fn generate_msv(query_value: Value) -> HttpResponse {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 将trades转换为具体指标
|
|
// 将trades转换为具体指标
|
|
|
-pub fn generate_msv_by_trades(mut trades: Vec<Trade>, mills_back: Decimal, trt: i32, trt_mills_back: Decimal) -> Value {
|
|
|
|
|
|
|
+pub fn generate_msv_by_trades(mut trades: Vec<Trade>, mills_back: Decimal, _trt: i32, trt_mills_back: Decimal) -> Value {
|
|
|
let mut msv_data: Vec<Vec<Decimal>> = vec![];
|
|
let mut msv_data: Vec<Vec<Decimal>> = vec![];
|
|
|
let mut tr_data: Vec<Vec<Decimal>> = vec![];
|
|
let mut tr_data: Vec<Vec<Decimal>> = vec![];
|
|
|
|
|
|
|
@@ -181,8 +181,8 @@ pub fn generate_msv_by_trades(mut trades: Vec<Trade>, mills_back: Decimal, trt:
|
|
|
|
|
|
|
|
// 生成速率曲线
|
|
// 生成速率曲线
|
|
|
// 计算区间的预定价格
|
|
// 计算区间的预定价格
|
|
|
- let mut trades_count = 0;
|
|
|
|
|
- let mut high_rate = Decimal::NEGATIVE_ONE;
|
|
|
|
|
|
|
+ // let mut trades_count = 0;
|
|
|
|
|
+ let mut high_rate = Decimal::ZERO;
|
|
|
let mut trt_range_index = index;
|
|
let mut trt_range_index = index;
|
|
|
loop {
|
|
loop {
|
|
|
// 第0个就不用计算
|
|
// 第0个就不用计算
|
|
@@ -198,10 +198,10 @@ pub fn generate_msv_by_trades(mut trades: Vec<Trade>, mills_back: Decimal, trt:
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 判断是否满足高速率条件
|
|
// 判断是否满足高速率条件
|
|
|
- trades_count += 1;
|
|
|
|
|
- if trades_count >= trt {
|
|
|
|
|
- high_rate = Decimal::ONE;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // trades_count += 1;
|
|
|
|
|
+ // if trades_count >= trt {
|
|
|
|
|
+ high_rate += Decimal::ONE;
|
|
|
|
|
+ // }
|
|
|
|
|
|
|
|
trt_range_index -= 1;
|
|
trt_range_index -= 1;
|
|
|
}
|
|
}
|