ParallelStructures : stop copying structures extra results into parent result

spec/pab/cloisons.spec.ts

@@ -88,7 +88,7 @@ describe("Class Cloisons: ", () => {
             expect(res.vCalc).toBeCloseTo(0.773, 2);
             expect(res.extraResults.PV).toBeCloseTo(150.1, 1);
             expect(res.extraResults.ZRMB).toBeCloseTo(76.54, 2);
-            expect(res.extraResults["ouvrage[0].ZDV"]).toBeCloseTo(76.67, 2);
+            expect(modelCloisons.structures[0].result.extraResults.ZDV).toBeCloseTo(76.67, 2);
         });
     });
 

spec/pab/pab.spec.ts

@@ -230,7 +230,7 @@ describe("Class Pab: ", () => {
             pab.CalcSerie();
             // for ex. Cloisons n°1
             expect(pab.children[0].result.resultElements.length).toBe(3);
-            expect(Object.keys(pab.children[0].result.resultElements[1].realExtraResults).length).toBe(12);
+            expect(Object.keys(pab.children[0].result.resultElements[1].realExtraResults).length).toBe(8);
         });
     });
 

spec/structure/functions.ts

@@ -139,9 +139,8 @@ export function testParallelStructures(o: { ps: ParallelStructure, ld: number[]
             });
             // Tests sur les résultats complémentaires
             it(`Calc(Q).extraResults[${i}.Q] should return o.ps.structures[${i}].Calc("Q").vCalc`, () => {
-                expect(
-                    o.ps.Calc("Q").extraResults[`ouvrage[${i}].Q`]
-                ).toBe(
+                o.ps.Calc("Q");
+                expect(o.ps.structures[i].result.resultElement.extraResults.Q).toBe(
                     o.ps.structures[i].Calc("Q").vCalc
                 );
             });

spec/structure/parallel_structure.spec.ts

@@ -61,23 +61,23 @@ function itParallelStructure(structIndex: number, sVarCalc: string, rVcalc: numb
     if (Q !== undefined) {
         const pstructLocal = createEnv();
         for (let i = 0; i < pstructLocal.structures.length; i++) {
-            it(`Calc(${JSON.stringify(sVarCalc)}) ExtraResult[ouvrage[${i}].Q] should be ${Q}`, () => {
+            it(`Calc(${JSON.stringify(sVarCalc)}) ouvrage[${i}].Q should be ${Q}`, () => {
                 const VC2: any = getVarCalc(pstruct, structIndex, sVarCalc);
-                expect(
-                    pstruct.Calc(VC2).resultElement.extraResults[`ouvrage[${i}].Q`]
-                ).toBeCloseTo(Q, Math.max(0, precDigits - 1));
+                pstruct.Calc(VC2);
+                const val = pstruct.structures[i].result.resultElement.extraResults.Q;
+                expect(val).toBeCloseTo(Q, Math.max(0, precDigits - 1));
             });
             it(`Calc(${JSON.stringify(sVarCalc)}) ExtraResult[ouvrage[${i}].Q_Mode] should be 0`, () => {
                 const VC3 = getVarCalc(pstruct, structIndex, sVarCalc);
-                expect(
-                    pstruct.Calc(VC3).resultElement.extraResults[`ouvrage[${i}].Q_ENUM_StructureFlowMode`]
-                ).toEqual(0);
+                pstruct.Calc(VC3);
+                const val = pstruct.structures[i].result.resultElement.extraResults.ENUM_StructureFlowMode;
+                expect(val).toEqual(0);
             });
             it(`Calc(${JSON.stringify(sVarCalc)}) ExtraResult[ouvrage[${i}].Q_Regime] should be 0`, () => {
                 const VC4 = getVarCalc(pstruct, structIndex, sVarCalc);
-                expect(
-                    pstruct.Calc(VC4).resultElement.extraResults[`ouvrage[${i}].Q_ENUM_StructureFlowRegime`]
-                ).toEqual(0);
+                pstruct.Calc(VC4);
+                const val = pstruct.structures[i].result.resultElement.extraResults.ENUM_StructureFlowRegime;
+                expect(val).toEqual(0);
             });
         }
     }

spec/util/result_element.spec.ts

-/**
- * IMPORTANT !
- * Décommenter temporairement la ligne suivante (import { } from "./mock_jasmine")
- * Pour exécuter ce code dans le débugger.
- * Faire de même avec le fichier test_func.ts
- */
-// import { describe, expect, it, xdescribe, xit } from "../mock_jasmine";
-
-/* import { ResultElement } from "../../src/util/resultelement";
-
-describe("Class Result: ", () => {
-    describe("Method AddResulToExtra", () => {
-        const resEle: ResultElement = new ResultElement(1);
-        const resEleToAdd: ResultElement = new ResultElement(2);
-
-        const resEleRef: ResultElement = new ResultElement(1);
-        resEleRef.extraResults = { R: 2 };
-
-        it("Result should be integrated in extraResult", () => {
-            resEle.AddResultElementToExtra(resEleToAdd, "R");
-            expect(resEle).toEqual(resEleRef);
-        });
-    });
-}); */

src/pab/cloisons.ts

@@ -73,9 +73,9 @@ export class Cloisons extends ParallelStructure {
         r.extraResults.ZRAM = this.prms.ZRAM.v;
 
         // Ajout de ZDV pour les seuils
-        for (let i = 0; i < this.structures.length; i++) {
-            if (this.structures[i].prms.h1.visible) {
-                r.resultElement.addExtraResult(`ouvrage[${i}].ZDV`, this.prms.Z1.v - this.structures[i].prms.h1.v);
+        for (const s of this.structures) {
+            if (s.prms.h1.visible) {
+                s.result.resultElement.addExtraResult("ZDV", this.prms.Z1.v - s.prms.h1.v);
             }
         }
 

src/session.ts

@@ -207,7 +207,7 @@ export class Session {
     }
 
     /**
-     * Creates a Nub from a JSON representation and adds it tot he current session; returns
+     * Creates a Nub from a JSON representation and adds it to the current session; returns
      * a pointer to the Nub and its JSON metadata
      * @param serialised JSON representation of a single Nub
      * @param register if false, new Nub will just be returned and won't be registered into the session

src/structure/parallel_structure.ts

@@ -92,7 +92,7 @@ export class ParallelStructure extends Nub {
             if (i !== iExcept) {
                 const res: Result = this._children[i].Calc("Q");
                 // @TODO vérifier que ça marche sans la ligne ci-dessous
-                calcRes.resultElement.AddResultElementToExtra(res.resultElement, `ouvrage[${i}].Q`);
+                // calcRes.resultElement.AddResultElementToExtra(res.resultElement, `ouvrage[${i}].Q`);
                 qTot += res.vCalc;
             }
         }

src/util/resultelement.ts

@@ -154,27 +154,6 @@ export class ResultElement {
     public getExtraResult(name: string): any {
         return this.getValue(name);
     }
-    /**
-     * Add a ResultElement object into extraResult.
-     * The added ResultElement contains the Value of the ResultElement and the extraResults
-     * which are added using varCalc as prefix (i.e. [varCalc]_[key])
-     * Log messages are also copied to ResultElement
-     * @param resultElementToAdd Result object to add
-     * @param varCalc Name of the variable calculated used as key in extraResult
-     */
-    public AddResultElementToExtra(resultElementToAdd: ResultElement, varCalc: string) {
-        // Add ResultElement into extraResult
-        this.extraResults[varCalc] = resultElementToAdd.vCalc;
-        // Add extraResults
-        for (const extraResKey in resultElementToAdd.realExtraResults) {
-            if (resultElementToAdd.extraResults.hasOwnProperty(extraResKey)) {
-                const newExtraKey: string = varCalc + "_" + extraResKey;
-                this.extraResults[newExtraKey] = resultElementToAdd.extraResults[extraResKey];
-            }
-        }
-        // Add Logs
-        this.log.addLog(resultElementToAdd.log);
-    }
     // ------------ retrocompat @TODO remove ------------------------
 
     public toString(): string {