From 350f4b40047f63836763bb5b490bb3afdec82b22 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Wed, 2 May 2018 14:49:12 +0200
Subject: [PATCH] Taking market price from Bruce

---
 .vs/AAMariam-Trading-Bot/v15/.suo | Bin 34304 -> 35840 bytes
 Trading-Process/User.Bot.js       |   6 ++++--
 this.bot.config.json              |  15 +++++++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.vs/AAMariam-Trading-Bot/v15/.suo b/.vs/AAMariam-Trading-Bot/v15/.suo
index 86e0cfb7e1f9592fa95a1d8719f3d963c38247e4..ad39587d6637cd320c4f379a7750323184536792 100644
GIT binary patch
delta 2184
zcmdUvOK?+V6vy*@NlMeC(58{5w9=%+Hehbar7<Kz?JWsaoN8M{MPam+b{rT7oF?@F
ziM<^_d}N$9XX68P=CXH&+?8&OQ^$qlh>wL^T)A<lUC0cL{}XOvWJWiZh2PBYo^#Ln
z9_O6zp%<k7u3V1ZZL765o2?zX1nZSbh0TIi96PQ~FN>la7j_DE2U-seP5k!rk79t`
zVLB@hQOd81k7-R_Yv$o$K;Pv<6qOE<r#1UPdoN6wu->*~*3QKy%Nm62Z|E^%>Fx$w
z+R}GGb^#yY81I4X13YyAvIB4c3fKki1re|t>;&8|3aN6MNrcg>?6b`KAs?{xPRIk6
z&O=hrd%(Kc?mQ+ozxeH|<6MJom~N{<g;U<tJF^8I9?7j0dNXiXHZSB>unoAtX2AV8
zp<469b{Eh9_ND6gK=N*l0R^#l)3PJv4B>ANed^e)4nwPr=L~B4DD;C3|7@>jvoiHd
zv8Ao&B7CodOW+OgCU^_H2Po2#=z1T@hu|{cAV0F?`qioPqUcGvYyuWeslM?!TJS82
zbF}7}sGbUYqw_2+w0>~Mm*ui@>FY7^vTqmrR$YR3f~#3`nZNgWgyEB=J<}pG4F_j=
z4Dz_8KLh!!rO!Y<2TlMg3?1#_&W*eV$0E2uH-lgO(_;RnVj@MWzG2c6uSidmc_Yyz
zN`tGyDfq0=H~BE%AkS0yVFR}f4$r(fV3&qp8a>kJm&Pt>L}h7QN|L@&SM~Jp6|L7O
z>njM-y#X`u=ykg}rRn(FryGZ*u}%Ix7rK%7x|vTHpWNDbHy^{7BtABqSy8^cEm3DR
zQTn6(VJ?cPhnEGl^$$5k4E<}>Fthyy!GRu;#<*8V3d#=C_r$NFG+lPMJqVW{0BQT2
zCbRj}k@=a~lc%3oCg;zbn9F32Kc1PJA3Sg-J9sLS%binWX?1Tht}0^(?^BgnJeF3H
zs;Vlf*yxz5ruU|k$<aJbWEV=O%FTCZ?$5U1;t0Mx+)irMxF6hrxTP&!oojLf=5jaG
z?P>ZxGvcgHYVO?slc15g$Hf03>bY)?+*L0JJ(NpCqfs>;i|1}t|F5s#CU8vode_?h
zQ1DvQBiTtKFX)|xP-6`?ZsO~i7p}No79F>439lX~^Ro(QacPPE)qnmAH@|88(xTBy
zq?7uT?bU}j_~h`Wqt{xh_NCz@>A5id5b{$wr%_IwrCGhFctQIw!;OfzqU*vE^obIp
jkaF29hcr>tH1aB5@?Jbmhc%sw%2q0?aVmsjq-olp6abr%

delta 1534
zcmb_cO-NKx6rS_u?~RW7bS%wg^ikqZOgfDgW(G4kNs(ZNlu^`Fv@n7(8?_(H5ez0r
zNZ(l$)uve)v}oonvPc*(%0*<*qG*$gc5NyYvcT6lI!`Pj61tC%bM86!-t(Pv&wY_w
zLS$GN@wfy-dPoLCA*noH&@_#$MjRD4CW0fNSk7igUVQp6GV=yX$>A%<OTu29v~Phy
zoU>?f3g?XFC)SgTwrX_LqI8hVClsaU?6Z^ZB&;KFoV>Izi=>}mA*>~25^RJL!cIai
zVPUk@fg@rmc=4R*z$sC7xya1N^6;(D3rH_!`lG>j%s#dI%U{`BOP1O5QOu09U?x1z
zA<0>Y1ZJ#fkwH59c`!pg3sc&jO>#L4^ox$sqv9$uSfgi<Aps@79^DyrSxeD0?Jk|Y
zkZ8RDioMYWKr?25uX{_;BbeYMcH8^m1kTx8M5be0=?r3b)}8-<WK1cW<gQR>%d$Zg
z@)tny223>^`DJef)55T~&BRsId8)I`Zcyc-8FRAe8Hn71Tx{KKj?v^j&Tnopad+uv
z3|CEaAPiTx*nn?l>q_rz?zC<3?)aYcJ?d<p9q>T(Af~o#!{J!1nu_{BX=+p(-4hTm
z6O<-Nm8w2Nd=RAU$A#m!ADqm59&Vq=>2!QUDf$qfoR@I_kSDoe5;(Z|Fr6-{^VL=%
zxi$!HZW_iBG9M+devIVtw66PE;&4H`^Ab5O6Z!~O2v-UH1YV$cr+%-K-KfZP)8y33
zX_cNAhUGz_!>E3jEudQKF9Oxsijf_WN?KHC0D93JXlcl)>!fhoa%s3Hc&L?KZ$arD
z%e~M%es3%g{84#x@_zGy;+TON(19-pYyVmhWypuAm`|1JJ2|+tRMP>#XHJiqAG?I}
zu6-gujw*sqTn!fw|5EolA>N!9ZxE8flqsWw$ng&Z3>XVdVeE8Bg*MHaJo5)%=qV<8
zS}>=_qk8&k026(s=<3|G!q@=vKNVq>HN)4(%{U#Zx3#rTb5SX|Jw0{GKt-Y95l!5L
zz&HfzJ@j4n`@P#e=o|3Gdx2l10bhl7ta>NzIuxJ|mht0&Gky&)awUST!Cy`NDJ7ap
Vw`(WL?J@>qwfMEGjQ*}1`6man>F59e

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"
         }
       ]
     }