Skip to content

Commit 6013ddf

Browse files
Fix summary test
1 parent 15bf93d commit 6013ddf

1 file changed

Lines changed: 3 additions & 32 deletions

File tree

mento/summary.py

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -336,38 +336,9 @@ def check(self, capacity_check: bool = False) -> DataFrame:
336336
"ØVn": "kN",
337337
}
338338

339-
# Code-specific capacity columns
340-
if isinstance(self.concrete, Concrete_EN_1992_2004):
341-
results_dict["MRd,top"] = round(beam._M_Rd_top.to("kN*m").magnitude, 1)
342-
results_dict["MRd,bot"] = round(beam._M_Rd_bot.to("kN*m").magnitude, 1)
343-
results_dict["VRd"] = round(shear_results["VRd"][0], 1)
344-
code_units: dict = {"MRd,top": "kNm", "MRd,bot": "kNm", "VRd": "kN"}
345-
else:
346-
results_dict["ØMn,top"] = round(beam._phi_M_n_top.to("kN*m").magnitude, 1)
347-
results_dict["ØMn,bot"] = round(beam._phi_M_n_bot.to("kN*m").magnitude, 1)
348-
results_dict["ØVn"] = round(shear_results["ØVn"][0], 1)
349-
code_units = {"ØMn,top": "kNm", "ØMn,bot": "kNm", "ØVn": "kN"}
350-
351-
# Units row
352-
units_row = pd.DataFrame(
353-
[
354-
OrderedDict(
355-
{
356-
"Beam": "",
357-
"b": "cm",
358-
"h": "cm",
359-
"As,top": "",
360-
"As,bot": "",
361-
"Av": "",
362-
"DCRb,top": "",
363-
"DCRb,bot": "",
364-
"DCRv": "",
365-
**code_units,
366-
"Status": "",
367-
}
368-
)
369-
]
370-
)
339+
# Assemble results_dict and units_row from the split dicts
340+
results_dict = OrderedDict({**common_data, **code_specific_data})
341+
units_row = pd.DataFrame([OrderedDict({**common_units, **code_specific_units, "Status": ""})])
371342

372343
# Determine status
373344
dcr_values = [results_dict["DCRb,top"], results_dict["DCRb,bot"], results_dict["DCRv"]]

0 commit comments

Comments
 (0)