From 1dd4c5039bacf282d33ca1906a9065fcbb4af8c0 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 16 Apr 2018 09:55:35 +0200 Subject: [PATCH] getSet and .sets REFACTORING --- .vs/AAWebPlatform/v15/.suo | Bin 76800 -> 87040 bytes CompetitionStorage.js | 4 ++-- Ecosystem.js | 10 +++++----- ProductStorage.js | 4 ++-- TimelineChart.js | 4 ++-- server.js | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo index e41f3947d9d2f0a0e4a98f7472a2d4f5aa3dd6b1..06517f7c1a1ae6df0c760e33f76e28c7f8802c1d 100644 GIT binary patch delta 6995 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 QSvbZs*L%N?A3oguFAWKOw*UYD delta 3954 zcmd^?e^6A{702Isy9*1rfPk|65SJh7s(^ri5K)$2q9!4N6s^(V8cZxfTy!-Fp$OWT zXi1elqpy>(5x0($CQfIvFH<_5HeG+UnHXzr&7@8%&5w%@ZZ7Ob|( zH2?LEAI>@V-Fx5L^F8mrYtO5up1&9mWVU1N3i=rq7Fd7I1U=#v1Z`7x#(XPwS z9y9;y&s2>be*<@_o$7Mpf2g}Cho3b(XW51Rk8JpZW@0kN?_3HG%LH33{H9R+UDzpL zStyn=qzKpokQ|Cv!p;i$Ps1jLd>OkKepV=+20KGhij^EVb3k6`LIZ3r zC=JDCSX;=)Zx7xyy}v$w+GYeXAT`t}cbFUUGyCfkXFQ1D7CM*1J_MEkBS-=dgGpcw zRw|kdXEu-(q(#A(+)7&o|530OG=tl{fj|o;mOeSIV-x(D3&7S;U+=hUWthw# znEEZ&PWlgWg*}crAKCcJ@HCD!8h2(Rv;)y-9w-K)kvvlxYyuFCB(8!LjYJ#KNcu#h zqL42d6@o?}8c8N4Sz{XIBMxaaCehBIM)Pq&78}zj1M!$fVemyGD@X^D;b@QoB$1B* znJbbl1dD)3Rt_?O15|)YAi1mqqN2=t*1+(?^5e6})%N9PoGzEk-T=*Q(Zkt z-cEVb#};CD^#u#b#<6Td@AD^gTlNrrlPNWQ-dxqU?=BT_wc2({Y6Q zUDiVlwDM3YS^25;?;SFb-#b(Fw%xvScM@gjMN7{`cnejJ>uWr;){#RwdUn$#gQw3O zb``hlj?z2(_K-JDV^ZYj3}B;l0-%=HWGo{BCohFZvlW zU%{kc<@8umjWKvddBCzF_LlU9t{BkiE4xNhI#XWe&wkka>mLVpw5x@Nb-1nsyoXdz zoQ-XbnI=VcRQd6`yRnaa)-Q-OedOtLWSkwkVA?EG^btMW$i0uJa7v{$c6UjWVbSuN zIfZlD62srTTp|fGx27w~?=e zGpOn>*O;_^D<$cd2R0cjvdQ9KkS?a7 zM&5JG%D0ZjnxuE!U3%YX;tlpV!f!rS&W>|__W#VGJO1D&_Bc~{t+Pe%InhHgEgPS3 zZf|opyEnT^OKXbtn66>U+Jdzt@4I1t0GN_fL{0F^Vz*QOd- z?b{j@y6d*k_t!AyE)Dg-K{ARcW(`YA^Bz{&@5B@5`N_A&LF{rm*zubkk=05KzWQ>o z;{0nVnk}3X2D77S3(fqSq#)E}KbIz-XhYD$pEhy0<9wNKLk~rE5IZKNDfB&^e zJ&)S$TNJml4QEFuKKL7PlG}z;gA=C$d+hJF?>{xI^74mAn?_1Ax(5#=kc*Bdkg9b| zr4$}GX4J2EH_*MS(UglNTDjuoB`v&XgQ85MU#QDeBP{ny|YOqL7eq7E2A0$CcJEwac+L=5`(B6E28nx@C z$V+=Z)e+O}64EP%|3v@NR_&Tl3|q8{hiFD{?qKnJYA1SCtH`AeE@&!7g-_Nx7SSr% zGbZtsRk7IjEzsJn^~YgH&qNZn)u|Yk#OIsm^H6P^EL5WTBWc%tD@u;JcU6=*SW*3N z*`%TdzJ-d4yKg%8(ZoCz8~*nn+$a^v>&l{$9{C?Zx7Pb0k``S@c2gDNV!qg%$$!s_ z!*w}d{7BOG9Cy7Qht$R2&hTLeMaNX(J=vnaZIqyrE5 hNf}hN)rrnCAYdj>&lNEva6H<^>-V;R<@624{u2tVygvW{ diff --git a/CompetitionStorage.js b/CompetitionStorage.js index 73009b838..c62dcd1fa 100644 --- a/CompetitionStorage.js +++ b/CompetitionStorage.js @@ -45,9 +45,9 @@ function newCompetitionStorage(pName) { let bot = ecosystem.getBot(devTeam, pCompetition.participants[i].bot) let product = ecosystem.getProduct(bot, "Trading History"); - for (let i = 0; i < product.sets.length; i++) { + for (let i = 0; i < product.dataSets.length; i++) { - let thisSet = product.sets[i]; + let thisSet = product.dataSets[i]; switch (thisSet.type) { diff --git a/Ecosystem.js b/Ecosystem.js index e9cf5aef1..793dfb2b8 100644 --- a/Ecosystem.js +++ b/Ecosystem.js @@ -8,7 +8,7 @@ function newEcosystem() { getTeams: getTeams, getBot: getBot, getProduct: getProduct, - getSet: getSet, + getDataSet: getDataSet, getExchange: getExchange, initialize: initialize } @@ -84,13 +84,13 @@ function newEcosystem() { } } - function getSet(pProduct, pSetCodeName) { + function getDataSet(pProduct, pSetCodeName) { - for (let i = 0; i < pProduct.sets.length; i++) { + for (let i = 0; i < pProduct.dataSets.length; i++) { - if (pProduct.sets[i].codeName === pSetCodeName) { + if (pProduct.dataSets[i].codeName === pSetCodeName) { - return pProduct.sets[i]; + return pProduct.dataSets[i]; } } } diff --git a/ProductStorage.js b/ProductStorage.js index d5281a674..fccceac74 100644 --- a/ProductStorage.js +++ b/ProductStorage.js @@ -51,9 +51,9 @@ function newProductStorage(pName) { let dataSetsToLoad = 0; let dataSetsLoaded = 0; - for (let i = 0; i < pProduct.sets.length; i++) { + for (let i = 0; i < pProduct.dataSets.length; i++) { - let thisSet = pProduct.sets[i]; + let thisSet = pProduct.dataSets[i]; switch (thisSet.type) { case 'Market Files': { diff --git a/TimelineChart.js b/TimelineChart.js index 20356eb92..544dd2a62 100644 --- a/TimelineChart.js +++ b/TimelineChart.js @@ -174,9 +174,9 @@ function newTimelineChart() { */ - for (let i = 0; i < pProductCard.product.sets.length; i++) { + for (let i = 0; i < pProductCard.product.dataSets.length; i++) { - let thisSet = pProductCard.product.sets[i]; + let thisSet = pProductCard.product.dataSets[i]; switch (thisSet.type) { case 'Market Files': { diff --git a/server.js b/server.js index 1c66dcc86..6fb2d9dee 100644 --- a/server.js +++ b/server.js @@ -6,7 +6,7 @@ if (CONSOLE_LOG === true) { } -const DEBUG_MODE = false; // This forces the server to read Plotters from the local drive. +const DEBUG_MODE = true; // This forces the server to read Plotters from the local drive. if (CONSOLE_LOG === true && DEBUG_MODE === true) {