Commit 79f70324 authored by Mathias Chouet's avatar Mathias Chouet 🍝
Browse files

Fix #122 - refactored classes organization

parent bde96c93
// tslint:disable-next-line:no-reference // tslint:disable-next-line:no-reference
/// <reference path="../node_modules/@types/jasmine/index.d.ts" /> /// <reference path="../node_modules/@types/jasmine/index.d.ts" />
import { ConduiteDistrib, ConduiteDistribParams } from "../src/cond_distri"; import { ConduiteDistrib } from "../src/cond_distri";
import { ConduiteDistribParams } from "../src/cond_distri_params";
import { checkResult } from "./test_func"; import { checkResult } from "./test_func";
describe("Class ConduiteDistrib: ", () => { describe("Class ConduiteDistrib: ", () => {
......
import { ArrayReverseIterator } from "../../src/util/iterator"; import { ArrayReverseIterator } from "../../src/util/array_reverse_iterator";
describe("array reverse iterator : ", () => { describe("array reverse iterator : ", () => {
it("reverse ( undefined )", () => { it("reverse ( undefined )", () => {
......
import { MapIterator } from "../../src/util/iterator"; import { MapIterator } from "../../src/util/map_iterator";
describe("param map iterator : ", () => { describe("param map iterator : ", () => {
it("sur undefined (1)", () => { it("sur undefined (1)", () => {
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
*/ */
// import { describe, expect, it, xdescribe, xit } from "../mock_jasmine"; // import { describe, expect, it, xdescribe, xit } from "../mock_jasmine";
import { ConduiteDistribParams } from "../../src/cond_distri"; import { ConduiteDistribParams } from "../../src/cond_distri_params";
import { IParamDefinitionIterator } from "../../src/param/params-equation"; import { IParamDefinitionIterator } from "../../src/param/param_definition_iterator";
import { CreateStructure } from "../../src/structure/factory_structure"; import { CreateStructure } from "../../src/structure/factory_structure";
import { ParallelStructure } from "../../src/structure/parallel_structure"; import { ParallelStructure } from "../../src/structure/parallel_structure";
import { ParallelStructureParams } from "../../src/structure/parallel_structure_params"; import { ParallelStructureParams } from "../../src/structure/parallel_structure_params";
......
import { LechaptCalmon, LechaptCalmonParams } from "../src/lechaptcalmon"; import { LechaptCalmon } from "../src/lechaptcalmon";
import { LechaptCalmonParams } from "../src/lechaptcalmon_params";
import { checkResult } from "./test_func"; import { checkResult } from "./test_func";
let lechapt: LechaptCalmon; let lechapt: LechaptCalmon;
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
// import { describe, expect, it, xdescribe, xit } from "../mock_jasmine"; // import { describe, expect, it, xdescribe, xit } from "../mock_jasmine";
import { ParamCalculability, ParamValueMode } from "../../src/index"; import { ParamCalculability, ParamValueMode } from "../../src/index";
import { MacroRugo, MacroRugoFlowType, MacrorugoParams } from "../../src/macrorugo/macrorugo"; import { MacroRugo, MacroRugoFlowType } from "../../src/macrorugo/macrorugo";
import { MacrorugoParams } from "../../src/macrorugo/macrorugo_params";
import { checkResult } from "../test_func"; import { checkResult } from "../test_func";
/* /*
......
import { CalculatorType } from "../../src/compute-node"; import { CalculatorType } from "../../src/compute-node";
import { MacroRugo, MacrorugoParams } from "../../src/macrorugo/macrorugo"; import { MacroRugo } from "../../src/macrorugo/macrorugo";
import { MacrorugoCompound } from "../../src/macrorugo/macrorugo_compound"; import { MacrorugoCompound } from "../../src/macrorugo/macrorugo_compound";
import { MacrorugoParams } from "../../src/macrorugo/macrorugo_params";
import { Props } from "../../src/props"; import { Props } from "../../src/props";
import { Session } from "../../src/session"; import { Session } from "../../src/session";
import { compareTwoResults } from "../test_func"; import { compareTwoResults } from "../test_func";
......
import { CloisonAval, ParallelStructureParams } from "../../src/pab/cloison_aval"; import { CloisonAval } from "../../src/pab/cloison_aval";
import { CloisonsAvalParams } from "../../src/pab/cloison_aval_params"; import { CloisonsAvalParams } from "../../src/pab/cloison_aval_params";
import { StructureVanLevLarinier, StructureVanLevParams } from "../../src/structure/structure_vanlev"; import { StructureVanLevLarinier } from "../../src/structure/structure_vanlev_larinier";
import { StructureVanLevVillemonte } from "../../src/structure/structure_vanlev"; import { StructureVanLevParams } from "../../src/structure/structure_vanlev_params";
import { StructureVanLevVillemonte } from "../../src/structure/structure_vanlev_villemonte";
import { MessageCode } from "../../src/util/message"; import { MessageCode } from "../../src/util/message";
function getCloisonAvalTest(Q: number, Z2: number): CloisonAval { function getCloisonAvalTest(Q: number, Z2: number): CloisonAval {
......
import { Nub } from "../../src/nub";
import { Cloisons } from "../../src/pab/cloisons"; import { Cloisons } from "../../src/pab/cloisons";
import { Session } from "../../src/session"; import { Session } from "../../src/session";
......
...@@ -9,11 +9,13 @@ ...@@ -9,11 +9,13 @@
import { ParamValueMode, Session } from "../../src/index"; import { ParamValueMode, Session } from "../../src/index";
import { CloisonAval } from "../../src/pab/cloison_aval"; import { CloisonAval } from "../../src/pab/cloison_aval";
import { CloisonsAvalParams } from "../../src/pab/cloison_aval_params"; import { CloisonsAvalParams } from "../../src/pab/cloison_aval_params";
import { Cloisons, CloisonsParams } from "../../src/pab/cloisons"; import { Cloisons } from "../../src/pab/cloisons";
import { Pab, PabParams } from "../../src/pab/pab"; import { CloisonsParams } from "../../src/pab/cloisons_params";
import { ParallelStructureParams } from "../../src/structure/parallel_structure"; import { Pab } from "../../src/pab/pab";
import { PabParams } from "../../src/pab/pab_params";
import { RectangularStructureParams } from "../../src/structure/rectangular_structure_params"; import { RectangularStructureParams } from "../../src/structure/rectangular_structure_params";
import { StructureVanLevParams, StructureVanLevVillemonte } from "../../src/structure/structure_vanlev"; import { StructureVanLevParams } from "../../src/structure/structure_vanlev_params";
import { StructureVanLevVillemonte } from "../../src/structure/structure_vanlev_villemonte";
import { StructureWeirSubmergedLarinier } from "../../src/structure/structure_weir_submerged_larinier"; import { StructureWeirSubmergedLarinier } from "../../src/structure/structure_weir_submerged_larinier";
import { StructureWeirVillemonte } from "../../src/structure/structure_weir_villemonte"; import { StructureWeirVillemonte } from "../../src/structure/structure_weir_villemonte";
import { MessageCode } from "../../src/util/message"; import { MessageCode } from "../../src/util/message";
......
import { PabChute, PabChuteParams } from "../../src/pab/pab_chute"; import { PabChute } from "../../src/pab/pab_chute";
import { PabChuteParams } from "../../src/pab/pab_chute_params";
import { checkResult } from "../test_func"; import { checkResult } from "../test_func";
function pabChuteTest(varTest: string, expected: number) { function pabChuteTest(varTest: string, expected: number) {
......
import { PabDimension, PabDimensionParams } from "../../src/pab/pab_dimension"; import { PabDimension } from "../../src/pab/pab_dimension";
import { PabDimensionParams } from "../../src/pab/pab_dimensions_params";
import { checkResult } from "../test_func"; import { checkResult } from "../test_func";
function pabDimensionTest(varTest: string) { function pabDimensionTest(varTest: string) {
......
import { PabNombre, PabNombreParams } from "../../src/pab/pab_nombre"; import { PabNombre } from "../../src/pab/pab_nombre";
import { PabNombreParams } from "../../src/pab/pab_nombre_params";
import { checkResult } from "../test_func"; import { checkResult } from "../test_func";
function pabNombreTest(varTest: string, expected: number) { function pabNombreTest(varTest: string, expected: number) {
......
// tslint:disable-next-line:no-reference // tslint:disable-next-line:no-reference
/// <reference path="../../node_modules/@types/jasmine/index.d.ts" /> /// <reference path="../../node_modules/@types/jasmine/index.d.ts" />
import { PabPuissance, PabPuissanceParams } from "../../src/pab/pab_puissance"; import { PabPuissance } from "../../src/pab/pab_puissance";
import { PabPuissanceParams } from "../../src/pab/pab_puissance_params";
import { checkResult } from "../test_func"; import { checkResult } from "../test_func";
function PabPuissanceTest(varTest: string) { function PabPuissanceTest(varTest: string) {
......
import { import {
cSnTrapez, LinkedValue, Nub, ParallelStructure, ParallelStructureParams, cSnTrapez, LinkedValue, Nub, ParallelStructure, ParallelStructureParams,
ParamCalculability, ParamsSectionTrapez, ParamValueMode, SectionParametree, ParamValueMode, SectionParametree,
Session Session
} from "../../src/index"; } from "../../src/index";
import { Cloisons } from "../../src/pab/cloisons"; import { Cloisons } from "../../src/pab/cloisons";
import { CloisonsParams } from "../../src/pab/cloisons_params"; import { CloisonsParams } from "../../src/pab/cloisons_params";
import { RegimeUniforme } from "../../src/regime_uniforme"; import { RegimeUniforme } from "../../src/regime_uniforme";
import { cSnCirc, ParamsSectionCirc } from "../../src/section/section_circulaire"; import { cSnCirc } from "../../src/section/section_circulaire";
import { Dever, DeverParams } from "../../src/structure/dever"; import { ParamsSectionCirc } from "../../src/section/section_circulaire_params";
import { ParamsSectionTrapez } from "../../src/section/section_trapez_params";
import { Dever } from "../../src/structure/dever";
import { DeverParams } from "../../src/structure/dever_params";
import { CreateStructure } from "../../src/structure/factory_structure"; import { CreateStructure } from "../../src/structure/factory_structure";
import { LoiDebit } from "../../src/structure/structure_props"; import { LoiDebit } from "../../src/structure/structure_props";
......
import { CreateStructure, ExtensionStrategy, LoiDebit, ParallelStructure, ParallelStructureParams, import { CreateStructure, ExtensionStrategy, LoiDebit, ParallelStructure, ParallelStructureParams,
ParamValueMode, Session, Structure} from "../../src/index"; ParamValueMode, Session, Structure} from "../../src/index";
import { RectangularStructureParams } from "../../src/structure/structure_cem88d"; import { RectangularStructureParams } from "../../src/structure/rectangular_structure_params";
let prms1: ParallelStructureParams; let prms1: ParallelStructureParams;
let nub1: ParallelStructure; let nub1: ParallelStructure;
......
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
/// <reference path="../../node_modules/@types/jasmine/index.d.ts" /> /// <reference path="../../node_modules/@types/jasmine/index.d.ts" />
import { RegimeUniforme } from "../../src/regime_uniforme"; import { RegimeUniforme } from "../../src/regime_uniforme";
import { cSnCirc, ParamsSectionCirc } from "../../src/section/section_circulaire"; import { cSnCirc } from "../../src/section/section_circulaire";
import { ParamsSectionCirc } from "../../src/section/section_circulaire_params";
import { precDist } from "../test_config"; import { precDist } from "../test_config";
import { checkResult, equalEpsilon } from "../test_func"; import { checkResult } from "../test_func";
describe("Class RegimeUniforme / section circulaire :", () => { describe("Class RegimeUniforme / section circulaire :", () => {
describe("pas de débordement : ", () => { describe("pas de débordement : ", () => {
......
...@@ -7,10 +7,11 @@ ...@@ -7,10 +7,11 @@
// import { describe, expect, it, xdescribe } from "../mock_jasmine"; // import { describe, expect, it, xdescribe } from "../mock_jasmine";
import { RegimeUniforme } from "../../src/regime_uniforme"; import { RegimeUniforme } from "../../src/regime_uniforme";
import { cSnPuiss, ParamsSectionPuiss } from "../../src/section/section_puissance"; import { cSnPuiss } from "../../src/section/section_puissance";
import { ParamsSectionPuiss } from "../../src/section/section_puissance_params";
import { MessageCode } from "../../src/util/message"; import { MessageCode } from "../../src/util/message";
import { Result } from "../../src/util/result"; import { Result } from "../../src/util/result";
import { precDigits, precDist } from "../test_config"; import { precDist } from "../test_config";
import { checkResult } from "../test_func"; import { checkResult } from "../test_func";
describe("Class RegimeUniforme / section puissance :", () => { describe("Class RegimeUniforme / section puissance :", () => {
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
// import { describe, expect, it, xdescribe, xit } from "../mock_jasmine"; // import { describe, expect, it, xdescribe, xit } from "../mock_jasmine";
import { RegimeUniforme } from "../../src/regime_uniforme"; import { RegimeUniforme } from "../../src/regime_uniforme";
import { cSnRectang, ParamsSectionRectang } from "../../src/section/section_rectang"; import { cSnRectang } from "../../src/section/section_rectang";
import { Result } from "../../src/util/result"; import { ParamsSectionRectang } from "../../src/section/section_rectang_params";
import { precDist } from "../test_config"; import { precDist } from "../test_config";
import { checkResult, equalEpsilon } from "../test_func"; import { checkResult, equalEpsilon } from "../test_func";
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
/// <reference path="../../node_modules/@types/jasmine/index.d.ts" /> /// <reference path="../../node_modules/@types/jasmine/index.d.ts" />
import { RegimeUniforme } from "../../src/regime_uniforme"; import { RegimeUniforme } from "../../src/regime_uniforme";
import { cSnTrapez, ParamsSectionTrapez } from "../../src/section/section_trapez"; import { cSnTrapez } from "../../src/section/section_trapez";
import { Result } from "../../src/util/result"; import { ParamsSectionTrapez } from "../../src/section/section_trapez_params";
import { precDist } from "../test_config"; import { precDist } from "../test_config";
import { checkResult, equalEpsilon } from "../test_func"; import { checkResult, equalEpsilon } from "../test_func";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment