From 84440aeb12e7cefe0333dd1627c665df5a436f72 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Fri, 12 Jul 2019 11:10:31 +0200
Subject: [PATCH] Fix #109 Remove getter resultsOk in Result and ResultElement
---
src/nub.ts | 4 +++-
src/util/result.ts | 18 +-----------------
src/util/resultelement.ts | 6 +-----
3 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/src/nub.ts b/src/nub.ts
index f28d621d..b1b890a4 100644
--- a/src/nub.ts
+++ b/src/nub.ts
@@ -436,7 +436,7 @@ export abstract class Nub extends ComputeNode implements IObservable {
public V(p: ParamDefinition): number {
if (p.valueMode === ParamValueMode.CALCUL) {
if (this.result !== undefined) {
- if (this.result.ok) {
+ if (this.result.resultElement.ok) {
return this.result.vCalc;
}
}
@@ -943,12 +943,14 @@ export abstract class Nub extends ComputeNode implements IObservable {
try {
param.defineReference(destNub, p.targetParam);
} catch (err) {
+ // tslint:disable-next-line:no-console
console.error(`fixLinks: defineReference error`
+ ` (${this.uid}.${param.symbol} => ${destNub.uid}.${p.targetParam})`);
// forward error
ret.hasErrors = true;
}
} else {
+ // tslint:disable-next-line:no-console
console.error("fixLinks : cannot find target Nub");
// forward error
ret.hasErrors = true;
diff --git a/src/util/result.ts b/src/util/result.ts
index a0394475..b5f4a277 100644
--- a/src/util/result.ts
+++ b/src/util/result.ts
@@ -279,23 +279,7 @@ export class Result extends JalhydObject implements INamedIterableValues {
* @returns true si le test est valide
*/
public get ok(): boolean {
- return this.resultsOk && !this.hasErrorMessages;
- }
-
- /**
- * Teste si tous les résultats + complémentaires sont valides
- * @returns true si le test est valide
- */
- public get resultsOk(): boolean {
- if (this._resultElements.length === 0) {
- return false;
- }
- for (const r of this._resultElements) {
- if (!r.resultsOk) {
- return false;
- }
- }
- return true;
+ return this.resultElement.ok;
}
/**
diff --git a/src/util/resultelement.ts b/src/util/resultelement.ts
index a2bfcae1..3b6316ce 100644
--- a/src/util/resultelement.ts
+++ b/src/util/resultelement.ts
@@ -57,10 +57,6 @@ export class ResultElement {
return Object.keys(this._extraResults).length > 0;
}
- public get resultsOk(): boolean {
- return this._vCalc !== undefined || this.hasExtraResults;
- }
-
private get messageCount(): number {
return this.log.messages.length;
}
@@ -82,7 +78,7 @@ export class ResultElement {
}
public get ok(): boolean {
- return this.resultsOk && !this.hasErrorMessages;
+ return (this._vCalc !== undefined || this.hasExtraResults) && !this.hasErrorMessages;
}
/**
--
GitLab