From 360db843583412e7a2723f82df4bbbbeb280ad60 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Tue, 17 Apr 2018 12:22:11 +0200
Subject: [PATCH] =?UTF-8?q?=20#46=20ParamValues.setSingleValue()=20:=20sup?=
=?UTF-8?q?pression=20du=20param=C3=A8tre=20de=20MAJ=20du=20mode=20de=20va?=
=?UTF-8?q?leur=20(pose=20plus=20de=20probl=C3=A8mes=20qu'il=20n'en=20r?=
=?UTF-8?q?=C3=A9soud)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
spec/iterator/paramvalues_iterator.spec.ts | 4 +---
src/dichotomie.ts | 2 +-
src/nub.ts | 2 +-
src/param/param-base.ts | 6 ++----
src/param/param-values.ts | 5 +----
src/structure/parallel_structure.ts | 6 +++---
6 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/spec/iterator/paramvalues_iterator.spec.ts b/spec/iterator/paramvalues_iterator.spec.ts
index b92b7679..238b64b5 100644
--- a/spec/iterator/paramvalues_iterator.spec.ts
+++ b/spec/iterator/paramvalues_iterator.spec.ts
@@ -1,5 +1,3 @@
-/// <reference path="../../node_modules/@types/jasmine/index.d.ts" />
-
import { ParamValues, ParamValueMode, ParamValueIterator } from "../../src/param/param-values"
function checkNumberList(it: ParamValueIterator, exp: number[]) {
@@ -14,7 +12,7 @@ function checkNumberList(it: ParamValueIterator, exp: number[]) {
describe('paramvalues iterator : ', () => {
it("vide (1)", () => {
const p = new ParamValues();
- expect(() => p.getValuesIterator()).toThrow(new Error("ParamValueIterator : mode de génération de valeurs CALCUL incorrect"));
+ expect(() => p.getValuesIterator()).toThrow(new Error("ParamValues : mode de valeurs undefined incorrect"));
});
it("vide (2)", () => {
diff --git a/src/dichotomie.ts b/src/dichotomie.ts
index 8ed64a1c..43a29c63 100644
--- a/src/dichotomie.ts
+++ b/src/dichotomie.ts
@@ -158,7 +158,7 @@ export class Dichotomie extends Debug {
}
private set vX(vCalc: number) {
- this._paramX.setValue(vCalc, false);
+ this._paramX.setValue(vCalc);
}
/**
diff --git a/src/nub.ts b/src/nub.ts
index 90b151f8..0f655477 100644
--- a/src/nub.ts
+++ b/src/nub.ts
@@ -55,7 +55,7 @@ export abstract class Nub extends ComputeNode {
return this._result;
}
const sAnalyticalPrm: string = this.getFirstAnalyticalParameter().symbol;
- computedVar.setValue(resSolve.vCalc, false);
+ computedVar.setValue(resSolve.vCalc);
const res: Result = this.Equation(sAnalyticalPrm);
res.vCalc = resSolve.vCalc;
this._result = res;
diff --git a/src/param/param-base.ts b/src/param/param-base.ts
index ada74c3f..2a472e00 100644
--- a/src/param/param-base.ts
+++ b/src/param/param-base.ts
@@ -76,11 +76,9 @@ export class BaseParam extends JalhydObject {
return this._paramValues.singleValue;
}
- public setValue(val: number, updateValueMode = true) {
+ public setValue(val: number) {
this.checkValue(val);
- this._paramValues.setSingleValue(val, updateValueMode);
-
- // console.log("setting param " + this._symbol + " id=" + this._id + " to " + val); // A VIRER
+ this._paramValues.setSingleValue(val);
}
public get uncheckedValue(): number {
diff --git a/src/param/param-values.ts b/src/param/param-values.ts
index c8302327..8bb1782a 100644
--- a/src/param/param-values.ts
+++ b/src/param/param-values.ts
@@ -211,7 +211,6 @@ export class ParamValues {
constructor() {
this._singleValue = new DefinedNumber();
- this._valueMode = ParamValueMode.CALCUL;
}
public setValues(o: number | any, max?: number, step?: number) {
@@ -286,10 +285,8 @@ export class ParamValues {
return this._singleValue.uncheckedValue;
}
- public setSingleValue(v: number, updateValueMode = true) {
+ public setSingleValue(v: number) {
this._singleValue.value = v;
- if (updateValueMode)
- this._valueMode = ParamValueMode.SINGLE;
}
public get isDefined() {
diff --git a/src/structure/parallel_structure.ts b/src/structure/parallel_structure.ts
index f06396c2..343773a0 100644
--- a/src/structure/parallel_structure.ts
+++ b/src/structure/parallel_structure.ts
@@ -139,7 +139,7 @@ export class ParallelStructure extends Nub {
case "Q":
res = super.Calc(sVarCalc, rInit, rPrec);
if (res.ok) {
- this.getParameter(sVarCalc).setValue(res.vCalc, false);
+ this.getParameter(sVarCalc).setValue(res.vCalc);
}
break;
default:
@@ -147,7 +147,7 @@ export class ParallelStructure extends Nub {
const sVC = this.getStructureVarCalc(sVarCalc);
res = this.CalcStructPrm(sVC, rInit, rPrec);
if (res.ok) {
- this.structures[sVC.index].getParameter(sVC.prm).setValue(res.vCalc, false);
+ this.structures[sVC.index].getParameter(sVC.prm).setValue(res.vCalc);
}
}
if (res.ok) {
@@ -206,7 +206,7 @@ export class ParallelStructure extends Nub {
*/
private CalcStructPrm(sVC: IStructureVarCalc, rInit?: number, rPrec: number = 0.001): Result {
// Le débit restant sur la structure en calcul est :
- this.structures[sVC.index].prms.Q.setValue(this.prms.Q.v - this.CalcQ(sVC.index).vCalc, false);
+ this.structures[sVC.index].prms.Q.setValue(this.prms.Q.v - this.CalcQ(sVC.index).vCalc);
// Calcul du paramètre de la structure en calcul
return this.structures[sVC.index].Calc(sVC.prm, rInit, rPrec);
--
GitLab