@@ -147,19 +147,27 @@ def test_get_results_dictionary(build_recipe_one_contribution):
147147 recipe = build_recipe_one_contribution
148148 optimize_recipe (recipe )
149149 results = FitResults (recipe )
150+ results .print_results ()
150151 actual_results_dict = results .get_results_dictionary ()
151- expected_metrics = [
152- "Residual" ,
153- "Contributions" ,
154- "Restraints" ,
155- "Chi2" ,
156- "Reduced Chi2" ,
157- "Rw" ,
158- ]
159- for expected_metric in expected_metrics :
160- assert expected_metric in actual_results_dict
161- for expected_var in expected_refined_variables :
162- assert expected_var in actual_results_dict
152+ expected_results_dict = {
153+ "amplitude" : 1.000000000060171 ,
154+ "wave_number" : 1.00000000012548 ,
155+ "phase_shift" : - 1.6129114631049646e-18 ,
156+ "Residual" : 3.3284672708760557e-19 ,
157+ "Contributions" : 3.3284672708760557e-19 ,
158+ "Restraints" : 0 ,
159+ "Chi2" : 3.3284672708760557e-19 ,
160+ "Reduced Chi2" : 4.7549532441086507e-20 ,
161+ "Rw" : 2.7196679825449506e-10 ,
162+ }
163+ actual_values = np .round (np .array (list (actual_results_dict .values ())), 5 )
164+ actual_keys = set (actual_results_dict .keys ())
165+ expected_values = np .round (
166+ np .array (list (expected_results_dict .values ())), 5
167+ )
168+ expected_keys = set (expected_results_dict .keys ())
169+ assert expected_keys == actual_keys
170+ assert list (expected_values == list (actual_values ))
163171
164172
165173def test_resultsDictionary (temp_data_files ):
0 commit comments