FAQ | This is a LIVE service | Changelog

Skip to content
Snippets Groups Projects
Commit 87095a08 authored by M.D. Driver's avatar M.D. Driver
Browse files

updated function to produce information for all orders.

parent db95920f
No related branches found
No related tags found
No related merge requests found
...@@ -24,15 +24,19 @@ def get_total_sorted_by_alt_metric(full_order_list, best_order_sorted_dict): ...@@ -24,15 +24,19 @@ def get_total_sorted_by_alt_metric(full_order_list, best_order_sorted_dict):
for i in range(len(full_order_list)): for i in range(len(full_order_list)):
order = full_order_list[i] order = full_order_list[i]
order_info = [] order_info = []
for j in range(len(order_tuple)): for j in range(len(full_order_list)):
sorted_dict_order = full_order_list[j] sorted_dict_order = full_order_list[j]
if order in best_order_sorted_dict[sorted_dict_order].keys(): if sorted_dict_order in best_order_sorted_dict.keys():
order_info.append(len(best_order_sorted_dict[sorted_dict_order][order])) if order in best_order_sorted_dict[sorted_dict_order].keys():
order_info.append(len(best_order_sorted_dict[sorted_dict_order][order]))
else:
order_info.append(0)
else: else:
order_info.append(0) order_info.append(0)
numbers_by_order.append(tuple(order_info)) numbers_by_order.append(tuple(order_info))
numbers_by_order_tuple = tuple(numbers_by_order) numbers_by_order_tuple = tuple(numbers_by_order)
return (order_tuple, numbers_by_order_tuple) return (tuple(full_order_list), numbers_by_order_tuple)
def get_total_by_fit_order(best_order_dict): def get_total_by_fit_order(best_order_dict):
"""This returns a tuple containing the order, and also the number of """This returns a tuple containing the order, and also the number of
......
...@@ -55,7 +55,7 @@ class PolynomialDataAnalysisTestCase(unittest.TestCase): ...@@ -55,7 +55,7 @@ class PolynomialDataAnalysisTestCase(unittest.TestCase):
rmse_solvent_id_dict = polynomialdataanalysis.get_solvent_id_by_order(self.rmse_dict) rmse_solvent_id_dict = polynomialdataanalysis.get_solvent_id_by_order(self.rmse_dict)
covar_solvent_id_dict = polynomialdataanalysis.get_solvent_id_by_order(self.covar_dict) covar_solvent_id_dict = polynomialdataanalysis.get_solvent_id_by_order(self.covar_dict)
ordered_id_dict = polynomialdataanalysis.generate_lists_by_alt_metric(rmse_solvent_id_dict, covar_solvent_id_dict) ordered_id_dict = polynomialdataanalysis.generate_lists_by_alt_metric(rmse_solvent_id_dict, covar_solvent_id_dict)
expected_tuple = ((1,),((1,),(1,))) expected_tuple = ((1, 2),((1, 0),(1, 0)))
actual_tuple = polynomialdataanalysis.get_total_sorted_by_alt_metric([1, 2], ordered_id_dict) actual_tuple = polynomialdataanalysis.get_total_sorted_by_alt_metric([1, 2], ordered_id_dict)
self.assertEqual(expected_tuple, actual_tuple) self.assertEqual(expected_tuple, actual_tuple)
def test_get_total_by_fit_order(self): def test_get_total_by_fit_order(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment