diff --git a/spec/session/serialisation.spec.ts b/spec/session/serialisation.spec.ts index e3a7df1241b01a8850efeebd4040d2aad2a70e90..0ecd68a212d890475d369a17c342257d5af7668a 100644 --- a/spec/session/serialisation.spec.ts +++ b/spec/session/serialisation.spec.ts @@ -1,5 +1,5 @@ -import { ParamValueMode, SectionParametree, Session } from "../../src"; import { ConduiteDistrib, ConduiteDistribParams } from "../../src/cond_distri"; +import { ParamValueMode, SectionParametree, Session } from "../../src/index"; import { CourbeRemous, CourbeRemousParams, MethodeResolution } from "../../src/remous"; import { cSnCirc, ParamsSectionCirc } from "../../src/section/section_circulaire"; import { cSnTrapez, ParamsSectionTrapez } from "../../src/section/section_trapez"; @@ -139,9 +139,9 @@ describe("serialising / deserialising session - ", () => { }); it ("loaded serialized RegimeUniforme should be calculable", () => { - const fs = require("fs"); Session.getInstance().clear(); - const session = fs.readFileSync(__dirname + "/../../../spec/session/session-RU.json", { encoding: "utf8" }); + // tslint:disable-next-line:max-line-length + const session = `{"session":[{"uid":"YTEwZG","props":{"calcType":3,"nodeType":2},"meta":{"title":"R. uniforme"},"children":[{"uid":"NDcxN3","props":{"calcType":14,"nodeType":2},"children":[],"parameters":[{"symbol":"Pr","mode":"SINGLE","value":0.0001},{"symbol":"Ks","mode":"SINGLE","value":40},{"symbol":"Q","mode":"CALCUL"},{"symbol":"If","mode":"SINGLE","value":0.001},{"symbol":"YB","mode":"SINGLE","value":1},{"symbol":"Y","mode":"SINGLE","value":0.89},{"symbol":"LargeurBerge","mode":"SINGLE","value":2.5}]}],"parameters":[{"symbol":"Pr","mode":"SINGLE","value":0.0001}]}]}`; Session.getInstance().unserialise(session); expect(Session.getInstance().getNumberOfNubs()).toBe(1); @@ -165,9 +165,9 @@ describe("serialising / deserialising session - ", () => { }); it ("loaded serialized Ouvrages should be calculable", () => { - const fs = require("fs"); Session.getInstance().clear(); - const session = fs.readFileSync(__dirname + "/../../../spec/session/session-OUV.json", { encoding: "utf8" }); + // tslint:disable-next-line:max-line-length + const session = `{"session":[{"uid":"NGVzdz","props":{"calcType":8,"nodeType":0},"meta":{"title":"Ouvrages"},"children":[{"uid":"Z2F4dz","props":{"calcType":7,"nodeType":5,"structureType":1,"loiDebit":1},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":100},{"symbol":"W","mode":"SINGLE","value":0.5},{"symbol":"L","mode":"SINGLE","value":2},{"symbol":"Cd","mode":"SINGLE","value":0.6}]},{"uid":"ZDR4cX","props":{"calcType":7,"nodeType":5,"structureType":1,"loiDebit":1},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":100},{"symbol":"W","mode":"SINGLE","value":0.5},{"symbol":"L","mode":"CALCUL"},{"symbol":"Cd","mode":"SINGLE","value":0.6}]}],"parameters":[{"symbol":"Pr","mode":"SINGLE","value":0.0001},{"symbol":"Q","mode":"SINGLE","value":3.5},{"symbol":"Z1","mode":"SINGLE","value":102},{"symbol":"Z2","mode":"SINGLE","value":101.5}]}]}`; Session.getInstance().unserialise(session); expect(Session.getInstance().getNumberOfNubs()).toBe(1); diff --git a/spec/session/session-OUV.json b/spec/session/session-OUV.json deleted file mode 100644 index 52309305cf8f4b1d5775e03e170ab09e94106880..0000000000000000000000000000000000000000 --- a/spec/session/session-OUV.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "session": [ - { - "uid": "NGVzdz", - "props": { - "calcType": 8, - "nodeType": 0 - }, - "meta": { - "title": "Ouvrages" - }, - "children": [ - { - "uid": "Z2F4dz", - "props": { - "calcType": 7, - "nodeType": 5, - "structureType": 1, - "loiDebit": 1 - }, - "children": [], - "parameters": [ - { - "symbol": "ZDV", - "mode": "SINGLE", - "value": 100 - }, - { - "symbol": "W", - "mode": "SINGLE", - "value": 0.5 - }, - { - "symbol": "L", - "mode": "SINGLE", - "value": 2 - }, - { - "symbol": "Cd", - "mode": "SINGLE", - "value": 0.6 - } - ] - }, - { - "uid": "ZDR4cX", - "props": { - "calcType": 7, - "nodeType": 5, - "structureType": 1, - "loiDebit": 1 - }, - "children": [], - "parameters": [ - { - "symbol": "ZDV", - "mode": "SINGLE", - "value": 100 - }, - { - "symbol": "W", - "mode": "SINGLE", - "value": 0.5 - }, - { - "symbol": "L", - "mode": "CALCUL" - }, - { - "symbol": "Cd", - "mode": "SINGLE", - "value": 0.6 - } - ] - } - ], - "parameters": [ - { - "symbol": "Pr", - "mode": "SINGLE", - "value": 0.0001 - }, - { - "symbol": "Q", - "mode": "SINGLE", - "value": 3.5 - }, - { - "symbol": "Z1", - "mode": "SINGLE", - "value": 102 - }, - { - "symbol": "Z2", - "mode": "SINGLE", - "value": 101.5 - } - ] - } - ] -} \ No newline at end of file diff --git a/spec/session/session-RU.json b/spec/session/session-RU.json deleted file mode 100644 index 8f2c6f3d7a7a95b4bd08db79a96b10325498d6be..0000000000000000000000000000000000000000 --- a/spec/session/session-RU.json +++ /dev/null @@ -1 +0,0 @@ -{"session":[{"uid":"YTEwZG","props":{"calcType":3,"nodeType":2},"meta":{"title":"R. uniforme"},"children":[{"uid":"NDcxN3","props":{"calcType":14,"nodeType":2},"children":[],"parameters":[{"symbol":"Pr","mode":"SINGLE","value":0.0001},{"symbol":"Ks","mode":"SINGLE","value":40},{"symbol":"Q","mode":"CALCUL"},{"symbol":"If","mode":"SINGLE","value":0.001},{"symbol":"YB","mode":"SINGLE","value":1},{"symbol":"Y","mode":"SINGLE","value":0.89},{"symbol":"LargeurBerge","mode":"SINGLE","value":2.5}]}],"parameters":[{"symbol":"Pr","mode":"SINGLE","value":0.0001}]}]} \ No newline at end of file diff --git a/spec/value_ref/value_ref_indirect.spec.ts b/spec/value_ref/value_ref_indirect.spec.ts index 4df7e9abcda2fb2f2f6ed74f0b6ab8e04f098d68..9e59d8766dd39005dfd4c3552296be7ae27eb6b2 100644 --- a/spec/value_ref/value_ref_indirect.spec.ts +++ b/spec/value_ref/value_ref_indirect.spec.ts @@ -1,5 +1,5 @@ import { CreateStructure, cSnCirc, cSnTrapez, LoiDebit, ParamsSectionCirc, - ParamsSectionTrapez, Session } from "../../src"; + ParamsSectionTrapez, Session } from "../../src/index"; import { PabDimension, PabDimensionParams } from "../../src/pab/pab_dimension"; import { RegimeUniforme } from "../../src/regime_uniforme"; import { SectionParametree } from "../../src/section/section_parametree"; diff --git a/spec/value_ref/value_ref_section.spec.ts b/spec/value_ref/value_ref_section.spec.ts index 8a9c89d31944bd18096e5db7030c93ec758ef8ff..50c1d19e6419ec62779b975ed7799bed2bc2b25c 100644 --- a/spec/value_ref/value_ref_section.spec.ts +++ b/spec/value_ref/value_ref_section.spec.ts @@ -1,4 +1,4 @@ -import { CreateStructure, cSnTrapez, LoiDebit, ParamsSectionTrapez, Session } from "../../src"; +import { CreateStructure, cSnTrapez, LoiDebit, ParamsSectionTrapez, Session } from "../../src/index"; import { SectionParametree } from "../../src/section/section_parametree"; import { Dever, DeverParams } from "../../src/structure/dever"; diff --git a/spec/value_ref/value_ref_target_status.spec.ts b/spec/value_ref/value_ref_target_status.spec.ts index 403aeb87e6840f3dd23aed944ed2b856eef03953..1d604b2dc2f0dfbc596b503605bbe050f1852bd7 100644 --- a/spec/value_ref/value_ref_target_status.spec.ts +++ b/spec/value_ref/value_ref_target_status.spec.ts @@ -6,7 +6,7 @@ */ // import { describe, expect, it } from "../mock_jasmine"; -import { Session } from "../../src"; +import { Session } from "../../src/index"; import { PabDimension, PabDimensionParams } from "../../src/pab/pab_dimension"; let nub1: PabDimension; diff --git a/spec/value_ref/value_ref_type_section.spec.ts b/spec/value_ref/value_ref_type_section.spec.ts index 069626084c4b91a629f3d810c44bfe3e5f5226e1..aacf137bdb786abf34c35929b880a33963bbfb82 100644 --- a/spec/value_ref/value_ref_type_section.spec.ts +++ b/spec/value_ref/value_ref_type_section.spec.ts @@ -1,5 +1,5 @@ import { CreateStructure, cSnCirc, LinkedValue, LoiDebit, ParallelStructure, ParallelStructureParams, - ParamsSectionCirc, Session } from "../../src"; + ParamsSectionCirc, Session } from "../../src/index"; import { RegimeUniforme } from "../../src/regime_uniforme"; import { RectangularStructureParams } from "../../src/structure/structure_cem88d"; diff --git a/spec/value_ref/value_ref_variable_extraresult.spec.ts b/spec/value_ref/value_ref_variable_extraresult.spec.ts index 9ddb5aeaf32856dc70486bd70dd8c0fcb1b8c097..55df0479dc6dbd9426019cfb3cc5a8f0927455e0 100644 --- a/spec/value_ref/value_ref_variable_extraresult.spec.ts +++ b/spec/value_ref/value_ref_variable_extraresult.spec.ts @@ -1,5 +1,5 @@ // tslint:disable-next-line:max-line-length -import { CreateStructure, cSnCirc, LoiDebit, ParamsSectionCirc, Session } from "../../src"; +import { CreateStructure, cSnCirc, LoiDebit, ParamsSectionCirc, Session } from "../../src/index"; import { RegimeUniforme } from "../../src/regime_uniforme"; import { Dever, DeverParams } from "../../src/structure/dever";