Skip to content

Commit

Permalink
constraints in summary
Browse files Browse the repository at this point in the history
  • Loading branch information
andped10 committed Nov 18, 2024
1 parent 4c57068 commit 70ca601
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/easyreflectometry/summary/summary.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,5 +173,5 @@ def _refinement_section(
html_refinement = html_refinement.replace('num_total_params', f'{num_params}')
html_refinement = html_refinement.replace('num_free_params', f'{num_free_params}')
html_refinement = html_refinement.replace('num_fixed_params', f'{num_fixed_params}')
html_refinement = html_refinement.replace('num_constraints', f'{num_constraints}')
html_refinement = html_refinement.replace('num_constriants', f'{num_constraints}')
return html_refinement
3 changes: 1 addition & 2 deletions src/easyreflectometry/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,5 @@ def count_parameter_user_constraints(project) -> int:
count = 0
parameters = project.parameters
for parameter in parameters:
if parameter.constraint:
count = count + len(parameter.user_constraints.keys())
count = count + len(parameter.user_constraints.keys())
return count
9 changes: 5 additions & 4 deletions tests/summary/test_summary.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ def test_refinement_section(self, project: Project) -> None:
html = summary._refinement_section()

# Expect
assert (
html
== '\n<tr>\n <td><h3>Refinement</h3></td>\n</tr>\n\n<tr></tr>\n\n<tr>\n <td>Calculation engine</td>\n <td>refnx</td>\n</tr>\n<tr>\n <td>Minimization engine</td>\n <td>LMFit_leastsq</td>\n</tr>\n<tr>\n <td>Goodness-of-fit: reduced <i>&chi;</i><sup>2</sup></td>\n <td>goodness_of_fit</td>\n</tr>\n<tr>\n <td>No. of parameters: total, free, fixed</td>\n <td>14, 0, 14</td>\n</tr>\n<tr>\n <td>No. of constraints</td>\n <td>num_constriants</td>\n</tr>\n\n<tr></tr>\n'
)
assert 'refnx' in html
assert 'LMFit_leastsq' in html
assert 'total, free, fixed' in html
assert '14, 0, 14' in html
assert 'No. of constraints' in html

0 comments on commit 70ca601

Please sign in to comment.