Commit 732186e7 authored by Mathias Chouet's avatar Mathias Chouet :spaghetti:
Browse files

Fix Cloisons parameters calculability; simplified calculability management

Showing with 3 additions and 22 deletions
+3 -22
...@@ -64,12 +64,8 @@ export abstract class ComputeNode extends JalhydObject implements IDebug { ...@@ -64,12 +64,8 @@ export abstract class ComputeNode extends JalhydObject implements IDebug {
// important for Param uid // important for Param uid
this._prms.parent = this; this._prms.parent = this;
if (!this._prms.calculabilityDefined) {
this._prms.resetParametersCalculability();
}
this._prms.Pr.calculability = ParamCalculability.FREE; // so that it can be set through Pr.v this._prms.Pr.calculability = ParamCalculability.FREE; // so that it can be set through Pr.v
this.setParametersCalculability(); this.setParametersCalculability();
this._prms.DefineCalculability();
this.setExtraResultsFamilies(); this.setExtraResultsFamilies();
} }
......
...@@ -108,6 +108,9 @@ export class Cloisons extends ParallelStructure { ...@@ -108,6 +108,9 @@ export class Cloisons extends ParallelStructure {
this.prms.PB.calculability = ParamCalculability.FREE; this.prms.PB.calculability = ParamCalculability.FREE;
this.prms.DH.calculability = ParamCalculability.DICHO; this.prms.DH.calculability = ParamCalculability.DICHO;
this.prms.Z1.calculability = ParamCalculability.FREE; this.prms.Z1.calculability = ParamCalculability.FREE;
this.prms.ZRMB.calculability = ParamCalculability.FREE;
this.prms.ZRAM.calculability = ParamCalculability.FREE;
this.prms.QA.calculability = ParamCalculability.FREE;
} }
private updatePrms() { private updatePrms() {
......
...@@ -99,11 +99,8 @@ export abstract class ParamsEquation implements Iterable<ParamDefinition> { ...@@ -99,11 +99,8 @@ export abstract class ParamsEquation implements Iterable<ParamDefinition> {
/** Précision de calcul */ /** Précision de calcul */
private _Pr: ParamDefinition; private _Pr: ParamDefinition;
private _calculabilityDefined: boolean;
public constructor(parent?: ComputeNode) { public constructor(parent?: ComputeNode) {
this.parent = parent; this.parent = parent;
this._calculabilityDefined = false;
this._Pr = new ParamDefinition( this._Pr = new ParamDefinition(
this, "Pr", ParamDomainValue.POS, ParamsEquation.DEFAULT_COMPUTE_PREC, undefined, false this, "Pr", ParamDomainValue.POS, ParamsEquation.DEFAULT_COMPUTE_PREC, undefined, false
); );
...@@ -121,14 +118,6 @@ export abstract class ParamsEquation implements Iterable<ParamDefinition> { ...@@ -121,14 +118,6 @@ export abstract class ParamsEquation implements Iterable<ParamDefinition> {
return this.parent.uid; return this.parent.uid;
} }
get calculabilityDefined(): boolean {
return this._calculabilityDefined;
}
public DefineCalculability() {
this._calculabilityDefined = true;
}
public hasParameter(name: string): boolean { public hasParameter(name: string): boolean {
for (const p of this) { for (const p of this) {
if (p.symbol === name) { if (p.symbol === name) {
...@@ -142,12 +131,6 @@ export abstract class ParamsEquation implements Iterable<ParamDefinition> { ...@@ -142,12 +131,6 @@ export abstract class ParamsEquation implements Iterable<ParamDefinition> {
return this._paramMap; return this._paramMap;
} }
public resetParametersCalculability() {
for (const p of this) {
p.calculability = undefined;
}
}
public checkParametersCalculability() { public checkParametersCalculability() {
const res = []; const res = [];
......
...@@ -58,7 +58,6 @@ export class CourbeRemousParams extends ParamsEquation { ...@@ -58,7 +58,6 @@ export class CourbeRemousParams extends ParamsEquation {
this.addParamDefinition(this._Long); this.addParamDefinition(this._Long);
this.addParamDefinition(this._Dx); this.addParamDefinition(this._Dx);
this.DefineCalculability(); // Pour ne pas remettre en undefined les prms de _section
this.Pr.visible = true; // exception this.Pr.visible = true; // exception
} }
......
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