Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(fix-129): Library should not stop calculation if data is not correctly set #130

Merged
merged 1 commit into from
Oct 24, 2024
Merged

fix(fix-129): Library should not stop calculation if data is not correctly set #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions src/3.4_pont_thermique.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,28 @@ function tv_k(di, de, du, pc_id, enveloppe) {
if (desc.match(/(.+) \/ (.+)/)) {
desc_1 = desc.match(/(.+) \/ (.+)/)[1];
desc_2 = desc.match(/(.+) \/ (.+)/)[2];
} else if (desc.match(/(.+)-(.+)/)[1]) {
} else if (desc.match(/(.+)-(.+)/)) {
desc_1 = desc.match(/(.+)-(.+)/)[1];
desc_2 = desc.match(/(.+)-(.+)/)[2];
} else {
console.error(`BUG: description '${desc}' non reconnue pour le pont thermique...`);
return;
}

de.reference_1 = mur_list.find(
let ptMur = mur_list.find(
(mur) =>
mur.donnee_entree.description.includes(desc_1) ||
mur.donnee_entree.description.includes(desc_2)
).donnee_entree.reference;
);
if (ptMur) {
de.reference_1 = ptMur.donnee_entree.reference;
} else {
console.error(
`BUG: descriptions '${desc_1}' ou '${desc_2}' du pont thermique non reconnue dans les descriptions des murs`
);
return;
}

let list_2;
switch (type_liaison) {
case 'refend / mur':
Expand All @@ -49,11 +58,19 @@ function tv_k(di, de, du, pc_id, enveloppe) {
break;
}
if (list_2) {
de.reference_2 = list_2.find(
ptMur = list_2.find(
(men) =>
men.donnee_entree.description.includes(desc_2) ||
men.donnee_entree.description.includes(desc_1)
).donnee_entree.reference;
);
if (ptMur) {
de.reference_2 = ptMur.donnee_entree.reference;
} else {
console.error(
`BUG: descriptions '${desc_1}' ou '${desc_2}' du pont thermique non reconnue dans '${type_liaison}'`
);
return;
}
}
}

Expand Down Expand Up @@ -95,6 +112,10 @@ function tv_k(di, de, du, pc_id, enveloppe) {
plancher.donnee_entree.reference === de.reference_1 ||
plancher.donnee_entree.reference === de.reference_2
);
if (!plancher) {
console.error('Did not find plancher reference:', de.reference_1, de.reference_2);
return;
}
const isolation_plancher = requestInput(
plancher.donnee_entree,
plancher.donnee_utilisateur,
Expand Down
18 changes: 9 additions & 9 deletions src/3_deperdition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default function calc_deperdition(cg, zc, th, ej, enveloppe, logement) {
const porte_list = enveloppe.porte_collection.porte || [];
const bv_list = enveloppe.baie_vitree_collection.baie_vitree || [];
const pt_list = enveloppe.pont_thermique_collection.pont_thermique || [];
const vt_list = logement.ventilation_collection.ventilation;
const vt_list = logement.ventilation_collection.ventilation || [];

mur_list.forEach((mur) => calc_mur(mur, zc, pc, ej));
pb_list.forEach((pb) => calc_pb(pb, zc, pc, ej, pb_list));
Expand All @@ -87,14 +87,14 @@ export default function calc_deperdition(cg, zc, th, ej, enveloppe, logement) {
calc_ventilation(vt, cg, th, Sdep, mur_list, ph_list, porte_list, bv_list);
});

const d_mur = mur_list.reduce((acc, mur) => acc + Umur(mur), 0);
const d_pb = pb_list.reduce((acc, pb) => acc + Upb(pb), 0);
const d_ph = ph_list.reduce((acc, ph) => acc + Uph(ph), 0);
const d_bv = bv_list.reduce((acc, bv) => acc + Ubv(bv), 0);
const d_porte = porte_list.reduce((acc, porte) => acc + Uporte(porte), 0);
const d_pt = pt_list.reduce((acc, pt) => acc + Upt(pt), 0);
const hvent = vt_list.reduce((acc, vt) => acc + vt.donnee_intermediaire.hvent, 0);
const hperm = vt_list.reduce((acc, vt) => acc + vt.donnee_intermediaire.hperm, 0);
const d_mur = mur_list.reduce((acc, mur) => acc + Umur(mur) || 0, 0);
const d_pb = pb_list.reduce((acc, pb) => acc + Upb(pb) || 0, 0);
const d_ph = ph_list.reduce((acc, ph) => acc + Uph(ph) || 0, 0);
const d_bv = bv_list.reduce((acc, bv) => acc + Ubv(bv) || 0, 0);
const d_porte = porte_list.reduce((acc, porte) => acc + Uporte(porte) || 0, 0);
const d_pt = pt_list.reduce((acc, pt) => acc + Upt(pt) || 0, 0);
const hvent = vt_list.reduce((acc, vt) => acc + vt.donnee_intermediaire.hvent || 0, 0);
const hperm = vt_list.reduce((acc, vt) => acc + vt.donnee_intermediaire.hperm || 0, 0);

return {
hvent,
Expand Down
8 changes: 7 additions & 1 deletion src/engine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,15 @@ export function calcul_3cl(dpe) {
if (logement.enveloppe === undefined) {
console.warn('vide: logement.enveloppe');
return null;
} else if (logement.enveloppe.mur_collection === undefined) {
} else if (!logement.enveloppe.mur_collection) {
console.warn('vide: logement.enveloppe.mur_collection');
return null;
} else if (!logement.enveloppe.plancher_haut_collection) {
console.warn('vide: logement.enveloppe.plancher_haut_collection');
return null;
} else if (!logement.enveloppe.plancher_bas_collection) {
console.warn('vide: logement.enveloppe.plancher_bas_collection');
return null;
}

add_references(logement.enveloppe);
Expand Down