From 1dee9334842aebf307f7230a668750e8d6564db4 Mon Sep 17 00:00:00 2001 From: "francois.grand" <francois.grand@irstea.fr> Date: Wed, 9 Aug 2017 15:10:51 +0200 Subject: [PATCH] =?UTF-8?q?-=20ParamCalculability=20:=20ajout=20de=20la=20?= =?UTF-8?q?valeur=20FREE=20(pour=20param=C3=A8tre=20librement=20modifiable?= =?UTF-8?q?)=20-=20ComputeNodeParameters.getComputeNodeParameters()=20:=20?= =?UTF-8?q?correction=20bug=20de=20la=20calculabilit=C3=A9=20manquante?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/param.ts | 14 ++++++-------- src/parameters.ts | 3 ++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/param.ts b/src/param.ts index 4ff87c44..37c02884 100644 --- a/src/param.ts +++ b/src/param.ts @@ -83,10 +83,15 @@ export class ParamDomain { */ export enum ParamCalculability { /** - * paramètre fixé + * paramètre fixé (immuable, cad non modifiable après création) */ NONE, + /** + * paramètre libre (modifiable) + */ + FREE, + /** * paramètre calculable analytiquement, par méthode de Newton, ... */ @@ -170,13 +175,6 @@ export class ParamDefinition extends DefinedNumber { * méthodes de calculabilité */ - /** - * variable calculable ? - */ - isComputable(): boolean { - return this.calculability != ParamCalculability.NONE; - } - /** * variable calculable par l'équation ? */ diff --git a/src/parameters.ts b/src/parameters.ts index 68b62f9f..298d8d21 100644 --- a/src/parameters.ts +++ b/src/parameters.ts @@ -1,5 +1,5 @@ import { IParamsEquation } from "./param"; -import { ConduiteDistribParams } from "./cond_distri"; +import { ConduiteDistribParams, ConduiteDistrib } from "./cond_distri"; export class ComputeNodeParameters { private static _instance: ComputeNodeParameters; @@ -15,6 +15,7 @@ export class ComputeNodeParameters { public getComputeNodeParameters(name: string): IParamsEquation { if (name == "cond_distri") { let cn = new ConduiteDistribParams(undefined, undefined, undefined, undefined, undefined); + let n = new ConduiteDistrib(cn); // pour initialiser la calculabilité des paramètres return cn; } -- GitLab