Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

211 cosmosis connector fails if sampling parameters sections is not present on the likelihood configuration #212

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
[flake8]
max-line-length = 88
per-file-ignores =
examples/srd_sn/generate_sn_data.py:E501
...
select = C,E,F,W,B,B950
extend-ignore = E203, E501

2 changes: 1 addition & 1 deletion firecrown/connector/cosmosis/likelihood.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def __init__(self, config: cosmosis.datablock):

build_parameters = extract_section(config, option_section)

sections = config[option_section, "sampling_parameters_sections"]
sections = config.get_string(option_section, "sampling_parameters_sections", "")
sections = sections.split()

self.firecrown_module_name = option_section
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
[flake8]
max_line_length=88
per-file-ignores =
examples/srd_sn/generate_sn_data.py:E501
22 changes: 22 additions & 0 deletions tests/connector/cosmosis/test_cosmosis_module.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import cosmosis.datablock
import pytest
from firecrown.connector.cosmosis.likelihood import FirecrownLikelihood


@pytest.fixture(name="minimal_module_config")
def fixture_minimal_module_config():
"""Return a minimal CosmoSIS datablock.
It contains only the module's filename.
This is the minimal possible configuration."""
block = cosmosis.datablock.DataBlock()
block.put_string(
"module_options", "likelihood_source", "tests/likelihood/lkdir/lkscript.py"
)
return block


def test_parameterless_module_construction(minimal_module_config):
"""Make sure we can create a CosmoSIS likelihood modules that does not
introduce any new parameters."""
module = FirecrownLikelihood(minimal_module_config)
assert module.sampling_sections == []
6 changes: 3 additions & 3 deletions tests/test_parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ def test_derived_parameter_wrong_type():
"""Try instantiating DerivedParameter objects with wrong types."""

with pytest.raises(TypeError):
derived_param = DerivedParameterScalar( # pylint: disable-msg=E0110,W0612
_ = DerivedParameterScalar( # pylint: disable-msg=E0110,W0612
"sec1", "name1", "not a float"
)
with pytest.raises(TypeError):
derived_param = DerivedParameterScalar( # pylint: disable-msg=E0110,W0612
_ = DerivedParameterScalar( # pylint: disable-msg=E0110,W0612
"sec1", "name1", [3.14]
)
with pytest.raises(TypeError):
derived_param = DerivedParameterScalar( # pylint: disable-msg=E0110,W0612
_ = DerivedParameterScalar( # pylint: disable-msg=E0110,W0612
"sec1", "name1", np.array([3.14])
)

Expand Down
8 changes: 4 additions & 4 deletions tests/test_updatable.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ def _get_derived_parameters(self) -> DerivedParameterCollection:

def test_verify_abstract_interface():
with pytest.raises(TypeError):
x = Missing_update() # pylint: disable-msg=E0110,W0612
_ = Missing_update() # pylint: disable-msg=E0110,W0612
with pytest.raises(TypeError):
x = Missing_reset() # pylint: disable-msg=E0110,W0612
_ = Missing_reset() # pylint: disable-msg=E0110,W0612
with pytest.raises(TypeError):
x = Missing_required_parameters() # pylint: disable-msg=E0110,W0612
_ = Missing_required_parameters() # pylint: disable-msg=E0110,W0612


def test_simple_updatable():
Expand Down Expand Up @@ -162,7 +162,7 @@ def test_updatable_collection_construction():

bad_list = [1]
with pytest.raises(TypeError):
x = UpdatableCollection(bad_list) # pylint: disable-msg=W0612
_ = UpdatableCollection(bad_list) # pylint: disable-msg=W0612


def test_updatable_collection_insertion():
Expand Down