diff --git a/solventmapcreator/polynomialanalysis/polynomialcomparison.py b/solventmapcreator/polynomialanalysis/polynomialcomparison.py index f78446fcd327732dacf587535c4397094a46a205..1c88327911010a68652adbc453fa0e43588da262 100644 --- a/solventmapcreator/polynomialanalysis/polynomialcomparison.py +++ b/solventmapcreator/polynomialanalysis/polynomialcomparison.py @@ -15,6 +15,11 @@ logging.basicConfig() LOGGER = logging.getLogger(__name__) LOGGER.setLevel(logging.WARN) +def generate_similarity_matrix_plot_input(sorted_id_list, matrix): + """This compiles the input information needed for the similarity matrix plot. + """ + return {"labels":sorted_id_list, "value_matrix":matrix} + def calculate_hausdorff_distance_matrix_from_poly_coeff(x_values, polynomial_order, poly_data_by_id): """This first extracts and calculates the values, then returns the Hausdorff matrix. """ diff --git a/solventmapcreator/test/polynomialanalysistest/polynomialcomparisontest.py b/solventmapcreator/test/polynomialanalysistest/polynomialcomparisontest.py index 3740157268c8ad34ea30b2b7dc1e308c20255384..d3882f374d4f89584cd5880c9574498b6e60465a 100644 --- a/solventmapcreator/test/polynomialanalysistest/polynomialcomparisontest.py +++ b/solventmapcreator/test/polynomialanalysistest/polynomialcomparisontest.py @@ -46,9 +46,22 @@ class PolynomialComparisonTestCase(unittest.TestCase): del self.poly_data_by_solvent_id del self.x_values del self.poly_values_dict - def test_(self): - """ - """ + def test_generate_similarity_matrix_plot_input(self): + """Test to see if expected dictionary is created. + """ + expected_dict = {"labels":["poly_fit", "poly_fit2", "poly_fit3"], + "value_matrix":np.array([[0.0, 1.0, 4.0], + [1.0, 0.0, 3.0], + [4.0, 3.0, 0.0]])} + input_matrix = np.array([[0.0, 1.0, 4.0], + [1.0, 0.0, 3.0], + [4.0, 3.0, 0.0]]) + id_list = ["poly_fit", "poly_fit2", "poly_fit3"] + actual_dict = polynomialcomparison.generate_similarity_matrix_plot_input(id_list, input_matrix) + self.assertEqual(2, len(actual_dict.keys())) + self.assertListEqual(sorted(expected_dict.keys()), sorted(actual_dict.keys())) + self.assertListEqual(expected_dict["labels"], actual_dict["labels"]) + np.testing.assert_array_almost_equal(expected_dict["value_matrix"], actual_dict["value_matrix"]) def test_calculate_hausdorff_distance_matrix_from_poly_coeff(self): """Test tp see if expected matrix is produced. """