Skip to content

Handle invalid proportions #577

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.

Sign up for GitHub

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

Merged
grahamgower merged 1 commit into from
Nov 25, 2024
Merged

Handle invalid proportions #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion demes-spec
Open in desktop
Submodule demes-spec updated 21 files
+6 −6 .github/workflows/docs.yml
+3 −3 .github/workflows/tests.yml
+2 −0 docs/_toc.yml
+815 −186 docs/specification.md
+22 −20 docs/tutorial.md
+19 −15 reference_implementation/demes_parser.py
+12 −11 requirements.txt
+449 −0 requirements_CI.txt
+14 −0 test-cases/invalid/bad_ancestry_proportions_11.yaml
+16 −0 test-cases/invalid/bad_pulse_proportion_09.yaml
+13 −0 test-cases/invalid/bad_pulse_proportions_list_03.yaml
+8 −0 test-cases/invalid/bad_toplevel_defaults_deme_20.yaml
+8 −0 test-cases/invalid/bad_toplevel_defaults_deme_21.yaml
+7 −0 test-cases/invalid/bad_toplevel_defaults_pulse_23.yaml
+7 −0 test-cases/invalid/bad_toplevel_defaults_pulse_24.yaml
+0 −10 test-cases/valid/bad_pulse_time_01.yaml
+1 −1 test-cases/valid/deme_end_time_01.yaml
+0 −0 test-cases/valid/migration_rates_sum_01.yaml
+0 −0 test-cases/valid/migration_rates_sum_02.yaml
+1 −1 test-cases/valid/successors_predecessors_01.yaml
+1 −1 test-cases/valid/toplevel_defaults_deme_01.yaml
13 changes: 10 additions & 3 deletions demes/demes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ def unit_interval(self, attribute, value):
raise ValueError(f"must have 0 <= {attribute.name} <= 1")


def unit_interval_exclusive_lo(self, attribute, value):
if not (0 < value <= 1):
raise ValueError(f"must have 0 < {attribute.name} <= 1")


def sum_less_than_one(self, attribute, value):
if sum(value) > 1:
raise ValueError(f"{attribute.name} must sum to less than one")
Expand Down Expand Up @@ -480,7 +485,9 @@ class Pulse:
time: Time = attr.ib(validator=[int_or_float, positive, finite])
proportions: List[Proportion] = attr.ib(
validator=attr.validators.deep_iterable(
member_validator=attr.validators.and_(int_or_float, unit_interval),
member_validator=attr.validators.and_(
int_or_float, unit_interval_exclusive_lo
),
iterable_validator=attr.validators.instance_of(list),
)
)
Expand Down Expand Up @@ -2095,7 +2102,7 @@ def fromdict(cls, data: MutableMapping[str, Any]) -> Graph:
proportions=(
list,
attr.validators.deep_iterable(
member_validator=int_or_float,
member_validator=[int_or_float, unit_interval_exclusive_lo],
iterable_validator=attr.validators.instance_of(list),
),
),
Expand Down Expand Up @@ -2156,7 +2163,7 @@ def fromdict(cls, data: MutableMapping[str, Any]) -> Graph:
list,
attr.validators.deep_iterable(
member_validator=attr.validators.and_(
int_or_float, unit_interval
int_or_float, unit_interval_exclusive_lo
),
iterable_validator=attr.validators.and_(
attr.validators.instance_of(list),
Expand Down
Loading