diff --git a/spec/structure/parallel_structure.spec.ts b/spec/structure/parallel_structure.spec.ts index 78f1ca3edfe8a8443f4a7ebc9288c8fa7910d15a..b7b9f9884b9b19786a0f951a6b11813fc941a0cb 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 42327a247dd37de76297e7d543afa1a41121256d..36d56b404667e8526bfc9d88f346d0e0eb157d11 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; } }