diff --git a/src/nub.ts b/src/nub.ts index 120c62739f492ed4f87776cb23efc4611370d555..76c66022b9b7a5070b85cd230726847af6f56898 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 d44e0aebe52a68a37004bedd4a8c9c87eada0d8a..7c40e9dd1db3e030160a45970603410fc28ab75f 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 903e1b74765d1863b1d4fedef6203ce76248f419..345206b665a8d8b00b4aa73e0ebccde9cddffe20 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 6f302a7aca47ce7f86650206700c1bea50f93241..2eb60396c8a13eeb78785ba878629ca510bf07aa 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); } }