Skip to content
GitLab
Commit 9392813e authored by Dorchies David's avatar Dorchies David
Browse files

Lint

parent b2cf9a04
devel 296-macrorugo-test-ludovic-cassan-formulation-of-2021-03-24 325-courbe-de-remous-calculer-une-courbe-de-remous-de-passe-a-macro-rugosites 335-utiliser-des-identifiants-symboliques-plutot-que-numeriques-dans-les-fichiers 336-macrorugo-mise-a-jour-de-la-formule-f-h-a-partir-de-cassan-2023 355-cloisons-le-champ-cote-de-l-eau-amont-n-est-pas-vide-par-defaut master v2021-03-15 v4.15.0 stable old_stable nghyd_4.17.0 nghyd_4.16.3 nghyd_4.16.2 nghyd_4.16.1 nghyd_4.16.0 nghyd_4.15.1 nghyd_4.15.0 nghyd_4.14.2 nghyd_4.14.1 nghyd_4.14.0 nghyd_4.13.1 nghyd_4.13.0 nghyd_4.12.1 nghyd_4.12.0 nghyd_4.11.1 nghyd_4.11.0 nghyd_4.10.6 nghyd_4.10.5 nghyd_4.10.4 nghyd_4.10.3 nghyd_4.10.2 nghyd_4.10.1 nghyd_4.10.0 nghyd_4.9.0 nghyd_4.8.1 nghyd_4.8.0 nghyd_4.7.0 nghyd_4.6.1 nghyd_4.6.0 nghyd_4.5.0 nghyd_4.4.2 nghyd_4.4.1 nghyd_4.4.0 nghyd_4.4.0a nghyd_4.3.0 nghyd_4.2.0 nghyd_4.1.0 nghyd_4.0.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 67 additions and 56 deletions
+67 -56
src/pab/pab_dimension.ts
+ 26
− 23
View file @ 9392813e
import { Result } from "../util/result";
import { ParamsEquation } from "../param/params-equation";
import { ParamDefinition, ParamCalculability } from "../param/param-definition";
import { ParamDomainValue } from "../param/param-domain";
import { Nub } from "../nub";
import { ParamCalculability, ParamDefinition } from "../param/param-definition";
import { ParamDomainValue } from "../param/param-domain";
import { ParamsEquation } from "../param/params-equation";
import { Result } from "../util/result";
export class PabDimensionParams extends ParamsEquation {
[key: string]: any; // pour pouvoir faire this['methode]();
......@@ -19,12 +19,12 @@ export class PabDimensionParams extends ParamsEquation {
/** Volume V */
private _V: ParamDefinition;
constructor(rL: number, rW: number, rY: number, rV: number = undefined) {
constructor(rL: number, rW: number, rY: number, rV?: number) {
super();
this._L = new ParamDefinition('L', ParamDomainValue.POS, rL);
this._W = new ParamDefinition('W', ParamDomainValue.POS, rW);
this._Y = new ParamDefinition('Y', ParamDomainValue.POS, rY);
this._V = new ParamDefinition('V', ParamDomainValue.POS, rV);
this._L = new ParamDefinition("L", ParamDomainValue.POS, rL);
this._W = new ParamDefinition("W", ParamDomainValue.POS, rW);
this._Y = new ParamDefinition("Y", ParamDomainValue.POS, rY);
this._V = new ParamDefinition("V", ParamDomainValue.POS, rV);
this.addParamDefinition(this._L);
this.addParamDefinition(this._W);
......@@ -48,6 +48,8 @@ export class PabDimensionParams extends ParamsEquation {
return this._V;
}
}
// tslint:disable-next-line:max-classes-per-file
export class PabDimension extends Nub {
constructor(prms: PabDimensionParams, dbg: boolean = false) {
super(prms, dbg);
......@@ -57,20 +59,10 @@ export class PabDimension extends Nub {
* paramètres castés au bon type
*/
get prms(): PabDimensionParams {
return <PabDimensionParams>this._prms;
return this._prms as PabDimensionParams;
}
/**
* paramétrage de la calculabilité des paramètres
*/
protected setParametersCalculability() {
this.prms.L.calculability = ParamCalculability.EQUATION;
this.prms.W.calculability = ParamCalculability.EQUATION;
this.prms.Y.calculability = ParamCalculability.EQUATION;
this.prms.V.calculability = ParamCalculability.EQUATION;
}
Equation(sVarCalc: string): Result {
public Equation(sVarCalc: string): Result {
let v: number;
switch (sVarCalc) {
......@@ -80,7 +72,7 @@ export class PabDimension extends Nub {
case "L":
v = this.prms.V.v / this.prms.W.v / this.prms.Y.v;
break
break;
case "W":
v = this.prms.V.v / this.prms.L.v / this.prms.Y.v;
......@@ -91,9 +83,20 @@ export class PabDimension extends Nub {
break;
default:
throw "PabDimension.Equation() : invalid variable name " + sVarCalc;
throw new Error("PabDimension.Equation() : invalid variable name " + sVarCalc);
}
return new Result(v);
}
/**
* paramétrage de la calculabilité des paramètres
*/
protected setParametersCalculability() {
this.prms.L.calculability = ParamCalculability.EQUATION;
this.prms.W.calculability = ParamCalculability.EQUATION;
this.prms.Y.calculability = ParamCalculability.EQUATION;
this.prms.V.calculability = ParamCalculability.EQUATION;
}
}
src/pab/pab_puissance.ts
+ 25
− 22
View file @ 9392813e
import { Result } from "../util/result";
import { ParamsEquation } from "../param/params-equation";
import { ParamDefinition, ParamCalculability } from "../param/param-definition";
import { ParamDomainValue } from "../param/param-domain";
import { Nub } from "../nub";
import { ParamCalculability, ParamDefinition } from "../param/param-definition";
import { ParamDomainValue } from "../param/param-domain";
import { ParamsEquation } from "../param/params-equation";
import { Result } from "../util/result";
export class PabPuissanceParams extends ParamsEquation {
[key: string]: any; // pour pouvoir faire this['methode]();
......@@ -19,12 +19,12 @@ export class PabPuissanceParams extends ParamsEquation {
/** Puissance dissipée PV */
private _Pv: ParamDefinition;
constructor(rDH: number, rQ: number, rV: number, rPV: number = undefined) {
constructor(rDH: number, rQ: number, rV: number, rPV?: number) {
super();
this._DH = new ParamDefinition('DH', ParamDomainValue.POS, rDH);
this._Q = new ParamDefinition('Q', ParamDomainValue.POS, rQ);
this._V = new ParamDefinition('V', ParamDomainValue.POS, rV);
this._Pv = new ParamDefinition('Pv', ParamDomainValue.POS, rPV);
this._DH = new ParamDefinition("DH", ParamDomainValue.POS, rDH);
this._Q = new ParamDefinition("Q", ParamDomainValue.POS, rQ);
this._V = new ParamDefinition("V", ParamDomainValue.POS, rV);
this._Pv = new ParamDefinition("Pv", ParamDomainValue.POS, rPV);
this.addParamDefinition(this._DH);
this.addParamDefinition(this._Q);
......@@ -48,6 +48,8 @@ export class PabPuissanceParams extends ParamsEquation {
return this._Pv;
}
}
// tslint:disable-next-line:max-classes-per-file
export class PabPuissance extends Nub {
constructor(prms: PabPuissanceParams, dbg: boolean = false) {
super(prms, dbg);
......@@ -57,20 +59,10 @@ export class PabPuissance extends Nub {
* paramètres castés au bon type
*/
get prms(): PabPuissanceParams {
return <PabPuissanceParams>this._prms;
}
/**
* paramétrage de la calculabilité des paramètres
*/
protected setParametersCalculability() {
this.prms.DH.calculability = ParamCalculability.DICHO;
this.prms.Q.calculability = ParamCalculability.DICHO;
this.prms.V.calculability = ParamCalculability.DICHO;
this.prms.Pv.calculability = ParamCalculability.EQUATION;
return this._prms as PabPuissanceParams;
}
Equation(sVarCalc: string): Result {
public Equation(sVarCalc: string): Result {
let v: number;
switch (sVarCalc) {
......@@ -81,9 +73,20 @@ export class PabPuissance extends Nub {
break;
default:
throw "PabPuissance.Equation() : invalid variable name " + sVarCalc;
throw new Error("PabPuissance.Equation() : invalid variable name " + sVarCalc);
}
return new Result(v);
}
/**
* paramétrage de la calculabilité des paramètres
*/
protected setParametersCalculability() {
this.prms.DH.calculability = ParamCalculability.DICHO;
this.prms.Q.calculability = ParamCalculability.DICHO;
this.prms.V.calculability = ParamCalculability.DICHO;
this.prms.Pv.calculability = ParamCalculability.EQUATION;
}
}
src/structure/parallel_structure.ts
+ 16
− 11
View file @ 9392813e
import { Nub } from "../nub";
import { ParamCalculability } from "../param/param-definition";
import { Message } from "../util/message";
import { IParamDefinitionIterator, ParamsEquation, ParamsEquationArrayIterator } from "../param/params-equation";
import { Result } from "../util/result";
import { ParallelStructureParams } from "./parallel_structure_params";
import { Structure } from "./structure";
import { IParamDefinitionIterator, ParamsEquation, ParamsEquationArrayIterator } from "../param/params-equation";
/**
* Interface pour mémoriser le n° d'ouvrage et le paramètre à calculer
......@@ -50,8 +49,9 @@ export class ParallelStructure extends Nub {
public get parameterIterator(): IParamDefinitionIterator {
const prms: ParamsEquation[] = [];
prms.push(this._prms);
for (const st of this.structures)
for (const st of this.structures) {
prms.push(st.parameters);
}
return new ParamsEquationArrayIterator(prms);
}
......@@ -61,10 +61,11 @@ export class ParallelStructure extends Nub {
* @param after position après laquelle insérer la structure, à la fin sinon
*/
public addStructure(structure: Structure, after?: number) {
if (after !== undefined)
if (after !== undefined) {
this.structures.splice(after + 1, 0, structure);
else
} else {
this.structures.push(structure);
}
}
/**
......@@ -84,9 +85,11 @@ export class ParallelStructure extends Nub {
* @return true si la structure donnée est dans la liste
*/
public hasStructure(structure: Nub): boolean {
for (const s of this.structures)
if (s.uid == structure.uid)
for (const s of this.structures) {
if (s.uid === structure.uid) {
return true;
}
}
return false;
}
......@@ -96,7 +99,7 @@ export class ParallelStructure extends Nub {
public moveStructureUp(structure: Structure) {
let i = 0;
for (const s of this.structures) {
if (s.uid == structure.uid && i > 0) {
if (s.uid === structure.uid && i > 0) {
const t = this.structures[i - 1];
this.structures[i - 1] = this.structures[i];
this.structures[i] = t;
......@@ -112,7 +115,7 @@ export class ParallelStructure extends Nub {
public moveStructureDown(structure: Structure) {
let i = 0;
for (const s of this.structures) {
if (s.uid == structure.uid && i < this.structures.length - 1) {
if (s.uid === structure.uid && i < this.structures.length - 1) {
const t = this.structures[i];
this.structures[i] = this.structures[i + 1];
this.structures[i + 1] = t;
......@@ -236,12 +239,14 @@ export class ParallelStructure extends Nub {
private getStructureVarCalc(sVarCalc: string): IStructureVarCalc {
let sIndex: string;
let sPrm: string;
if (sVarCalc.indexOf(".") == -1)
if (sVarCalc.indexOf(".") === -1) {
throw new Error(`getStructureVarCalc() : erreur d'analyse de ${sVarCalc}, (pas de la forme n.X)`);
}
[sIndex, sPrm] = sVarCalc.split(".");
const i = parseInt(sIndex, 10);
if (i === NaN)
if (isNaN(i)) {
throw new Error(`getStructureVarCalc() : erreur d'analyse de ${sVarCalc} (${sIndex} n'est pas un nombre)`);
}
return { index: i, prm: sPrm };
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment