Compare commits

..

No commits in common. "3e412615b9c1690ac7f8589fc7f90a1898900df2" and "e5fd834a9d6a9b4bf41a9d7ae74cd76e99d7e761" have entirely different histories.

4 changed files with 7469 additions and 6994 deletions

BIN
bots-values.ods Normal file

Binary file not shown.

View File

@ -41,7 +41,7 @@ set +a
mkdir -p ${BASEPATH}/botdata/asset-histories mkdir -p ${BASEPATH}/botdata/asset-histories
cd ${BASEPATH}/botdata cd ${BASEPATH}/botdata
ECO_ASSETS="DXY DOWJONES SP500 NASDAQ MSCIEAFE 10YRTREASURY GOLD MSCIWORLD OILGAS KRE EUR-USD" ECO_ASSETS="DXY DOWJONES SP500 NASDAQ MSCIEAFE 10YRTREASURY OIL GOLD MSCIWORLD OILGAS KRE EUR-USD"
. ../../dabo-bot.conf . ../../dabo-bot.conf
. ../../dabo-bot.override.conf . ../../dabo-bot.override.conf

View File

@ -40,25 +40,20 @@ function get_values {
# get current prices from exchange # get current prices from exchange
get_symbols_ticker get_symbols_ticker
# get values from csv files # get values from csv files
#f_first=true f_first=true
for f_asset in $f_assets BTC${CURRENCY} $f_eco_assets for f_asset in $f_assets BTC${CURRENCY} $f_eco_assets
do do
# read latest ohlcv data and indicators per timeframe to vars # read latest ohlcv data and indicators per timeframe to vars
for f_time in 5m 15m 1h 4h 1d 1w for f_time in 5m 15m 1h 4h 1d 1w
do do
#f_prefix="${f_asset}_${f_time}_"
#[ "$f_first" = "true" ] && f_prefix="${f_time}_"
f_prefix="${f_time}_"
if [[ "$f_asset" =~ ^ECONOMY- ]]
then
f_prefix="${f_asset}_${f_time}_" f_prefix="${f_asset}_${f_time}_"
[ "$f_first" = "true" ] && f_prefix="${f_time}_"
f_prefix=${f_prefix//-/_} f_prefix=${f_prefix//-/_}
fi
f_histfile="asset-histories/${f_asset}.history.${f_time}.csv" f_histfile="asset-histories/${f_asset}.history.${f_time}.csv"
if ! [ -s "$f_histfile" ] if ! [ -s "$f_histfile" ]
then then
g_echo_warn "file $f_histfile empty or does not exist" g_echo_note "file $f_histfile emty or does not exist"
f_return=1 f_return=1
continue continue
fi fi
@ -95,13 +90,13 @@ function get_values {
fi fi
done done
#unset f_first unset f_first
done done
for i in "${!v[@]}" for i in "${!v[@]}"
do do
echo "\${v[$i]}=${v[$i]}" echo "\${v[$i]} = ${v[$i]}"
done | sort >values.new done | sort >values.new
mv values.new values mv values.new values

File diff suppressed because it is too large Load Diff