From da6d6f5a6420d63585752575c96860819218b177 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 14 Mar 2018 09:04:18 +0100 Subject: [PATCH] periods with global.marketFilesPeriods --- .vs/AAOlivia-Indicator-Bot/v15/.suo | Bin 0 -> 11776 bytes .vs/AAOlivia-Indicator.Bot/v15/.suo | Bin 11264 -> 17920 bytes Multi-Period-Market/Interval.js | 25 ++++++------------------- 3 files changed, 6 insertions(+), 19 deletions(-) create mode 100644 .vs/AAOlivia-Indicator-Bot/v15/.suo diff --git a/.vs/AAOlivia-Indicator-Bot/v15/.suo b/.vs/AAOlivia-Indicator-Bot/v15/.suo new file mode 100644 index 0000000000000000000000000000000000000000..d4d25c410aa27b32f7d7d5c551d1cbe1fd8e22f9 GIT binary patch literal 11776 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 Jdc|w5|3BV?MJ)gT literal 0 HcmV?d00001 diff --git a/.vs/AAOlivia-Indicator.Bot/v15/.suo b/.vs/AAOlivia-Indicator.Bot/v15/.suo index 98ad5e1f7c4820eae14c463e7f916b12419d1266..c6a9bba697c5945c442e032cf8a90c089329bd27 100644 GIT binary patch literal 17920 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 delta 911 zcma)5OK%cU6uxH|V5~zOhQSAxS2D4o(h4;-^c4ru1o1I#jM1IAG%?0SF%?~mDGL|G z2xsHcbkVJ;xNupc{sRAiKR{i{0uvd}8Nf_jc_-g}eCOPIzjN*xrwz{SmxZL5G);&o z&4Dm=UU%$@4kRaHb=px)PyYdrR(@HR16&08RG%Z2|ZaRV-TjEuipb!obVgz>Q7NPkxfloBXJWC29MBGmOeOJ0V7NmXH z`76jGL7^sO{zuR?zaZ~U>R9z}zJ|tsEBX>{=bwUt{k*Mm;K%*`VQkFXDsP|h(Lp{_!9nqgXFB0C(GxZnT?k;~tgUh> z=sqJl%Q7gv!E6}tRpKIk%B|t+(bzRxz31jOWnAt#rCUIJE&x=koy0oG)SvIp$=F(H z)5bz~*^1i0qtfAK>z>% diff --git a/Multi-Period-Market/Interval.js b/Multi-Period-Market/Interval.js index 34db0f2c5..9a54c9d57 100644 --- a/Multi-Period-Market/Interval.js +++ b/Multi-Period-Market/Interval.js @@ -105,19 +105,6 @@ Read the candles and volumes from Bruce and produce a single Index File for each let firstTradeFile; // Datetime of the first trade file in the whole market history. let maxCandleFile; // Datetime of the last file available to be included in the Index File. - let periods = - '[' + - '[' + 24 * 60 * 60 * 1000 + ',' + '"24-hs"' + ']' + ',' + - '[' + 12 * 60 * 60 * 1000 + ',' + '"12-hs"' + ']' + ',' + - '[' + 8 * 60 * 60 * 1000 + ',' + '"08-hs"' + ']' + ',' + - '[' + 6 * 60 * 60 * 1000 + ',' + '"06-hs"' + ']' + ',' + - '[' + 4 * 60 * 60 * 1000 + ',' + '"04-hs"' + ']' + ',' + - '[' + 3 * 60 * 60 * 1000 + ',' + '"03-hs"' + ']' + ',' + - '[' + 2 * 60 * 60 * 1000 + ',' + '"02-hs"' + ']' + ',' + - '[' + 1 * 60 * 60 * 1000 + ',' + '"01-hs"' + ']' + ']'; - - const outputPeriods = JSON.parse(periods); - marketsLoop(); /* @@ -403,7 +390,7 @@ Read the candles and volumes from Bruce and produce a single Index File for each function loopBody() { - let folderName = outputPeriods[n][1]; + let folderName = global.marketFilesPeriods[n][1]; let previousCandles; let previousVolumes; @@ -479,7 +466,7 @@ Read the candles and volumes from Bruce and produce a single Index File for each n++; - if (n < outputPeriods.length) { + if (n < global.marketFilesPeriods.length) { loopBody(); @@ -511,7 +498,7 @@ Read the candles and volumes from Bruce and produce a single Index File for each let outputCandles = []; let outputVolumes = []; - for (n = 0; n < outputPeriods.length; n++) { + for (n = 0; n < global.marketFilesPeriods.length; n++) { const emptyArray1 = []; const emptyArray2 = []; @@ -574,8 +561,8 @@ Read the candles and volumes from Bruce and produce a single Index File for each } - const outputPeriod = outputPeriods[n][0]; - const folderName = outputPeriods[n][1]; + const outputPeriod = global.marketFilesPeriods[n][0]; + const folderName = global.marketFilesPeriods[n][1]; /* Lest see if we are adding previous candles. */ @@ -827,7 +814,7 @@ Read the candles and volumes from Bruce and produce a single Index File for each n++; - if (n < outputPeriods.length) { + if (n < global.marketFilesPeriods.length) { loopBody();