From d502a4e28be6a771bd977cd0219e307e1a67af41 Mon Sep 17 00:00:00 2001 From: olli Date: Tue, 28 Nov 2023 16:57:22 +0100 Subject: [PATCH] analyue to analyze.sh --- dabo/analyze.sh | 15 +++++++++++ dabo/functions/check_sell_conditions.sh | 36 ++++++++++++------------- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dabo/analyze.sh b/dabo/analyze.sh index da3611c..91c5fe1 100755 --- a/dabo/analyze.sh +++ b/dabo/analyze.sh @@ -118,6 +118,21 @@ function analyze { check_buy_conditions ${g_tmp}/${tmpfile} #| tee -a ${g_tmp}/output-${tmpfile} fi fi + + if [ -n "${f_SELL}" ] + then + echo "SELL: ${f_date} ${f_SELL}" + g_percentage-diff ${BUY_PRICE} ${f_price} + g_calc "${g_percentage_diff_result}-${FEE}" + result=${g_calc_result} + echo "${result}" >>${g_tmp}/result-${tmpfile} + rm -f "${f_TRADE_HIST_FILE}" + rm -f "${f_TRADE_HIST_FILE_INTERIM}" + unset f_open_trade + echo "RESULT: ${result}% (${BUY_PRICE} -> ${f_price})" + fi + + ## Chart Part #local f_intrade=0 #local f_score=${f_buy_score} diff --git a/dabo/functions/check_sell_conditions.sh b/dabo/functions/check_sell_conditions.sh index 3d2843f..34b3948 100644 --- a/dabo/functions/check_sell_conditions.sh +++ b/dabo/functions/check_sell_conditions.sh @@ -99,24 +99,24 @@ function check_sell_conditions { fi fi - # ANALYZE - if [ -n "${f_SELL}" ] && [ -z "${BOT}" ] - then - echo "SELL: ${f_date} ${f_SELL}" -# echo "${csv_headline},Marketperformace -#${f_last_line}" | cut -d, -f 2-22 | perl -pe 's/([0-9].[0-9][0-9][0-9][0-9][0-9][0-9])[0-9]+/$1/g' | perl -pe 's/((?<=,)|(?<=^)),/ ,/g;' | column -t -s, -# echo "${f_SELL}" - g_percentage-diff ${BUY_PRICE} ${f_price} - #result=${g_percentage_diff_result} - g_calc "${g_percentage_diff_result}-${FEE}" - result=${g_calc_result} - echo "${result}" >>${g_tmp}/result-${tmpfile} - rm -f "${f_TRADE_HIST_FILE}" - rm -f "${f_TRADE_HIST_FILE_INTERIM}" - unset f_open_trade - #echo "RESULT: ${result}% (${BUY_PRICE} -> ${current})" - echo "RESULT: ${result}% (${BUY_PRICE} -> ${f_price})" - fi +# # ANALYZE +# if [ -n "${f_SELL}" ] && [ -z "${BOT}" ] +# then +# echo "SELL: ${f_date} ${f_SELL}" +## echo "${csv_headline},Marketperformace +##${f_last_line}" | cut -d, -f 2-22 | perl -pe 's/([0-9].[0-9][0-9][0-9][0-9][0-9][0-9])[0-9]+/$1/g' | perl -pe 's/((?<=,)|(?<=^)),/ ,/g;' | column -t -s, +## echo "${f_SELL}" +# g_percentage-diff ${BUY_PRICE} ${f_price} +# #result=${g_percentage_diff_result} +# g_calc "${g_percentage_diff_result}-${FEE}" +# result=${g_calc_result} +# echo "${result}" >>${g_tmp}/result-${tmpfile} +# rm -f "${f_TRADE_HIST_FILE}" +# rm -f "${f_TRADE_HIST_FILE_INTERIM}" +# unset f_open_trade +# #echo "RESULT: ${result}% (${BUY_PRICE} -> ${current})" +# echo "RESULT: ${result}% (${BUY_PRICE} -> ${f_price})" +# fi }