diff --git a/dabo/analyze.sh b/dabo/analyze.sh index 8a7a513..d9890ff 100755 --- a/dabo/analyze.sh +++ b/dabo/analyze.sh @@ -109,6 +109,8 @@ mkdir "analyze-${analyzedate}" cp dabo-bot.conf analyze.conf analyze-${analyzedate}/ cp -r strategies analyze-${analyzedate}/ +analyzecounter=0 + for file in $@ do echo "${file}" | egrep -q "BALANCE|MSCI-WORLD-INDEX" && continue @@ -120,13 +122,14 @@ do continue fi - if [ "${ANALYZE_BATCH}" -eq "0" ] then echo -n " \"analyze ${file}\"" >>/tmp/parallel-$$ else analyze ${file} fi + analyzecounter=$((analyzecounter+1)) + done if [ "${ANALYZE_BATCH}" -eq "0" ] @@ -138,8 +141,7 @@ then fi - -echo "OVERALL RESULT: $(cat ${g_tmp}/overall-result-* | awk '{ SUM += $1 } END { printf("%2.2f", SUM) }')%" | tee analyze-${analyzedate}/overall-result.log +echo "OVERALL RESULT: $(cat ${g_tmp}/overall-result-* | awk "{ SUM += \$1 / ${analyzecounter} } END { printf(\"%2.2f\", SUM) }')%" | tee analyze-${analyzedate}/overall-result.log cat analyze-${analyzedate}/*.history.csv.log >analyze-${analyzedate}/analyze-overall.log echo "" | tee -a analyze-${analyzedate}/overall-result.log echo "Trades: $(grep "BUY: " analyze-${analyzedate}/analyze-overall.log | wc -l)" | tee -a analyze-${analyzedate}/overall-result.log