From e4ab946dd95c2f4cc1a4bc6e3a49a5acfbacc24a Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Wed, 27 Jun 2018 16:13:39 +0200
Subject: [PATCH] =?UTF-8?q?=20#45=20INubReference=20:=20modif=20du=20type?=
 =?UTF-8?q?=20de=20la=20propri=C3=A9t=C3=A9=20referencedObject=20=C3=A0=20?=
 =?UTF-8?q?NamedIterableValues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nub.ts                  | 4 ++--
 src/param/param-base.ts     | 2 +-
 src/param/param-values.ts   | 5 ++---
 src/value_ref/object_ref.ts | 7 ++++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/nub.ts b/src/nub.ts
index 120c6273..76c66022 100644
--- a/src/nub.ts
+++ b/src/nub.ts
@@ -6,7 +6,7 @@ import { ParamValues } from "./param/param-values";
 import { ParamValueMode } from "./param/param-value-mode";
 import { ParamDefinition } from ".";
 import { IReferencedNub } from "./value_ref/object_ref";
-import { IJalhydObject } from "./jalhyd_object";
+import { NamedIterableValues, NumberIterator } from "./param/param-value-iterator";
 
 /**
  * Classe abstraite de Noeud de calcul : classe de base pour tous les calculs
@@ -229,7 +229,7 @@ export abstract class Nub extends ComputeNode implements IReferencedNub {
         }
     }
 
-    public getReferencedObject(desc: string): IJalhydObject {
+    public getReferencedObject(desc: string): NamedIterableValues {
         const tmp = desc.split(".");
 
         if (tmp.length == 1) // paramètre (ex "Q")
diff --git a/src/param/param-base.ts b/src/param/param-base.ts
index d44e0aeb..7c40e9dd 100644
--- a/src/param/param-base.ts
+++ b/src/param/param-base.ts
@@ -342,7 +342,7 @@ export class BaseParam extends JalhydObject implements INubReference, NamedItera
         return this._paramValues.referencedValuesIterator;
     }
 
-    public get referencedObject(): IJalhydObject {
+    public get referencedObject(): NamedIterableValues {
         return this._paramValues.referencedObject;
     }
 
diff --git a/src/param/param-values.ts b/src/param/param-values.ts
index 903e1b74..345206b6 100644
--- a/src/param/param-values.ts
+++ b/src/param/param-values.ts
@@ -3,8 +3,7 @@ import { DefinedNumber } from "../util/definedvalue";
 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";
-import { IJalhydObject } from "../jalhyd_object";
+import { ParamValueIterator, IterableValues, NamedIterableValues, NumberIterator } from "./param-value-iterator";
 
 export class ParamValues implements INubReference, IterableValues {
     /**
@@ -317,7 +316,7 @@ export class ParamValues implements INubReference, IterableValues {
         return this._nubRef.referencedValuesIterator;
     }
 
-    public get referencedObject(): IJalhydObject {
+    public get referencedObject(): NamedIterableValues {
         if (this.isReferenceDefined)
             return this._nubRef.referencedObject;
         return undefined;
diff --git a/src/value_ref/object_ref.ts b/src/value_ref/object_ref.ts
index 6f302a7a..2eb60396 100644
--- a/src/value_ref/object_ref.ts
+++ b/src/value_ref/object_ref.ts
@@ -1,6 +1,7 @@
 import { ParamValues } from "../param/param-values";
 import { Result } from "..";
 import { IJalhydObject } from "../jalhyd_object";
+import { NamedIterableValues, NumberIterator } from "../param/param-value-iterator";
 
 /**
  * Nub dont certaines valeurs sont référençables pour réutilisation
@@ -33,7 +34,7 @@ export interface IReferencedNub {
     /**
      * objet (paramètre/résultat/résultat complémentaire) référencé
      */
-    getReferencedObject(desc: string): IJalhydObject;
+    getReferencedObject(desc: string): NamedIterableValues;
 }
 
 /**
@@ -85,7 +86,7 @@ export interface INubReference {
     /**
      * objet (paramètre/résultat/résultat complémentaire) référencé
      */
-    readonly referencedObject: IJalhydObject;
+    readonly referencedObject: NamedIterableValues;
 }
 
 /**
@@ -164,7 +165,7 @@ export class NubReference implements INubReference {
     /**
      * objet (paramètre/résultat/résultat complémentaire) référencé
      */
-    public get referencedObject(): IJalhydObject {
+    public get referencedObject(): NamedIterableValues {
         return this._referencedNub.getReferencedObject(this._refDefinition);
     }
 }
-- 
GitLab