From 561718908748ffd54b3d726fa6ca528d58b9748b Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Tue, 20 Mar 2018 09:40:23 +0100
Subject: [PATCH] =?UTF-8?q?classe=20Result=20:=20get=20result()=20renomm?=
=?UTF-8?q?=C3=A9=20en=20resultElement(),=20get=20nbResults()=20renomm?=
=?UTF-8?q?=C3=A9=20en=20nbResultElements()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
spec/structure/parallel_structure.spec.ts | 8 ++--
spec/structure/structure_kivi.spec.ts | 6 +--
src/structure/parallel_structure.ts | 6 +--
src/structure/structure_kivi.ts | 6 +--
src/util/result.ts | 54 ++++++++++++-----------
5 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/spec/structure/parallel_structure.spec.ts b/spec/structure/parallel_structure.spec.ts
index 56bc6d09..d8653670 100644
--- a/spec/structure/parallel_structure.spec.ts
+++ b/spec/structure/parallel_structure.spec.ts
@@ -35,7 +35,7 @@ describe("Class ParallelStructure: ", () => {
describe("Calc()", () => {
it("should return 1 result", () => {
const res: Result = pstruct.Calc("Q");
- expect(pstruct.Calc("Q").nbResults).toEqual(1);
+ expect(pstruct.Calc("Q").nbResultElements).toEqual(1);
});
itParallelStructure("Q", 30, 15);
itParallelStructure("Z1", 30, 15);
@@ -57,17 +57,17 @@ function itParallelStructure(sVarCalc: string, rVcalc: number, Q?: number) {
for (let i = 0; i < pstruct.structures.length; i++) {
it(`ExtraResult[${i}.Q] should be ${Q}`, () => {
expect(
- pstruct.Calc(sVarCalc).result.extraResults[`${i}.Q`]
+ pstruct.Calc(sVarCalc).resultElement.extraResults[`${i}.Q`]
).toBeCloseTo(Q, Math.max(0, precDigits - 1));
});
it(`ExtraResult[${i}.Q_Mode] should be 0`, () => {
expect(
- pstruct.Calc(sVarCalc).result.extraResults[`${i}.Q_Mode`]
+ pstruct.Calc(sVarCalc).resultElement.extraResults[`${i}.Q_Mode`]
).toEqual(0);
});
it(`ExtraResult[${i}.Q_Regime] should be 0`, () => {
expect(
- pstruct.Calc(sVarCalc).result.extraResults[`${i}.Q_Regime`]
+ pstruct.Calc(sVarCalc).resultElement.extraResults[`${i}.Q_Regime`]
).toEqual(0);
});
diff --git a/spec/structure/structure_kivi.spec.ts b/spec/structure/structure_kivi.spec.ts
index 26aa64e7..1db9a2b5 100644
--- a/spec/structure/structure_kivi.spec.ts
+++ b/spec/structure/structure_kivi.spec.ts
@@ -35,12 +35,12 @@ describe("Class StructureKivi: ", () => {
describe("Pelle trop faible", () => {
structTest.prms.ZRAM.v = 100.95;
it("Calc(Q) should return 2 messages", () => {
- expect(structTest.Calc("Q").result.log.messages.length).toBe(2);
+ expect(structTest.Calc("Q").resultElement.log.messages.length).toBe(2);
expect(
- structTest.Calc("Q").result.log.messages[0].code
+ structTest.Calc("Q").resultElement.log.messages[0].code
).toBe(MessageCode.WARNING_STRUCTUREKIVI_PELLE_TROP_FAIBLE);
expect(
- structTest.Calc("Q").result.log.messages[1].code
+ structTest.Calc("Q").resultElement.log.messages[1].code
).toBe(MessageCode.WARNING_STRUCTUREKIVI_HP_TROP_ELEVE);
});
});
diff --git a/src/structure/parallel_structure.ts b/src/structure/parallel_structure.ts
index da9d4fdb..00865406 100644
--- a/src/structure/parallel_structure.ts
+++ b/src/structure/parallel_structure.ts
@@ -93,12 +93,12 @@ 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.result.AddResultElementToExtra(res.result, `${i}.Q`);
+ calcRes.resultElement.AddResultElementToExtra(res.resultElement, `${i}.Q`);
qTot += res.vCalc;
}
}
// Assigne le débit total dans le résultat
- calcRes.result.vCalc = qTot;
+ calcRes.resultElement.vCalc = qTot;
return calcRes;
}
@@ -133,7 +133,7 @@ export class ParallelStructure extends Nub {
const resQtot: Result = this.CalcQ();
for (const extraResKey in resQtot.extraResults) {
if (resQtot.extraResults.hasOwnProperty(extraResKey)) {
- res.result.addExtraResult(extraResKey, resQtot.extraResults[extraResKey]);
+ res.resultElement.addExtraResult(extraResKey, resQtot.extraResults[extraResKey]);
}
}
}
diff --git a/src/structure/structure_kivi.ts b/src/structure/structure_kivi.ts
index 6779bf80..8fe1231c 100644
--- a/src/structure/structure_kivi.ts
+++ b/src/structure/structure_kivi.ts
@@ -28,14 +28,14 @@ export class StructureKivi extends Structure {
if (p < 0.1) {
// - p ne doit pas être inférieur à 0,10 m (Norme NF X10-311-1983)
- res.result.addMessage(new Message(MessageCode.WARNING_STRUCTUREKIVI_PELLE_TROP_FAIBLE));
+ res.resultElement.addMessage(new Message(MessageCode.WARNING_STRUCTUREKIVI_PELLE_TROP_FAIBLE));
p = 0.1;
}
h1p = this.prms.h1.v / p;
if (h1p > 2.5) {
// - h/p ne doit pas être supérieur à 2,5 (Norme NF X10-311-1983)
- res.result.addMessage(new Message(MessageCode.WARNING_STRUCTUREKIVI_HP_TROP_ELEVE));
+ res.resultElement.addMessage(new Message(MessageCode.WARNING_STRUCTUREKIVI_HP_TROP_ELEVE));
h1p = 2.5;
}
@@ -47,7 +47,7 @@ export class StructureKivi extends Structure {
Q = Villemonte(this.prms.h1.v, this.prms.h2.v, 1.5) * Q;
}
- res.result.vCalc = Q;
+ res.resultElement.vCalc = Q;
return res;
}
diff --git a/src/util/result.ts b/src/util/result.ts
index 22f51be5..0cd3647d 100644
--- a/src/util/result.ts
+++ b/src/util/result.ts
@@ -13,19 +13,19 @@ export class Result {
*/
private _globalLog: cLog;
- private _results: ResultElement[];
+ private _resultElements: ResultElement[];
constructor(v?: number | Message | ResultElement, d?: any) {
this._globalLog = new cLog();
- this._results = [];
+ this._resultElements = [];
if (typeof (v) === "number" || v instanceof Message) {
- this._results.push(new ResultElement(v));
+ this._resultElements.push(new ResultElement(v));
} else if (v instanceof ResultElement) {
- this._results.push(v);
+ this._resultElements.push(v);
}
if (d !== undefined) {
- this.result.extraResults = d;
+ this.resultElement.extraResults = d;
}
}
@@ -39,33 +39,37 @@ export class Result {
/**
* Retourne le résultat du premier ResultElement
*/
- get result(): ResultElement {
- if (this._results.length === 0) {
+ get resultElement(): ResultElement {
+ if (this._resultElements.length === 0) {
throw new Error("appel à la méthode de Result.result() invalide, il n'y a pas au moins un 'ResultElement'");
}
- return this._results[0];
+ return this._resultElements[0];
+ }
+
+ get resultElements(): ResultElement[] {
+ return this._resultElements;
}
/**
* @return true si il existe au moins 1 ResultElement dans le tableau
*/
get hasResults(): boolean {
- return this._results.length > 0;
+ return this._resultElements.length > 0;
}
/**
* @return le résultat de calcul du 1er ResultElement
*/
get vCalc(): number {
- return this.result.vCalc;
+ return this.resultElement.vCalc;
}
/**
* @return le résultat de calcul du 1er ResultElement
*/
set vCalc(r: number) {
- this.result.vCalc = r;
+ this.resultElement.vCalc = r;
}
/**
@@ -73,21 +77,21 @@ export class Result {
*/
public get log() {
// return this._globalLog;
- return this.result.log;
+ return this.resultElement.log;
}
/**
* retourne le code du 1er ResultElement
*/
public get code(): MessageCode {
- return this.result.code;
+ return this.resultElement.code;
}
/**
* retourne les résultats complémentaires du 1er ResultElement
*/
get extraResults() {
- return this.result.extraResults;
+ return this.resultElement.extraResults;
}
/**
@@ -95,17 +99,17 @@ export class Result {
* @param i index of the ResultElement
*/
public extractResult(i: number): Result {
- if (i < 0 || i >= this._results.length) {
- throw new Error("Result.extractResult index outside [0;" + (this._results.length - 1) + "]");
+ if (i < 0 || i >= this._resultElements.length) {
+ throw new Error("Result.extractResult index outside [0;" + (this._resultElements.length - 1) + "]");
}
- return new Result(this._results[i]);
+ return new Result(this._resultElements[i]);
}
/**
* Renvoie le nombre de résultats dans le tableau de résultats
*/
- public get nbResults(): number {
- return this._results.length;
+ public get nbResultElements(): number {
+ return this._resultElements.length;
}
/**
@@ -113,7 +117,7 @@ export class Result {
* @param r ResultElement à ajouter
*/
public addResult(r: ResultElement) {
- this._results.push(r);
+ this._resultElements.push(r);
}
/**
@@ -122,7 +126,7 @@ export class Result {
* @param i Index position
*/
public insertResult(r: ResultElement, i: number) {
- this._results.splice(i, 0, r);
+ this._resultElements.splice(i, 0, r);
}
/**
@@ -139,7 +143,7 @@ export class Result {
public getExtraResult(name: string): any {
const res = [];
- for (const r of this._results) {
+ for (const r of this._resultElements) {
const er = r.getExtraResult(name);
if (er !== undefined) {
res.push(er);
@@ -199,10 +203,10 @@ export class Result {
* @returns true si le test est valide
*/
public get resultsOk(): boolean {
- if (this._results.length === 0) {
+ if (this._resultElements.length === 0) {
return false;
}
- for (const r of this._results) {
+ for (const r of this._resultElements) {
if (!r.resultsOk) {
return false;
}
@@ -221,7 +225,7 @@ export class Result {
}
}
// Test des journaux des résultats
- for (const r of this._results) {
+ for (const r of this._resultElements) {
if (r.hasErrorMessages) {
return true;
}
--
GitLab