From 8f4dd274ad765096d36cdd9b51f8cfe43cd77d23 Mon Sep 17 00:00:00 2001 From: "mathias.chouet" <mathias.chouet@irstea.fr> Date: Thu, 28 Feb 2019 09:14:02 +0100 Subject: [PATCH] =?UTF-8?q?M=C3=A0J=20tests=20suite=20=C3=A0=20la=20s?= =?UTF-8?q?=C3=A9paration=20des=20structures=20Cem88*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spec/iterator/param_equation.spec.ts | 2 +- spec/structure/cloisons.spec.ts | 2 +- spec/structure/dever.spec.ts | 3 ++- spec/structure/structure_cem88d.spec.ts | 2 +- spec/structure/structure_cem88v.spec.ts | 7 +++---- spec/value_ref/value_ref_section.spec.ts | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/iterator/param_equation.spec.ts b/spec/iterator/param_equation.spec.ts index c3125876..119fea71 100644 --- a/spec/iterator/param_equation.spec.ts +++ b/spec/iterator/param_equation.spec.ts @@ -45,7 +45,7 @@ describe("iterator : ", () => { const psp: ParallelStructureParams = new ParallelStructureParams(1, 2, 3); const pst = new ParallelStructure(psp); - const st: Structure = CreateStructure(StructureType.SeuilRectangulaire, LoiDebit.Cem88d); + const st: Structure = CreateStructure(StructureType.SeuilRectangulaire, LoiDebit.WeirCem88d); pst.addStructure(st); const symbs = ["Q", "Z1", "Z2", "Cd", "h1", "h2", "L", "Q", "W", "Z1", "Z2", "ZDV"]; diff --git a/spec/structure/cloisons.spec.ts b/spec/structure/cloisons.spec.ts index a57206b8..1b62e13e 100644 --- a/spec/structure/cloisons.spec.ts +++ b/spec/structure/cloisons.spec.ts @@ -73,7 +73,7 @@ describe("Class Cloisons: ", () => { LoiDebit.KIVI ]; for (let i = 0; i < 3; i++ ) { - c2.addStructure(CreateStructure(iStTypes[i], iLoiDebits[i], false)); + c2.addStructure(CreateStructure(iStTypes[i], iLoiDebits[i], c2, false)); } const prmsKivi: StructureKiviParams = c2.structures[2].prms as StructureKiviParams; prmsKivi.ZRAM.v = 0; diff --git a/spec/structure/dever.spec.ts b/spec/structure/dever.spec.ts index f93eea18..2a1f0bbe 100644 --- a/spec/structure/dever.spec.ts +++ b/spec/structure/dever.spec.ts @@ -20,7 +20,8 @@ const dever: Dever = new Dever( false // debug ); -dever.addStructure(CreateStructure(StructureType.SeuilTriangulaireTrunc, LoiDebit.TriangularTruncWeirFree, false)); +dever.addStructure(CreateStructure(StructureType.SeuilTriangulaireTrunc, + LoiDebit.TriangularTruncWeirFree, dever, false)); describe("Class Dever: ", () => { describe("Calc(Q) Seuil Triangulaire Trunc", () => { diff --git a/spec/structure/structure_cem88d.spec.ts b/spec/structure/structure_cem88d.spec.ts index 1316c24e..97cf6489 100644 --- a/spec/structure/structure_cem88d.spec.ts +++ b/spec/structure/structure_cem88d.spec.ts @@ -14,7 +14,7 @@ import { itCalcQ } from "./functions"; const structPrm: RectangularStructureParams = new RectangularStructureParams(1, 0, 1, 1, 2, 0.6, 0); const structTest: StructureWeirCem88d = new StructureWeirCem88d(structPrm, false); -describe("Class StructureCem88d: ", () => { +describe("Class StructureWeirCem88d: ", () => { describe("Calcul Q avec W croissant: ", () => { const W: number[] = [ 0.000000, 0.100000, 0.200000, 0.300000, 0.400000, 0.500000, 0.600000, diff --git a/spec/structure/structure_cem88v.spec.ts b/spec/structure/structure_cem88v.spec.ts index 5927b9fc..6e15f5d1 100644 --- a/spec/structure/structure_cem88v.spec.ts +++ b/spec/structure/structure_cem88v.spec.ts @@ -8,14 +8,13 @@ import { RectangularStructureParams } from "../../src/structure/rectangular_structure_params"; import { StructureFlowMode, StructureFlowRegime } from "../../src/structure/structure"; -import { StructureCem88v } from "../../src/structure/structure_cem88v"; -import { Result } from "../../src/util/result"; +import { StructureWeirCem88v } from "../../src/structure/structure_cem88v"; import { itCalcQ } from "./functions"; const structPrm: RectangularStructureParams = new RectangularStructureParams(1, 0, 1, 1, 2, 0.6, 0); -const structTest: StructureCem88v = new StructureCem88v(structPrm, false); +const structTest: StructureWeirCem88v = new StructureWeirCem88v(structPrm, false); -describe("Class StructureCem88v: ", () => { +describe("Class StructureWeirCem88v: ", () => { describe("Calcul Q avec W croissant: ", () => { const W: number[] = [0.000000, 0.100000, 0.200000, 0.300000, 0.400000, 0.500000, 0.600000, 0.700000, 0.800000, 0.900000, 1.000000, 1.100000, 1.200000, 1.300000]; diff --git a/spec/value_ref/value_ref_section.spec.ts b/spec/value_ref/value_ref_section.spec.ts index 4fd94933..2cbe9f44 100644 --- a/spec/value_ref/value_ref_section.spec.ts +++ b/spec/value_ref/value_ref_section.spec.ts @@ -1,5 +1,5 @@ import { cSnTrapez, ParamsSectionTrapez } from "../../src"; -import { SectionParametree } from "../../src/section/section_nub"; +import { SectionParametree } from "../../src/section/section_parametree"; import { acSection } from "../../src/section/section_type"; /** -- GitLab