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

Rollback strategist004

Browse Source
This commit is contained in:
Sik Yoon 2023-12-18 02:36:51 +09:00
parent 195ac9cea1
commit 08ef3cf59a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/strategy_team/strategy_004.rs
View File

@ -276,7 +276,7 @@ pub async fn list_up_for_buy(
} }
try_join_all(task_vec).await?; try_join_all(task_vec).await?;
// 6th filtering: 0.5% <= the average amplitude of the latest 10 30m candles <= 1.5% // 6th filtering: 0.5% <= the average amplitude of the latest 10 30m candles <= 1.0%
let filtered_data_5th_c = filtered_data_5th_arc.lock().await.clone(); let filtered_data_5th_c = filtered_data_5th_arc.lock().await.clone();
let mut filtered_data_6th: Vec<FilteredData> = Vec::new(); let mut filtered_data_6th: Vec<FilteredData> = Vec::new();
let mut filtered_data_6th_arc: Arc<Mutex<Vec<FilteredData>>> = let mut filtered_data_6th_arc: Arc<Mutex<Vec<FilteredData>>> =
@ -302,7 +302,7 @@ pub async fn list_up_for_buy(
} }
average_amplitude /= 10.0; average_amplitude /= 10.0;
if 0.005 <= average_amplitude && average_amplitude <= 0.015 { if 0.005 <= average_amplitude && average_amplitude <= 0.01 {
let mut filtered_data_6th_lock = filtered_data_6th_arc_c.lock().await; let mut filtered_data_6th_lock = filtered_data_6th_arc_c.lock().await;
let mut filtered_data = FilteredData::new(); let mut filtered_data = FilteredData::new();
filtered_data.symbol = element.symbol.clone(); filtered_data.symbol = element.symbol.clone();

12
src/strategy_team/strategy_manager.rs
View File

@ -32,7 +32,7 @@ struct Record {
pub async fn execute_list_up_for_buy( pub async fn execute_list_up_for_buy(
all_data: &AllData, all_data: &AllData,
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> { ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
// let mut task_vec = Vec::new(); let mut task_vec = Vec::new();
// let all_data_c3 = all_data.clone(); // let all_data_c3 = all_data.clone();
let all_data_c4 = all_data.clone(); let all_data_c4 = all_data.clone();
// strategist_001(all_data).await?; // strategist_001(all_data).await?;
@ -40,15 +40,15 @@ pub async fn execute_list_up_for_buy(
// task_vec.push(tokio::spawn(async move { // task_vec.push(tokio::spawn(async move {
// crate::strategy_team::strategy_003::list_up_for_buy(all_data_c3).await; // crate::strategy_team::strategy_003::list_up_for_buy(all_data_c3).await;
// })); // }));
// task_vec.push(tokio::spawn(async move { task_vec.push(tokio::spawn(async move {
// crate::strategy_team::strategy_004::list_up_for_buy(all_data_c4).await; crate::strategy_team::strategy_004::list_up_for_buy(all_data_c4).await;
// })); }));
// strategist_004(all_data).await?; // strategist_004(all_data).await?;
// strategist_005(all_data).await?; // strategist_005(all_data).await?;
// strategist_006(all_data).await?; // strategist_006(all_data).await?;
crate::strategy_team::strategy_test::strategist_test(all_data_c4).await; // crate::strategy_team::strategy_test::strategist_test(all_data_c4).await;
// try_join_all(task_vec).await?; try_join_all(task_vec).await?;
Ok(()) Ok(())
} }