From 7ba8d0bafd09f3aa4f1b175ffde3453dec4f01a4 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Thu, 1 Aug 2019 11:09:32 +0200
Subject: [PATCH] Fix #125 Erreur Courbe Remous
---
spec/remous/remous_issue_125.spec.ts | 103 +++++++++++++++++++++++++++
src/nub.ts | 1 -
src/remous/remous.ts | 3 -
3 files changed, 103 insertions(+), 4 deletions(-)
create mode 100644 spec/remous/remous_issue_125.spec.ts
diff --git a/spec/remous/remous_issue_125.spec.ts b/spec/remous/remous_issue_125.spec.ts
new file mode 100644
index 00000000..5a469a0f
--- /dev/null
+++ b/spec/remous/remous_issue_125.spec.ts
@@ -0,0 +1,103 @@
+import { Session } from "../../src/session";
+
+const sessionJson = `
+{
+ "header": {
+ "source": "jalhyd",
+ "format_version": "1.1",
+ "created": "2019-07-30T09:20:09.021Z"
+ },
+ "session": [
+ {
+ "uid": "ZGF5eT",
+ "props": {
+ "calcType": "CourbeRemous",
+ "methodeResolution": "RungeKutta4"
+ },
+ "children": [
+ {
+ "uid": "aGwzb2",
+ "props": {
+ "calcType": "Section",
+ "nodeType": "SectionTrapeze"
+ },
+ "children": [],
+ "parameters": [
+ {
+ "symbol": "Ks",
+ "mode": "SINGLE",
+ "value": 441098.4377908428
+ },
+ {
+ "symbol": "Q",
+ "mode": "SINGLE",
+ "value": 0.00000922136480077249
+ },
+ {
+ "symbol": "If",
+ "mode": "SINGLE",
+ "value": 6.892049720566374e-7
+ },
+ {
+ "symbol": "YB",
+ "mode": "SINGLE",
+ "value": 496154.5708281834
+ },
+ {
+ "symbol": "Y",
+ "mode": "SINGLE",
+ "value": 0.0000011347684018573246
+ },
+ {
+ "symbol": "LargeurFond",
+ "mode": "SINGLE",
+ "value": 0.0000013566385534465054
+ },
+ {
+ "symbol": "Fruit",
+ "mode": "SINGLE",
+ "value": 721007.6117608328
+ }
+ ]
+ }
+ ],
+ "parameters": [
+ {
+ "symbol": "Pr",
+ "mode": "SINGLE",
+ "value": 1e-7
+ },
+ {
+ "symbol": "Yamont",
+ "mode": "SINGLE",
+ "value": 264048.4798431795
+ },
+ {
+ "symbol": "Yaval",
+ "mode": "SINGLE",
+ "value": 0.000002930952132356441
+ },
+ {
+ "symbol": "Long",
+ "mode": "SINGLE",
+ "value": 968613.735314439
+ },
+ {
+ "symbol": "Dx",
+ "mode": "SINGLE",
+ "value": 191298.40499008956
+ }
+ ]
+ }
+ ]
+}`;
+
+describe("Class Remous", () => {
+ describe("jalhyd#125", () => {
+ it("CalcSerie() should return a consistent result", () => {
+ Session.getInstance().unserialise(sessionJson);
+ const r = Session.getInstance().findNubByUid("ZGF5eT").CalcSerie();
+ expect(r).toBeDefined();
+ });
+ });
+});
diff --git a/src/nub.ts b/src/nub.ts
index d42cdba0..3b258d99 100644
--- a/src/nub.ts
+++ b/src/nub.ts
@@ -32,7 +32,6 @@ export abstract class Nub extends ComputeNode implements IObservable {
this.initNewResultElement();
}
this._result.resultElement = r.resultElement;
- this._result.resultElement.log = r.log;
}
/** Returns Props object (observable set of key-values) associated to this Nub */
diff --git a/src/remous/remous.ts b/src/remous/remous.ts
index 15c1edb1..c4e6c61e 100644
--- a/src/remous/remous.ts
+++ b/src/remous/remous.ts
@@ -499,9 +499,6 @@ export class CourbeRemous extends SectionNub {
}
}
- this.initNewResultElement();
- this.currentResult = res;
-
return res;
}
--
GitLab