diff --git a/.vs/AAMariam-Trading-Bot/v15/.suo b/.vs/AAMariam-Trading-Bot/v15/.suo index 86e0cfb7e..ad39587d6 100644 Binary files a/.vs/AAMariam-Trading-Bot/v15/.suo and b/.vs/AAMariam-Trading-Bot/v15/.suo differ diff --git a/Trading-Process/User.Bot.js b/Trading-Process/User.Bot.js index 997a9d5ce..102bcc98e 100644 --- a/Trading-Process/User.Bot.js +++ b/Trading-Process/User.Bot.js @@ -56,7 +56,7 @@ */ - businessLogic(onDone); + decideWhatToDo(onDone); function onDone(err) { try { @@ -176,7 +176,9 @@ assistant.putPosition("buy", rate, amountA, amountB, callBack); - } else { + } + + if (balanceB > 0) { amountB = balanceB; amountB = Number(amountB.toFixed(8)); diff --git a/this.bot.config.json b/this.bot.config.json index 111cd1faf..4dd8dffce 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -21,8 +21,8 @@ }, "backtest": { "run": "false", - "beginDatetime": "2018-03-12T16:00:00.000Z", - "endDatetime": "2018-03-12T16:15:00.000Z", + "beginDatetime": "2018-04-12T16:00:00.000Z", + "endDatetime": "2018-04-12T16:15:00.000Z", "waitTime": 1000 }, "competition": { @@ -70,6 +70,17 @@ "product": "Candles", "dataSet": "Multi-Period-Daily", "dataSetVersion": "dataSet.V1" + }, + { + "devTeam": "AAMasters", + "bot": "AABruce", + "botVersion": { + "major": 1, + "minor": 0 + }, + "product": "Candles", + "dataSet": "One-Min", + "dataSetVersion": "dataSet.V1" } ] }