Sik/tradingbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make code simple

Browse Source
This commit is contained in:
Sik Yoon 2024-05-17 23:28:06 +09:00
parent abde76e875
commit 5ed1dc4f6a
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/strategy_team/strategy_008.rs
View File

@ -58,6 +58,7 @@ pub async fn list_up_for_buy(
let mut wprs50 = wiliams_percent_r(50, &alldata.rt_price_30m_vec, &filtered_data).await?; let mut wprs50 = wiliams_percent_r(50, &alldata.rt_price_30m_vec, &filtered_data).await?;
let server_epoch = get_server_epoch().await; let server_epoch = get_server_epoch().await;
for (symbol, values) in &mut filtered_data { for (symbol, values) in &mut filtered_data {
let mut do_buy = false;
if let (Some(wpr200_vec), Some(wpr50_vec)) = (wprs200.get(symbol), wprs50.get(symbol)) { if let (Some(wpr200_vec), Some(wpr50_vec)) = (wprs200.get(symbol), wprs50.get(symbol)) {
if wpr200_vec.len() > 15 if wpr200_vec.len() > 15
&& wpr50_vec.len() > 15 && wpr50_vec.len() > 15
@ -66,10 +67,11 @@ pub async fn list_up_for_buy(
&& wpr50_vec.last().unwrap().close_time > server_epoch && wpr50_vec.last().unwrap().close_time > server_epoch
&& wpr50_vec.last().unwrap().r_value < -60.0 && wpr50_vec.last().unwrap().r_value < -60.0
{ {
} else { do_buy = true;
keys_to_remove.insert(symbol.clone()); }
} }
} else {
if do_buy == false {
keys_to_remove.insert(symbol.clone()); keys_to_remove.insert(symbol.clone());
} }
} }
@ -85,6 +87,7 @@ pub async fn list_up_for_buy(
let tema_300 = tema(300, &alldata.rt_price_30m_vec, &filtered_data).await?; let tema_300 = tema(300, &alldata.rt_price_30m_vec, &filtered_data).await?;
let server_epoch = get_server_epoch().await; let server_epoch = get_server_epoch().await;
for (symbol, values) in &mut filtered_data { for (symbol, values) in &mut filtered_data {
let mut do_buy = false;
if let (Some(tema100_vec), Some(tema200_vec), Some(tema300_vec)) = ( if let (Some(tema100_vec), Some(tema200_vec), Some(tema300_vec)) = (
tema_100.get(symbol), tema_100.get(symbol),
tema_200.get(symbol), tema_200.get(symbol),
@ -113,13 +116,12 @@ pub async fn list_up_for_buy(
&& tema200_vec[tema200_vec.len() - 3].tema_value && tema200_vec[tema200_vec.len() - 3].tema_value
< tema100_vec[tema100_vec.len() - 3].tema_value < tema100_vec[tema100_vec.len() - 3].tema_value
{ {
} else { do_buy = true;
keys_to_remove.insert(symbol.clone()); }
}
} else {
keys_to_remove.insert(symbol.clone());
} }
} else { }
if do_buy == false {
keys_to_remove.insert(symbol.clone()); keys_to_remove.insert(symbol.clone());
} }
} }
@ -131,6 +133,7 @@ pub async fn list_up_for_buy(
let supertrend_30m_map = let supertrend_30m_map =
supertrend(10, 3.0, true, &alldata.rt_price_30m_vec, &filtered_data).await?; supertrend(10, 3.0, true, &alldata.rt_price_30m_vec, &filtered_data).await?;
for (symbol, values) in &mut filtered_data { for (symbol, values) in &mut filtered_data {
let mut do_buy = false;
if let (Some(supertrend_vec), Some(rt_price_vec)) = ( if let (Some(supertrend_vec), Some(rt_price_vec)) = (
supertrend_30m_map.get(symbol), supertrend_30m_map.get(symbol),
alldata.rt_price_30m_vec.get(symbol), alldata.rt_price_30m_vec.get(symbol),
@ -162,6 +165,7 @@ pub async fn list_up_for_buy(
decimal_mul(decimal_sub(current_price, values.stoploss), dec!(10.0)), decimal_mul(decimal_sub(current_price, values.stoploss), dec!(10.0)),
current_price, current_price,
); );
do_buy = true;
} else if supertrend_vec.last().unwrap().area == SuperTrendArea::DOWN } else if supertrend_vec.last().unwrap().area == SuperTrendArea::DOWN
&& band_value > current_price && band_value > current_price
&& band_value > open_price && band_value > open_price
@ -173,13 +177,12 @@ pub async fn list_up_for_buy(
decimal_mul(decimal_sub(open_price, values.stoploss), dec!(10.0)), decimal_mul(decimal_sub(open_price, values.stoploss), dec!(10.0)),
current_price, current_price,
); );
} else { do_buy = true;
keys_to_remove.insert(symbol.clone());
} }
} else {
keys_to_remove.insert(symbol.clone());
} }
} else { }
if do_buy == false {
keys_to_remove.insert(symbol.clone()); keys_to_remove.insert(symbol.clone());
} }
} }
@ -291,6 +294,7 @@ pub async fn list_up_for_buy(
let mut keys_to_remove: HashSet<String> = HashSet::new(); let mut keys_to_remove: HashSet<String> = HashSet::new();
let server_epoch = get_server_epoch().await; let server_epoch = get_server_epoch().await;
for (symbol, values) in &mut filtered_data { for (symbol, values) in &mut filtered_data {
let mut do_buy = false;
if let Some(rt_price_vec) = alldata.rt_price_30m_vec.get(symbol) { if let Some(rt_price_vec) = alldata.rt_price_30m_vec.get(symbol) {
if rt_price_vec.last().unwrap().close_time > server_epoch && rt_price_vec.len() >= 6 { if rt_price_vec.last().unwrap().close_time > server_epoch && rt_price_vec.len() >= 6 {
let mut opclo_vec: Vec<f64> = Vec::new(); let mut opclo_vec: Vec<f64> = Vec::new();
@ -316,20 +320,22 @@ pub async fn list_up_for_buy(
let difference = (mean - rt_price_vec.last().unwrap().open_price).abs(); let difference = (mean - rt_price_vec.last().unwrap().open_price).abs();
if current_price < rt_price_vec.last().unwrap().open_price + (0.5 * difference) { if current_price < rt_price_vec.last().unwrap().open_price + (0.5 * difference) {
} else { do_buy = true;
keys_to_remove.insert(symbol.clone()); }
}
} else {
keys_to_remove.insert(symbol.clone());
} }
} else { }
if do_buy == false {
keys_to_remove.insert(symbol.clone()); keys_to_remove.insert(symbol.clone());
} }
} }
remove_keys(&mut filtered_data, keys_to_remove).await; remove_keys(&mut filtered_data, keys_to_remove).await;
let final_filtered_data = duplicate_filter(8, &filtered_data).await?; let final_filtered_data = duplicate_filter(8, &filtered_data).await?;
insert_pre_suggested_coins(8, false, &final_filtered_data).await;
if !final_filtered_data.is_empty() {
insert_pre_suggested_coins(8, false, &final_filtered_data).await;
}
Ok(()) Ok(())
} }