diff --git a/dabo/analyze.sh b/dabo/analyze.sh
index a1deea3..1cff9f6 100755
--- a/dabo/analyze.sh
+++ b/dabo/analyze.sh
@@ -6,9 +6,9 @@ rm -r /tmp/parallel-* /tmp/overall-result-* /tmp/g_analyze.sh-*
. /etc/bash/gaboshlib.include
-# Chart Part
-. dabo/functions/genchart.sh
-# Chart Part End
+## Chart Part
+#. dabo/functions/genchart.sh
+## Chart Part End
g_nice
@@ -54,7 +54,7 @@ function analyze {
rm -rf ${g_tmp}/output-${tmpfile}
# Chart Part
- echo "$(head -n1 ${file}),Market Perrormance,Score,Buy Score,Sell Score,InTrade,Inetrim Result" >analyze-${analyzedate}/chart-${tmpfile}
+ #echo "$(head -n1 ${file}),Market Perrormance,Score,Buy Score,Sell Score,InTrade,Inetrim Result" >analyze-${analyzedate}/chart-${tmpfile}
# Chart Part End
# create market performance array of timeframe
@@ -114,30 +114,26 @@ function analyze {
fi
fi
## Chart Part
- local f_intrade=0
- local f_score=${f_buy_score}
- local f_interim="0"
- [ -z "${f_buy_score}" ] && f_buy_score=0
- if [ -z "${f_sell_score}" ]
- then
- f_sell_score=0
- else
- f_score=${f_sell_score}
- f_intrade=1
- #if [ -s ${g_tmp}/interim-${tmpfile} ]
- #then
- #f_interim=$(tail -n1 ${g_tmp}/interim-${tmpfile})
- #g_calc "${f_interim}-${FEE}"
- #f_interim=${g_calc_result}
- f_interim=${f_real_result}
- #fi
- fi
- f_chart_array+=("$f_line,${f_market_performance},${f_score},${f_buy_score},${f_sell_score},${f_intrade},${f_interim}")
- #echo "$f_line,${f_market_performance},${f_score},${f_buy_score},${f_sell_score},${f_intrade},${f_interim}" >>analyze-${analyzedate}/chart-${tmpfile}
+ #local f_intrade=0
+ #local f_score=${f_buy_score}
+ #local f_interim="0"
+ #[ -z "${f_buy_score}" ] && f_buy_score=0
+ #if [ -z "${f_sell_score}" ]
+ #then
+ # f_sell_score=0
+ #else
+ # f_score=${f_sell_score}
+ # f_intrade=1
+ # f_interim=${f_real_result}
+ #fi
+ #f_chart_array+=("$f_line,${f_market_performance},${f_score},${f_buy_score},${f_sell_score},${f_intrade},${f_interim}")
## Chart Part End
done
+
+ ## Chart Part
#printf '%s\n' "${f_chart_array[@]}" >>analyze-${analyzedate}/chart-${tmpfile}
#cat analyze-${analyzedate}/chart-${tmpfile}
+ ## Chart Part End
# sell at the end to have a final result.
#if [ -f ${g_tmp}/open-${tmpfile} ]
@@ -173,33 +169,33 @@ function analyze {
cat ${g_tmp}/output-${tmpfile} >"analyze-${analyzedate}/${tmpfile}.log"
- # Chart Part
- if [ -s "analyze-${analyzedate}/chart-${tmpfile}" ]
- then
- #g_echo "generating chart for $file from analyze-${analyzedate}/chart-${tmpfile}"
- echo "
-
-
-
-
-analyze.sh ${ANALYZE_TIME}
-
-
-analyze.sh ${ANALYZE_TIME}
-" >analyze-${analyzedate}/chart-${tmpfile}.html
- echo "Price, EMA, Levels" >>analyze-${analyzedate}/chart-${tmpfile}.html
- #genchart analyze-${analyzedate}/chart-${tmpfile} 500 2,25,26,27,28,29,30,31,32,33,34,35,4,36,37,38,39 green,DarkSlateGrey,DarkSlateGrey,Gold,DarkOrange,DarkOrange,GoldenRod,GoldenRod,GoldenRod,GoldenRod,DarkOrange,DarkOrange,MidnightBlue,Indigo,DarkSlateBlue,DodgerBlue,DeepSkyBlue >>analyze-${analyzedate}/chart-${tmpfile}.html
- echo "Score" >>analyze-${analyzedate}/chart-${tmpfile}.html
- genchart analyze-${analyzedate}/chart-${tmpfile} 500 42,46,45,41 Green,Red,Orange >>analyze-${analyzedate}/chart-${tmpfile}.html
- #echo "Sell Score" >>analyze-${analyzedate}/chart-${tmpfile}.html
- #genchart analyze-${analyzedate}/chart-${tmpfile} 500 42 green,blue >>analyze-${analyzedate}/chart-${tmpfile}.html
- echo "MACD" >>analyze-${analyzedate}/chart-${tmpfile}.html
- genchart analyze-${analyzedate}/chart-${tmpfile} 500 8,6,7 >>analyze-${analyzedate}/chart-${tmpfile}.html
- echo "RSIs" >>analyze-${analyzedate}/chart-${tmpfile}.html
- genchart analyze-${analyzedate}/chart-${tmpfile} 500 10,11,12,14,15,16,17,13 >>analyze-${analyzedate}/chart-${tmpfile}.html
- echo "">>analyze-${analyzedate}/chart-${tmpfile}.html
- fi
- # Chart Part END
+ ## Chart Part
+# if [ -s "analyze-${analyzedate}/chart-${tmpfile}" ]
+# then
+# #g_echo "generating chart for $file from analyze-${analyzedate}/chart-${tmpfile}"
+# echo "
+#
+#
+#
+#
+#analyze.sh ${ANALYZE_TIME}
+#
+#
+#analyze.sh ${ANALYZE_TIME}
+#" >analyze-${analyzedate}/chart-${tmpfile}.html
+# echo "Price, EMA, Levels" >>analyze-${analyzedate}/chart-${tmpfile}.html
+# genchart analyze-${analyzedate}/chart-${tmpfile} 500 2,25,26,27,28,29,30,31,32,33,34,35,4,36,37,38,39 green,DarkSlateGrey,DarkSlateGrey,Gold,DarkOrange,DarkOrange,GoldenRod,GoldenRod,GoldenRod,GoldenRod,DarkOrange,DarkOrange,MidnightBlue,Indigo,DarkSlateBlue,DodgerBlue,DeepSkyBlue >>analyze-${analyzedate}/chart-${tmpfile}.html
+# echo "Score" >>analyze-${analyzedate}/chart-${tmpfile}.html
+# genchart analyze-${analyzedate}/chart-${tmpfile} 500 42,46,45,41 Green,Red,Orange >>analyze-${analyzedate}/chart-${tmpfile}.html
+# #echo "Sell Score" >>analyze-${analyzedate}/chart-${tmpfile}.html
+# #genchart analyze-${analyzedate}/chart-${tmpfile} 500 42 green,blue >>analyze-${analyzedate}/chart-${tmpfile}.html
+# echo "MACD" >>analyze-${analyzedate}/chart-${tmpfile}.html
+# genchart analyze-${analyzedate}/chart-${tmpfile} 500 8,6,7 >>analyze-${analyzedate}/chart-${tmpfile}.html
+# echo "RSIs" >>analyze-${analyzedate}/chart-${tmpfile}.html
+# genchart analyze-${analyzedate}/chart-${tmpfile} 500 10,11,12,14,15,16,17,13 >>analyze-${analyzedate}/chart-${tmpfile}.html
+# echo "">>analyze-${analyzedate}/chart-${tmpfile}.html
+# fi
+ ## Chart Part END
}
for conf in dabo-bot.conf analyze.conf
@@ -221,9 +217,9 @@ cp -r strategies analyze-${analyzedate}/
analyzecounter=0
-# Chart Part
-[ -e data/charts.min.css ] || wget -q https://raw.githubusercontent.com/ChartsCSS/charts.css/main/dist/charts.min.css -O data/charts.min.css
-# Chart Part End
+## Chart Part
+#[ -e data/charts.min.css ] || wget -q https://raw.githubusercontent.com/ChartsCSS/charts.css/main/dist/charts.min.css -O data/charts.min.css
+## Chart Part End
for file in $@
do