From f08bc840c66d13aa1f5482c3a88ffa40d027db03 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 23 Mar 2018 00:58:30 +0100 Subject: [PATCH] Upgraded to Alpha completed --- .vs/AABruce-Indicator-Bot/v15/.suo | Bin 26624 -> 25088 bytes One-Min-Daily-Candles-Volumes/User.bot.js | 24 +++++++++++----------- this.bot.config.json | 7 ++++--- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.vs/AABruce-Indicator-Bot/v15/.suo b/.vs/AABruce-Indicator-Bot/v15/.suo index d11cabaa1d08c261967808cee5f02ddee73138ad..a68a558fe41aef90ea9004a0f8e838ae64afa25a 100644 GIT binary patch delta 2117 zcmdT`UrbwN6#vd`>F&n8Z5c%hx=x_XGH7X``y-ia%b*j+Xp17_j|h`3VKM6*McrIx zmysnVQ(4c0dt7iaF)`}6Z(FjFZSi4=j>P)52j-)RMiWSeQR_LkZE|s%C_Z_TU%&I6 z^WF3P?)lF7Zqtj9z6-PdEs`jRT?jL&K=?hE%dypj6JEdccG=(pL4#t)E(h zx4!{5xzl(`>c%@t00wbIIxksFc-qvhP$0o>3X;P_y}PWBCbJxuWCP*1ONsJM-orr? zUd5so^i4EwF6fm8e+B9Mj6&lRgmQutBXS+4&Ci1^&r~)reR|~Al#%J%@baHo)=>=J zn^{`&Eb*5O)m86^b?oL1g}IIbu$#rR(Q{t&}yHKuS{>2Y1yjLYiPe^0pTZwV8@ zI-Ifj^OW|fdc75Mr}J1B$;!CG#mk4n)OF@5XI9R?NYPLgSDduMWmr{GO%pS&Hg>B} zEW2U^%MS8IEqJ=ASFSNUgUd~6XvAr6OyQ*#gR5jaO(a~cq;UU@P#txa6et;_c#rUu z`vBfm{MxcxfjNhiadjwMhqZ>CG3AP>zOQtm9sTWGT)Q!Q1y2!FNieL$%xvW~;;RrTPHpRTsr za1Zpu;d1*BSG{!D>rL;)xiQI-zZ)?gZNu=)j}zq3AukF|fQ`QqGD(tMlMjMh*~rp1A^k!n01+H7C? zkvjL*g z`tiH=HV}BOJv86`hU5r#1a>{UGvJMOMk(t|MG}}8xB*|I5l4RtZ6-}Do%z#d2F{{T7BbA`X2xzp9A2vk^6rD D7^=s- delta 2268 zcmds2Uuaup6u;l?%^#DSv}sb;#jJnUI16So>HOQK%eBjv*`}sdr&Viri}j&G|FET^ z6Es6X9|kTtpfAE^@k!8Quq zYZZFU`MNkxoAO)os7xmt236jUou<$?JEJpWFgP3V191Vr+N&7(3>F3U7N9<>)l^Gw z#JI!Ko42ipp!424F?xU?&6mA@OYhkYaju` ze#>}2#z(M_E9>V(S=U5K&5LJfL48v^O`B>?Wh!>MIN#zZE%gFcf`$mjID=Uaw(Elx!}2|?PbbGa&*y|FfK<_@%IjUj<~rk?A=Cw zPgST~e_VUNTchjZ*8DycMpMiXKEVyZ{cOi@a0z}uTfsqQ=j_33*-a-ykGt7}rGAZ} zg6O7&mYm9+!mo$DR$Nr7dd~wi(opo4@b$Vy|*O zcJX#o+jey(HCmP91UBb;{fdKME|{uWy7k0~2JAv=Z1 zBvlTCs5%)dr4kgE8x1YBSIBD;&1s*}e5#!;J$jViN5r&XhojLXEWbXdG|04YaRc)+^rZ>6aE|js&O{6DfX>$7g}-}I)8=uQ(&71jxW6U(%#2r zr>5D7#xu##*cyK>AvfQ8j4J!P>Ah^LaL_4zNywC#TqCuM-#M4zhq-fkN60(~{yNsYrH`a0_&t!IQpwvW1w<+fMCZ}+dfI{*Lx diff --git a/One-Min-Daily-Candles-Volumes/User.bot.js b/One-Min-Daily-Candles-Volumes/User.bot.js index ee1ec8ef8..2adc59a85 100644 --- a/One-Min-Daily-Candles-Volumes/User.bot.js +++ b/One-Min-Daily-Candles-Volumes/User.bot.js @@ -32,8 +32,8 @@ start: start }; - let charlyFileStorage = AZURE_FILE_STORAGE.newFileStorage(bot); - let bruceFileStorage = AZURE_FILE_STORAGE.newFileStorage(bot); + let charlyFileStorage = FILE_STORAGE.newFileStorage(bot); + let bruceFileStorage = FILE_STORAGE.newFileStorage(bot); let utilities = UTILITIES.newUtilities(bot); @@ -196,7 +196,7 @@ /* Next Status Report */ - reportKey = "AAMasters" + "-" + "AACharly" + "-" + "Poloniex-Hole-Fixing" + "-" + "dataSet.V1" + "-" + year + "-" + month;; + reportKey = "AAMasters" + "-" + "AACharly" + "-" + "Poloniex-Hole-Fixing" + "-" + "dataSet.V1" + "-" + year + "-" + month; if (FULL_LOG === true) { logger.write("[INFO] start -> getContextVariables -> reportKey = " + reportKey); } thisReport = dependencies.statusReports.get(reportKey).file; @@ -213,7 +213,7 @@ return; } - if (statusReport.monthChecked === true) { + if (thisReport.monthChecked === true) { lastFileWithoutHoles = new Date(); // We need this with a valid value. @@ -226,7 +226,7 @@ if (atHeadOfMarket === true) { - lastFileWithoutHoles = new Date(statusReport.lastFile.year + "-" + statusReport.lastFile.month + "-" + statusReport.lastFile.days + " " + statusReport.lastFile.hours + ":" + statusReport.lastFile.minutes + GMT_SECONDS); + lastFileWithoutHoles = new Date(thisReport.lastFile.year + "-" + thisReport.lastFile.month + "-" + thisReport.lastFile.days + " " + thisReport.lastFile.hours + ":" + thisReport.lastFile.minutes + GMT_SECONDS); getOneMinDailyCandlesVolumes(); } else { @@ -243,9 +243,9 @@ /* Final Status Report */ - reportKey = "AAMasters" + "-" + "AACharly" + "-" + "One-Min-Daily-Candles-Volumes" + "-" + "dataSet.V1" + "-" + year + "-" + month; + reportKey = "AAMasters" + "-" + "AABruce" + "-" + "One-Min-Daily-Candles-Volumes" + "-" + "dataSet.V1" + "-" + year + "-" + month; if (FULL_LOG === true) { logger.write("[INFO] start -> getContextVariables -> reportKey = " + reportKey); } - holeFixingStatusReport = dependencies.statusReports.get(reportKey).file; + thisReport = dependencies.statusReports.get(reportKey).file; if (thisReport.lastFile === undefined) { logger.write("[WARN] start -> getContextVariables -> Undefined Last File. -> reportKey = " + reportKey); @@ -256,7 +256,7 @@ return; } - if (statusReport.monthCompleted === true) { + if (thisReport.monthCompleted === true) { logger.write("[WARN] start -> getContextVariables -> The current year / month was already fully processed."); @@ -270,16 +270,16 @@ } else { - lastCandleFile = new Date(statusReport.lastFile.year + "-" + statusReport.lastFile.month + "-" + statusReport.lastFile.days + " " + "00:00" + GMT_SECONDS); - lastCandleClose = statusReport.candleClose; + lastCandleFile = new Date(thisReport.lastFile.year + "-" + thisReport.lastFile.month + "-" + thisReport.lastFile.days + " " + "00:00" + GMT_SECONDS); + lastCandleClose = thisReport.candleClose; - if (statusReport.fileComplete === true) { + if (thisReport.fileComplete === true) { buildCandles(); } else { - lastTradeFile = new Date(statusReport.lastTradeFile.year + "-" + statusReport.lastTradeFile.month + "-" + statusReport.lastTradeFile.days + " " + statusReport.lastTradeFile.hours + ":" + statusReport.lastTradeFile.minutes + GMT_SECONDS); + lastTradeFile = new Date(thisReport.lastTradeFile.year + "-" + thisReport.lastTradeFile.month + "-" + thisReport.lastTradeFile.days + " " + thisReport.lastTradeFile.hours + ":" + thisReport.lastTradeFile.minutes + GMT_SECONDS); findPreviousContent(); } } diff --git a/this.bot.config.json b/this.bot.config.json index 132d337bb..eccb0cd9a 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -15,12 +15,12 @@ "description": "Produces two data-sets with candles and volumes for all markets at Poloniex.", "startMode": { "allMonths": { - "run": "true", + "run": "false", "minYear": "2014", "maxYear": "2018" }, "oneMonth": { - "run": "false", + "run": "true", "year": "2018", "month": "2" }, @@ -51,7 +51,8 @@ "minor": 0 }, "process": "Poloniex-Hole-Fixing", - "dataSetVersion": "dataSet.V1" + "dataSetVersion": "dataSet.V1", + "dataSetSection": "Month" }, { "devTeam": "AAMasters",