diff --git a/.coverage b/.coverage index 6c31119..439c2d5 100644 Binary files a/.coverage and b/.coverage differ diff --git a/.idea/Empirical_Isochrones.iml b/.idea/Empirical_Isochrones.iml index abb96cc..fcdcdbd 100644 --- a/.idea/Empirical_Isochrones.iml +++ b/.idea/Empirical_Isochrones.iml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<module type="PYTHON_MODULE" version="4"> +<module version="4"> <component name="NewModuleRootManager"> - <content url="file://$MODULE_DIR$"> - <excludeFolder url="file://$MODULE_DIR$/LTN" /> - <excludeFolder url="file://$MODULE_DIR$/data" /> - </content> <orderEntry type="jdk" jdkName="PaperI" jdkType="Python SDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> - <component name="PyDocumentationSettings"> - <option name="renderExternalDocumentation" value="true" /> - </component> </module> \ No newline at end of file diff --git a/test/test_Simulation_functions.py b/test/test_Simulation_functions.py index eb3e7df..9da52d0 100644 --- a/test/test_Simulation_functions.py +++ b/test/test_Simulation_functions.py @@ -208,11 +208,9 @@ def test_add_field_unallowed_vals(initialized_class_object): obj = initialized_class_object binarity_frac = -0.1 with pytest.raises(ValueError, match="Fraction needs to be between 0 and 1."): - obj.add_field_contamination(binarity_frac) obj.add_field_contamination(binarity_frac, field_data_path=file_path) binarity_frac = 1.1 with pytest.raises(ValueError, match="Fraction needs to be between 0 and 1."): - obj.add_field_contamination(binarity_frac) obj.add_field_contamination(binarity_frac, field_data_path=file_path) @@ -224,7 +222,6 @@ def test_add_field_contamination_sampling(initialized_class_object): obj.add_parallax_uncertainty(0.1) obj.add_binary_fraction(0.3) obj.add_extinction(0.5) - obj.add_field_contamination(contamination_frac) obj.add_field_contamination(contamination_frac, field_data_path=file_path) # Check if the correct number of entries is sampled @@ -240,7 +237,6 @@ def test_add_field_contamination_conversion(initialized_class_object): obj.add_parallax_uncertainty(0.1) obj.add_binary_fraction(0.3) obj.add_extinction(0.5) - obj.add_field_contamination(contamination_frac) obj.add_field_contamination(contamination_frac, field_data_path=file_path) # Check if the conversion is done correctly for the sampled field data @@ -257,7 +253,6 @@ def test_add_field_contamination_merging(initialized_class_object): obj.add_parallax_uncertainty(0.1) obj.add_binary_fraction(0.3) obj.add_extinction(0.5) - obj.add_field_contamination(contamination_frac) obj.add_field_contamination(contamination_frac, field_data_path=file_path) # Check if the merging is done correctly @@ -292,7 +287,6 @@ def test_plot_verification_returns_figure_and_axes(initialized_class_object): obj.add_parallax_uncertainty(uncertainties[0]) obj.add_binary_fraction(uncertainties[1]) obj.add_extinction(uncertainties[2]) - obj.add_field_contamination(uncertainties[3]) obj.add_field_contamination(uncertainties[3], field_data_path=file_path) fig, axes = obj.plot_verification(uncertainties) @@ -309,7 +303,6 @@ def test_plot_verification_plots_correct_data(initialized_class_object): obj.add_parallax_uncertainty(uncertainties[0]) obj.add_binary_fraction(uncertainties[1]) obj.add_extinction(uncertainties[2]) - obj.add_field_contamination(uncertainties[3]) obj.add_field_contamination(uncertainties[3], field_data_path=file_path) fig, axes = obj.plot_verification(uncertainties) @@ -372,4 +365,3 @@ def test_RSS(): -