diff --git a/.vs/AAMariam-Trading-Bot/v15/.suo b/.vs/AAMariam-Trading-Bot/v15/.suo index 9b96c20a5..cd0aba553 100644 Binary files a/.vs/AAMariam-Trading-Bot/v15/.suo and b/.vs/AAMariam-Trading-Bot/v15/.suo differ diff --git a/Mariam.png b/Mariam.old.png similarity index 100% rename from Mariam.png rename to Mariam.old.png diff --git a/Mariam.png.png b/Mariam.png.png new file mode 100644 index 000000000..3e0e6cac2 Binary files /dev/null and b/Mariam.png.png differ diff --git a/Trading-Process/User.Bot.js b/Trading-Process/User.Bot.js index 2f6fff417..8543ec430 100644 --- a/Trading-Process/User.Bot.js +++ b/Trading-Process/User.Bot.js @@ -110,9 +110,47 @@ if (LOG_INFO === true) { logger.write("[INFO] start -> decideWhatToDo -> Cannot place orders since Available Balance is zero on both Assets."); } callBack(global.DEFAULT_OK_RESPONSE); return; + + let messageRelevance = Math.trunc(Math.random() * 10); + + switch (messageRelevance) { + + case 1: { + assistant.sendMessage(messageRelevance, "No Available Balance","Cannot place orders since Available Balance is zero on both Assets."); + break; + } + case 3: { + assistant.sendMessage(messageRelevance, "Available Balance Too Low", "Available balances too low on both assets."); + break; + } + case 5: { + assistant.sendMessage(messageRelevance, "Orders Already at Order Book", "All intended orders have already been put at the order book."); + break; + } + + } } - if (Math.random() * 10 > 8) { + if (Math.random() * 10 > 3) { + + let messageRelevance = Math.trunc(Math.random() * 6); + + switch (messageRelevance) { + + case 1: { + assistant.sendMessage(messageRelevance, "Feeling Lazy", "I don't feel like putting any order by now. Will think about it later."); + break; + } + case 3: { + assistant.sendMessage(messageRelevance, "Not Right Time", "According to my internal calculations, this is not a good time to place an order."); + break; + } + case 5: { + assistant.sendMessage(messageRelevance, "Not Feeling Lucky", "I am currently not feeling lucky, for that reason I wont put any order now."); + break; + } + + } if (LOG_INFO === true) { logger.write("[INFO] start -> decideWhatToDo -> In some situations it is just fin no to place orders. Passing this turn. "); } callBack(global.DEFAULT_OK_RESPONSE); @@ -134,6 +172,7 @@ assistant.putPosition("buy", rate, amountA, amountB, callBack); + assistant.sendMessage(10, "Buy Order Placed", "I ve just placed a Buy order because I thought the rate " + rate + " was great."); } if (balanceB > 0) { @@ -151,6 +190,7 @@ assistant.putPosition("sell", rate, amountA, amountB, callBack); + assistant.sendMessage(10, "Sell Order Placed", "I ve just placed a Sell order because I believe it was the right time to do so."); } } catch (err) { diff --git a/this.bot.config.json b/this.bot.config.json index 6f99a8bb6..98cdc6721 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -16,13 +16,13 @@ "description": "Simple trading strategy to be used as a template.", "startMode": { "live": { - "run": "true", - "resumeExecution": "true" + "run": "false", + "resumeExecution": "false" }, "backtest": { - "run": "false", - "beginDatetime": "2018-04-12T16:00:00.000Z", - "endDatetime": "2018-04-12T16:15:00.000Z", + "run": "true", + "beginDatetime": "2018-04-16T16:00:00.000Z", + "endDatetime": "2018-04-16T17:00:00.000Z", "waitTime": 1000 }, "competition": { @@ -94,7 +94,7 @@ "storageAccount": "aamariam", "dataSets": [ { - "codeName": "Backtest History", + "codeName": "Live History", "type": "File Sequence", "validPeriods": [ "24-hs", "12-hs", "08-hs", "06-hs", "04-hs", "03-hs", "02-hs", "01-hs", "45-min", "40-min", "30-min", "20-min", "15-min", "10-min", "05-min", "04-min", "03-min", "02-min", "01-min" ], "filePath": "@DevTeam/@Bot.1.0/AACloud.1.1/Poloniex/dataSet.V1/Output/Trading-Process", @@ -146,7 +146,7 @@ "storageAccount": "aamariam", "dataSets": [ { - "codeName": "Backtest History", + "codeName": "Competition History", "type": "File Sequence", "validPeriods": [ "24-hs", "12-hs", "08-hs", "06-hs", "04-hs", "03-hs", "02-hs", "01-hs", "45-min", "40-min", "30-min", "20-min", "15-min", "10-min", "05-min", "04-min", "03-min", "02-min", "01-min" ], "filePath": "@DevTeam/@Bot.1.0/AACloud.1.1/Poloniex/dataSet.V1/Output/Trading-Process",