From c51f0a5b6a461e9405a548f1ae44f35d4bee86bf Mon Sep 17 00:00:00 2001 From: Vissarion Fisikopoulos Date: Thu, 28 Mar 2024 16:14:16 +0200 Subject: [PATCH] Fix rounding test (#92) Co-authored-by: vfisikop --- tests/rounding.py | 60 ++++++++++------------------------------------- 1 file changed, 13 insertions(+), 47 deletions(-) diff --git a/tests/rounding.py b/tests/rounding.py index 7caa4cd5..dcf4cedb 100644 --- a/tests/rounding.py +++ b/tests/rounding.py @@ -2,7 +2,7 @@ # dingo is part of GeomScale project # Copyright (c) 2022 Apostolos Chalkis -# Copyright (c) 2022 Vissarion Fisikopoulos +# Copyright (c) 2022-2024 Vissarion Fisikopoulos # Copyright (c) 2022 Haris Zafeiropoulos # Licensed under GNU LGPL.3, see LICENCE file @@ -13,9 +13,7 @@ from dingo import MetabolicNetwork, PolytopeSampler from dingo.gurobi_based_implementations import fast_inner_ball -class TestSampling(unittest.TestCase): - - def test_rounding_min_ellipsoid(self): +def test_rounding(self, method_str): input_file_json = os.getcwd() + "/ext_data/e_coli_core.json" model = MetabolicNetwork.from_json( input_file_json ) @@ -23,7 +21,7 @@ def test_rounding_min_ellipsoid(self): A, b, N, N_shift = sampler.get_polytope() - A_rounded, b_rounded, Tr, Tr_shift = sampler.round_polytope(A, b, method="min_ellipsoid") + A_rounded, b_rounded, Tr, Tr_shift = sampler.round_polytope(A, b, method = method_str) self.assertTrue( A_rounded.shape[0] == 26 ) self.assertTrue( A_rounded.shape[1] == 24 ) @@ -32,46 +30,7 @@ def test_rounding_min_ellipsoid(self): self.assertTrue( N_shift.size == 95 ) self.assertTrue( b_rounded.size == 26 ) self.assertTrue( Tr_shift.size == 24 ) - - - self.assertTrue( N.shape[0] == 95 ) - self.assertTrue( N.shape[1] == 24 ) - self.assertTrue( Tr.shape[0] == 24 ) - self.assertTrue( Tr.shape[1] == 24 ) - - samples = sampler.sample_from_polytope_no_multiphase( - A_rounded, b_rounded, method = 'billiard_walk', n=1000, burn_in=10, thinning=1 - ) - - temp = np.full((samples.shape[0], samples.shape[1]), Tr_shift) - Tr_samples = Tr.dot(samples.T) + temp.T - all_points_in = True - for i in range(Tr_samples.shape[1]): - if np.any(A.dot(Tr_samples[:,i]) - b > 1e-05): - all_points_in = False - break - - self.assertTrue( all_points_in ) - - def test_rounding_john_position(self): - - input_file_json = os.getcwd() + "/ext_data/e_coli_core.json" - model = MetabolicNetwork.from_json( input_file_json ) - sampler = PolytopeSampler(model) - - A, b, N, N_shift = sampler.get_polytope() - - A_rounded, b_rounded, Tr, Tr_shift = sampler.round_polytope(A, b, method="john_position") - - self.assertTrue( A_rounded.shape[0] == 26 ) - self.assertTrue( A_rounded.shape[1] == 24 ) - - self.assertTrue( b.size == 26 ) - self.assertTrue( N_shift.size == 95 ) - self.assertTrue( b_rounded.size == 26 ) - self.assertTrue( Tr_shift.size == 24 ) - self.assertTrue( N.shape[0] == 95 ) self.assertTrue( N.shape[1] == 24 ) @@ -83,18 +42,25 @@ def test_rounding_john_position(self): A_rounded, b_rounded, method = 'billiard_walk', n=1000, burn_in=10, thinning=1 ) - temp = np.full((samples.shape[0], samples.shape[1]), Tr_shift) - Tr_samples = Tr.dot(samples.T) + temp.T + Tr_shift = Tr_shift.reshape(Tr_shift.shape[0], 1) + Tr_shift_mat = np.full((samples.shape[0], samples.shape[1]), Tr_shift) + Tr_samples = Tr.dot(samples) + Tr_shift_mat + all_points_in = True for i in range(Tr_samples.shape[1]): if np.any(A.dot(Tr_samples[:,i]) - b > 1e-05): all_points_in = False break - + self.assertTrue( all_points_in ) +class TestSampling(unittest.TestCase): + def test_rounding_min_ellipsoid(self): + test_rounding(self, "min_ellipsoid") + def test_rounding_john_position(self): + test_rounding(self, "john_position") if __name__ == "__main__": unittest.main() \ No newline at end of file