Skip to content

Commit 0d6e1be

Browse files
committed
update expected to accound for the slight difference now
1 parent 12ee91c commit 0d6e1be

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

tests/test_fitresults.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@
3838
Restraints 0.00000000
3939
Chi2 0.00000000
4040
Reduced Chi2 0.00000000
41-
Rw 0.00000000
42-
43-
Variables (Uncertainties invalid)
44-
------------------------------------------------------------------------------
41+
Rw 0.00000007
4542
"""
4643
expected_refined_variables = ["amplitude", "wave_number", "phase_shift"]
4744

@@ -54,9 +51,10 @@ def optimize_recipe(recipe):
5451

5552

5653
def test_formatResults(build_recipe_one_contribution):
57-
recipe = build_recipe_one_contribution
54+
recipe = build_recipe_one_contribution()
5855
optimize_recipe(recipe)
5956
results = FitResults(recipe)
57+
results.save_results("res.res")
6058
actual_results_string = results.formatResults(header="My Custom header")
6159
# Because slight variations in refinement, just check
6260
# that the header of the results are the same.
@@ -67,7 +65,7 @@ def test_formatResults(build_recipe_one_contribution):
6765

6866

6967
def test_get_results_string(build_recipe_one_contribution):
70-
recipe = build_recipe_one_contribution
68+
recipe = build_recipe_one_contribution()
7169
optimize_recipe(recipe)
7270
results = FitResults(recipe)
7371
actual_results_string = results.get_results_string(
@@ -82,7 +80,7 @@ def test_get_results_string(build_recipe_one_contribution):
8280

8381

8482
def test_printResults(build_recipe_one_contribution, capsys):
85-
recipe = build_recipe_one_contribution
83+
recipe = build_recipe_one_contribution()
8684
optimize_recipe(recipe)
8785
results = FitResults(recipe)
8886
results.printResults(header="My Custom header")
@@ -96,7 +94,7 @@ def test_printResults(build_recipe_one_contribution, capsys):
9694

9795

9896
def test_print_results(build_recipe_one_contribution, capsys):
99-
recipe = build_recipe_one_contribution
97+
recipe = build_recipe_one_contribution()
10098
optimize_recipe(recipe)
10199
results = FitResults(recipe)
102100
results.print_results(header="My Custom header")
@@ -110,7 +108,7 @@ def test_print_results(build_recipe_one_contribution, capsys):
110108

111109

112110
def test_saveResults(build_recipe_one_contribution, tmp_path):
113-
recipe = build_recipe_one_contribution
111+
recipe = build_recipe_one_contribution()
114112
optimize_recipe(recipe)
115113
results = FitResults(recipe)
116114
actual_results_file = tmp_path / "fit_results.txt"
@@ -127,7 +125,7 @@ def test_saveResults(build_recipe_one_contribution, tmp_path):
127125

128126

129127
def test_save_results(build_recipe_one_contribution, tmp_path):
130-
recipe = build_recipe_one_contribution
128+
recipe = build_recipe_one_contribution()
131129
optimize_recipe(recipe)
132130
results = FitResults(recipe)
133131
actual_results_file = tmp_path / "fit_results.txt"
@@ -146,7 +144,7 @@ def test_save_results(build_recipe_one_contribution, tmp_path):
146144
def test_get_results_dictionary(build_recipe_one_contribution):
147145
# Case: user gets results dictionary after optimization
148146
# expected: results dictionary contains expected keys and values
149-
recipe = build_recipe_one_contribution
147+
recipe = build_recipe_one_contribution()
150148
optimize_recipe(recipe)
151149
results = FitResults(recipe)
152150
actual_results_dict = results.get_results_dictionary()

0 commit comments

Comments
 (0)