From 6ac824c2586fdb9733adc2046367d6b078792f42 Mon Sep 17 00:00:00 2001
From: Marie <marie.lefort@gmail.com>
Date: Fri, 23 Mar 2018 02:13:18 +0100
Subject: [PATCH] =?UTF-8?q?g=C3=A8re=20tous=20les=20param=C3=A8tres=20effe?=
=?UTF-8?q?ctivement=20pr=C3=A9sents=20dans=20le=20bloc=200=20de=20la=20G1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.js | 14 +++++++-------
main.test.js | 8 ++++++--
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/main.js b/main.js
index 28034ac..b0cbc32 100644
--- a/main.js
+++ b/main.js
@@ -1,12 +1,9 @@
const parametersOrder = [
"c",
"dt",
-// "dtReeval",
"ud0",
-// "udTime0",
-// "udReevalTime0",
"sigPeriod",
- "msPeriod",
+// "msPeriod",
"sigStock",
"sigWindow",
"sigValidity",
@@ -16,11 +13,14 @@ const parametersOrder = [
"xpercent",
"msValidity",
"stepMax",
- "medianTimeBlock",
- "savgGenTime",
+ "medianTimeBlocks",
+ "avgGenTime",
"dtDiffEval",
"percentRot",
- "txWindow"
+ "udTime0",
+ "udReevalTime0",
+ "dtReeval"
+// ,"txWindow"
];
module.exports = function(data){
diff --git a/main.test.js b/main.test.js
index 566bffc..f8bde57 100644
--- a/main.test.js
+++ b/main.test.js
@@ -1,9 +1,13 @@
const data = [ '0.0488','86400','1000','432000','100','5259600','63115200',
- '5','5259600','5259600','0.8','31557600','5','24','300','12','0.67',
+ '5','5259601','5259602','0.8','31557600','6','24','300','12','0.67',
'1488970800','1490094000','15778800' ];
const app = require("./main");
const expected = {
- c:0.0488, dt:86400, ud0:1000, sigPeriod:432000
+ c:0.0488, dt:86400, ud0:1000, sigPeriod:432000, sigStock:100,
+ sigWindow:5259600, sigValidity:63115200, sigQty:5, idtyWindow:5259601,
+ msWindow:5259602, xpercent:0.8, msValidity:31557600, stepMax:6,
+ medianTimeBlocks:24, avgGenTime:300, dtDiffEval:12, percentRot:0.67,
+ dtReeval:15778800, udTime0:1488970800, udReevalTime0:1490094000
}
describe('app convert raw data to expected', () => {
const resultat = app(data);
--
GitLab