From 6d606cf84513fbfbd69285392707e50c23437010 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Wed, 2 May 2018 09:48:54 +0200
Subject: [PATCH] =?UTF-8?q?Modifs=20accompagnant=20le=20ticket=20nghyd/#79?=
=?UTF-8?q?=20(Gestion=20des=20libell=C3=A9s=20des=20r=C3=A9sultats=20comp?=
=?UTF-8?q?l=C3=A9mentaires)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
spec/structure/parallel_structure.spec.ts | 15 +++++++--------
src/structure/parallel_structure.ts | 2 +-
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/spec/structure/parallel_structure.spec.ts b/spec/structure/parallel_structure.spec.ts
index 78f1ca3e..b7b9f988 100644
--- a/spec/structure/parallel_structure.spec.ts
+++ b/spec/structure/parallel_structure.spec.ts
@@ -56,22 +56,21 @@ function itParallelStructure(sVarCalc: string, rVcalc: number, Q?: number) {
});
if (Q !== undefined) {
for (let i = 0; i < pstruct.structures.length; i++) {
- it(`ExtraResult[${i}.Q] should be ${Q}`, () => {
+ it(`ExtraResult[ouvrage[${i}].Q] should be ${Q}`, () => {
expect(
- pstruct.Calc(sVarCalc).resultElement.extraResults[`${i}.Q`]
+ pstruct.Calc(sVarCalc).resultElement.extraResults[`ouvrage[${i}].Q`]
).toBeCloseTo(Q, Math.max(0, precDigits - 1));
});
- it(`ExtraResult[${i}.Q_Mode] should be 0`, () => {
+ it(`ExtraResult[ouvrage[${i}].Q_Mode] should be 0`, () => {
expect(
- pstruct.Calc(sVarCalc).resultElement.extraResults[`${i}.Q_Mode`]
+ pstruct.Calc(sVarCalc).resultElement.extraResults[`ouvrage[${i}].Q_Mode`]
).toEqual(0);
});
- it(`ExtraResult[${i}.Q_Regime] should be 0`, () => {
+ it(`ExtraResult[ouvrage[${i}].Q_Regime] should be 0`, () => {
expect(
- pstruct.Calc(sVarCalc).resultElement.extraResults[`${i}.Q_Regime`]
+ pstruct.Calc(sVarCalc).resultElement.extraResults[`ouvrage[${i}].Q_Regime`]
).toEqual(0);
});
-
}
}
}
@@ -106,7 +105,7 @@ describe("Class ParallelStructure: ", () => {
// Tests sur les résultats complémentaires
it(`Calc(Q).extraResults[${i}.Q] should return ${ps2.structures[i].Calc("Q").vCalc}`, () => {
expect(
- ps2.Calc("Q").extraResults[`${i}.Q`]
+ ps2.Calc("Q").extraResults[`ouvrage[${i}].Q`]
).toBe(
ps2.structures[i].Calc("Q").vCalc
);
diff --git a/src/structure/parallel_structure.ts b/src/structure/parallel_structure.ts
index 42327a24..36d56b40 100644
--- a/src/structure/parallel_structure.ts
+++ b/src/structure/parallel_structure.ts
@@ -161,7 +161,7 @@ export class ParallelStructure extends Nub {
for (let i = 0; i < this.structures.length; i++) {
if (i !== iExcept) {
const res: Result = this.structures[i].Calc("Q");
- calcRes.resultElement.AddResultElementToExtra(res.resultElement, `${i}.Q`);
+ calcRes.resultElement.AddResultElementToExtra(res.resultElement, `ouvrage[${i}].Q`);
qTot += res.vCalc;
}
}
--
GitLab