From e3503f52954b0df8b38734bf55fa9d5b6917cf38 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Tue, 19 Jun 2018 11:28:25 +0200
Subject: [PATCH] =?UTF-8?q?=20#45=20IReferencedObject=20renomm=C3=A9=20en?=
=?UTF-8?q?=20IReferencedNub=20-=20INubReference=20:=20referenceDesc=20ren?=
=?UTF-8?q?omm=C3=A9=20en=20referenceDefinition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/nub.ts | 6 ++--
src/param/param-base.ts | 19 ++++++-----
src/param/param-definition.ts | 2 +-
src/param/param-values.ts | 46 +++++++++++++-------------
src/structure/parallel_structure.ts | 2 +-
src/value_ref/object_ref.ts | 50 ++++++++++++++---------------
6 files changed, 62 insertions(+), 63 deletions(-)
diff --git a/src/nub.ts b/src/nub.ts
index e8000036..6524312f 100644
--- a/src/nub.ts
+++ b/src/nub.ts
@@ -5,12 +5,12 @@ import { Result } from "./util/result";
import { ParamValues } from "./param/param-values";
import { ParamValueMode } from "./param/param-value-mode";
import { ParamDefinition } from ".";
-import { IReferencedObject } from "./value_ref/object_ref";
+import { IReferencedNub } from "./value_ref/object_ref";
/**
* Classe abstraite de Noeud de calcul : classe de base pour tous les calculs
*/
-export abstract class Nub extends ComputeNode implements IReferencedObject {
+export abstract class Nub extends ComputeNode implements IReferencedNub {
private _dichoStartIntervalMaxSteps: number = 100;
/**
@@ -187,7 +187,7 @@ export abstract class Nub extends ComputeNode implements IReferencedObject {
return this._result;
}
- // interface IReferencedObject
+ // interface IReferencedNub
public getReferencedParamValues(desc: string): ParamValues {
return this.getParameter(desc).paramValues;
diff --git a/src/param/param-base.ts b/src/param/param-base.ts
index 59db4e91..be231531 100644
--- a/src/param/param-base.ts
+++ b/src/param/param-base.ts
@@ -1,4 +1,3 @@
-import { DefinedNumber } from "../util/definedvalue";
import { Interval } from "../util/interval";
import { Message, MessageCode } from "../util/message";
@@ -6,15 +5,15 @@ import { JalhydObject } from "../jalhyd_object"
import { ParamDomain, ParamDomainValue } from "./param-domain";
import { ParamValues } from "./param-values";
import { ParamValueMode } from "./param-value-mode";
-import { IReferencedObject, IObjectReference } from "../value_ref/object_ref";
-import { Result } from "..";
+import { IReferencedNub, INubReference } from "../value_ref/object_ref";
+import { Result } from "../util/result";
import { IterableValues } from "./param-value-iterator";
/**
* paramètre avec symbole et domaine de définition
*/
// tslint:disable-next-line:max-classes-per-file
-export class BaseParam extends JalhydObject implements IObjectReference, IterableValues {
+export class BaseParam extends JalhydObject implements INubReference, IterableValues {
/**
* symbole
*/
@@ -254,18 +253,18 @@ export class BaseParam extends JalhydObject implements IObjectReference, Iterabl
this._paramValues.valueMode = m;
}
- // interface IObjectReference
+ // interface INubReference
- public defineReference(target: IReferencedObject, desc: string) {
+ public defineReference(target: IReferencedNub, desc: string) {
this._paramValues.defineReference(target, desc);
}
- public get referenceDesc(): string {
- return this._paramValues.referenceDesc;
+ public get referenceDefinition(): string {
+ return this._paramValues.referenceDefinition;
}
- public get referencedObject(): IReferencedObject {
- return this._paramValues.referencedObject;
+ public get referencedNub(): IReferencedNub {
+ return this._paramValues.referencedNub;
}
public get isReferenceDefined(): boolean {
diff --git a/src/param/param-definition.ts b/src/param/param-definition.ts
index 5b674d24..307dc26f 100644
--- a/src/param/param-definition.ts
+++ b/src/param/param-definition.ts
@@ -46,7 +46,7 @@ export class ParamDefinition extends BaseParam {
get v(): number {
if (this.isReferenceDefined) {
- const parts: string[] = this.referenceDesc.split(".");
+ const parts: string[] = this.referenceDefinition.split(".");
if (parts.length === 1) {
switch (this.referencedParamValues.valueMode) {
diff --git a/src/param/param-values.ts b/src/param/param-values.ts
index 441b55c8..6e529e55 100644
--- a/src/param/param-values.ts
+++ b/src/param/param-values.ts
@@ -1,11 +1,11 @@
import { Pair } from "../util/pair"
import { DefinedNumber } from "../util/definedvalue";
-import { IReferencedObject, IObjectReference, ObjectReference } from "../value_ref/object_ref";
+import { IReferencedNub, INubReference, NubReference } from "../value_ref/object_ref";
import { Result } from "..";
import { ParamValueMode } from "./param-value-mode";
import { ParamValueIterator, IterableValues } from "./param-value-iterator";
-export class ParamValues implements IObjectReference, IterableValues {
+export class ParamValues implements INubReference, IterableValues {
/**
* mode de génération des valeurs : min/max, liste, ...
*/
@@ -47,14 +47,14 @@ export class ParamValues implements IObjectReference, IterableValues {
private _iterator: ParamValueIterator;
/**
- * implémentation par délégation de IObjectReference
+ * implémentation par délégation de INubReference
*/
- private _valueRef: ObjectReference;
+ private _nubRef: NubReference;
constructor() {
this._singleValue = new DefinedNumber();
this._currentValue = new DefinedNumber();
- this._valueRef = new ObjectReference();
+ this._nubRef = new NubReference();
}
public setValues(o: number | any, max?: number, step?: number) {
@@ -130,7 +130,7 @@ export class ParamValues implements IObjectReference, IterableValues {
*/
public get currentValue(): number {
if (this.isReferenceDefined)
- return this._valueRef.referencedParamValues.currentValue;
+ return this._nubRef.referencedParamValues.currentValue;
return this._currentValue.value;
}
@@ -143,7 +143,7 @@ export class ParamValues implements IObjectReference, IterableValues {
*/
public get singleValue(): number {
if (this.isReferenceDefined)
- return this._valueRef.referencedParamValues.singleValue;
+ return this._nubRef.referencedParamValues.singleValue;
return this._singleValue.value;
}
@@ -167,7 +167,7 @@ export class ParamValues implements IObjectReference, IterableValues {
return this._minValue;
case ParamValueMode.LINK:
- return this._valueRef.referencedParamValues.min;
+ return this._nubRef.referencedParamValues.min;
default:
this.checkValueMode(ParamValueMode.MINMAX); // pour générer une erreur
@@ -186,7 +186,7 @@ export class ParamValues implements IObjectReference, IterableValues {
return this._maxValue;
case ParamValueMode.LINK:
- return this._valueRef.referencedParamValues.max;
+ return this._nubRef.referencedParamValues.max;
default:
this.checkValueMode(ParamValueMode.MINMAX);
@@ -210,7 +210,7 @@ export class ParamValues implements IObjectReference, IterableValues {
return this._stepValue;
case ParamValueMode.LINK:
- return this._valueRef.referencedParamValues.step;
+ return this._nubRef.referencedParamValues.step;
default:
this.checkValueMode(ParamValueMode.MINMAX); // pour générer une erreur
@@ -253,7 +253,7 @@ export class ParamValues implements IObjectReference, IterableValues {
break;
case ParamValueMode.LINK:
- this._iterator = this._valueRef.referencedParamValues.getValuesIterator(reverse);
+ this._iterator = this._nubRef.referencedParamValues.getValuesIterator(reverse);
break;
default:
@@ -277,39 +277,39 @@ export class ParamValues implements IObjectReference, IterableValues {
return this._currentValue.value;
}
- // interface IObjectReference
+ // interface INubReference
- public defineReference(target: IReferencedObject, desc: string) {
+ public defineReference(target: IReferencedNub, desc: string) {
this.valueMode = ParamValueMode.LINK;
- this._valueRef.defineReference(target, desc);
+ this._nubRef.defineReference(target, desc);
}
- public get referencedObject(): IReferencedObject {
- return this._valueRef.referencedObject;
+ public get referencedNub(): IReferencedNub {
+ return this._nubRef.referencedNub;
}
- public get referenceDesc(): string {
- return this._valueRef.referenceDesc;
+ public get referenceDefinition(): string {
+ return this._nubRef.referenceDefinition;
}
public get isReferenceDefined(): boolean {
- return this._valueRef.isReferenceDefined;
+ return this._nubRef.isReferenceDefined;
}
public get referencedParamValues(): ParamValues {
- return this._valueRef.referencedParamValues;
+ return this._nubRef.referencedParamValues;
}
public get referencedResult(): Result {
- return this._valueRef.referencedResult;
+ return this._nubRef.referencedResult;
}
public get referencedExtraResult(): any {
- return this._valueRef.referencedExtraResult;
+ return this._nubRef.referencedExtraResult;
}
public get referencedValuesIterator(): any {
- return this._valueRef.referencedValuesIterator;
+ return this._nubRef.referencedValuesIterator;
}
// interface IterableValues
diff --git a/src/structure/parallel_structure.ts b/src/structure/parallel_structure.ts
index 24cc5a8e..7a712fc5 100644
--- a/src/structure/parallel_structure.ts
+++ b/src/structure/parallel_structure.ts
@@ -273,7 +273,7 @@ export class ParallelStructure extends Nub {
return this.structures[sVC.index].Calc(sVC.prm, rInit, rPrec);
}
- // interface IReferencedObject
+ // interface IReferencedNub
public getReferencedParamValues(desc: string): ParamValues {
try {
diff --git a/src/value_ref/object_ref.ts b/src/value_ref/object_ref.ts
index 4b49b007..9180de1d 100644
--- a/src/value_ref/object_ref.ts
+++ b/src/value_ref/object_ref.ts
@@ -2,10 +2,10 @@ import { ParamValues } from "../param/param-values";
import { Result } from "..";
/**
- * objet (paramètre ou résultat) dont les valeurs sont référençables pour réutilisation
+ * Nub dont certaines valeurs sont référençables pour réutilisation
* (d'une calculette sur une autre par ex)
*/
-export interface IReferencedObject {
+export interface IReferencedNub {
/**
* getter des valeurs
* @param desc : description sous forme symbolique
@@ -31,20 +31,20 @@ export interface IReferencedObject {
}
/**
- * référence vers un objet contenant une valeur vers laquelle on crée un lien
+ * référence vers un Nub contenant une valeur vers laquelle on crée un lien
*/
-export interface IObjectReference {
+export interface INubReference {
/**
- * définition de la valeur référencée dans l'objet
- * @param target objet contenant la valeur qu'on va référencer
+ * définition de la valeur référencée dans le Nub
+ * @param target Nub contenant la valeur qu'on va référencer
* @param desc : description de la valeur pointée sous forme symbolique. Exemples : Q, <n° d'ouvrage>.Z1
*/
- defineReference(target: IReferencedObject, desc: string): void;
+ defineReference(target: IReferencedNub, desc: string): void;
/**
* description symbolique de la référence
*/
- readonly referenceDesc: string;
+ readonly referenceDefinition: string;
/**
* true si la référence a été définie
@@ -73,67 +73,67 @@ export interface IObjectReference {
}
/**
- * implémentation par défaut de IObjectReference
+ * implémentation par défaut de INubReference
*/
-export class ObjectReference implements IObjectReference {
- private _referencedObject: IReferencedObject;
+export class NubReference implements INubReference {
+ private _referencedNub: IReferencedNub;
private _refDefinition: string;
- public defineReference(target: IReferencedObject, desc: string) {
- this._referencedObject = target;
+ public defineReference(target: IReferencedNub, desc: string) {
+ this._referencedNub = target;
this._refDefinition = desc;
}
/**
* description symbolique de la référence
*/
- public get referenceDesc(): string {
+ public get referenceDefinition(): string {
return this._refDefinition;
}
public get isReferenceDefined(): boolean {
- return this._referencedObject !== undefined && this._refDefinition !== undefined;
+ return this._referencedNub !== undefined && this._refDefinition !== undefined;
}
/**
- * objet référencé
+ * Nub référencé
*/
- public get referencedObject(): IReferencedObject {
- return this._referencedObject;
+ public get referencedNub(): IReferencedNub {
+ return this._referencedNub;
}
/**
* instance de ParamValues référencée
*/
public get referencedParamValues(): ParamValues {
- if (this._referencedObject === undefined)
+ if (this._referencedNub === undefined)
return undefined;
- return this._referencedObject.getReferencedParamValues(this._refDefinition);
+ return this._referencedNub.getReferencedParamValues(this._refDefinition);
}
/**
* instance de Result référencée
*/
public get referencedResult(): Result {
- if (this._referencedObject === undefined)
+ if (this._referencedNub === undefined)
return undefined;
- return this._referencedObject.getReferencedResult(this._refDefinition);
+ return this._referencedNub.getReferencedResult(this._refDefinition);
}
/**
* instance de résultat complémentaire référencée
*/
public get referencedExtraResult(): any {
- if (this._referencedObject === undefined)
+ if (this._referencedNub === undefined)
return undefined;
- return this._referencedObject.getReferencedExtraResult(this._refDefinition);
+ return this._referencedNub.getReferencedExtraResult(this._refDefinition);
}
/**
* itérateur sur les valeurs référencées
*/
public get referencedValuesIterator(): IterableIterator<number> {
- return this._referencedObject.getReferencedValuesIterator(this._refDefinition);
+ return this._referencedNub.getReferencedValuesIterator(this._refDefinition);
}
}
--
GitLab