Repository navigation
Fix non-constant Booleans in numeric context - #584
Merged
Merged
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #584 +/- ##
==========================================
+ Coverage 79.71% 79.72% +0.01%
==========================================
Files 70 70
Lines 8315 8325 +10
Branches 1506 1508 +2
==========================================
+ Hits 6628 6637 +9
Misses 1198 1198
- Partials 489 490 +1 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
dweindl
force-pushed
the
fix-bool2num
branch
from
November 16, 2026 13:31
ffcbaba to
071cfea
Compare
dweindl
added a commit
that referenced
this pull request
Nov 16, 2026
`HybridizationTable.to_df` (and thus `to_tsv`) and the target value check in `CheckHybridizationTable` converted target values with `str()`, which produces sympy syntax that is not valid PEtab math, e.g. `x**2.0` for `x^2` or `Abs(y)` for `abs(y)`. Written hybridization tables therefore could not be read again, and the linter reported valid target values as invalid. Both now use `petab_math_str`. Relates to #584, which makes this more common, since Boolean target values like `x > 0` become `Piecewise` expressions. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
dweindl
force-pushed
the
fix-bool2num
branch
from
November 16, 2026 15:17
c0619e3 to
8cb6986
Compare
`bool2num` only converted `true` and `false`, so e.g. `1 + (x > 0)` failed with `TypeError: Relational cannot be used in Add`. Convert other Booleans `b` to `Piecewise((1.0, b), (0.0, True))`, and convert `piecewise` values, since `piecewise` is float-valued. Since `sympify_petab` applies `bool2num` to the final result, a top-level Boolean expression like `x > 0` is now returned as a `Piecewise` instead of a relational, consistent with `true` -> `1.0`. `num2bool` converts such a `Piecewise` back to its condition, instead of wrapping it in `Ne(..., 0)`. `bool2num` and `num2bool` now take an `evaluate` argument, so that `sympify_petab(..., evaluate=False)` keeps the conversions unevaluated. `sympify_petab` now also passes `evaluate` on for sympy inputs. Add printing of `ITE`, which sympy may create in `Piecewise` conditions. Fixes PEtab-dev#582. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
dweindl
marked this pull request as ready for review
November 16, 2026 15:27
dweindl
force-pushed
the
fix-bool2num
branch
from
November 16, 2026 15:27
8cb6986 to
ca9f278
Compare
dilpath
approved these changes
Nov 16, 2026
Comment on lines
+66
to
+68
| assert petab_math_str(sp.ITE(a > 0, b > 0, c > 0)) == ( | ||
| "((a <= 0) || (b > 0)) && ((a > 0) || (c > 0))" | ||
| ) |
Member
There was a problem hiding this comment.
Hm, more readable for me as ((a > 0) && (b > 0) || (a <= 0 && c > 0)) but fine
Member
Author
There was a problem hiding this comment.
No strong opinion here, but for other cases, the alternative becomes more bulky. I'd keep it as is. Most users won't encounter that very often.
dweindl
added a commit
to dweindl/libpetab-python
that referenced
this pull request
Nov 17, 2026
Every pull request added its changelog entry at the same place in `CHANGELOG.md`, so concurrent pull requests conflicted with each other. Now, each pull request adds its entry as a separate file `changelog.d/+<name>.<type>.md` (see `changelog.d/README.md`). At release time, `towncrier build --version X.Y.Z` collects them into `CHANGELOG.md`. The unreleased 0.11.0 entry is moved to `changelog.d/`, and entries are added for PEtab-dev#583, PEtab-dev#584, PEtab-dev#588, PEtab-dev#590, PEtab-dev#592 and PEtab-dev#595, which did not add one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
dweindl
added a commit
to dweindl/libpetab-python
that referenced
this pull request
Nov 17, 2026
Every pull request added its changelog entry at the same place in `CHANGELOG.md`, so concurrent pull requests conflicted with each other. Now, each pull request adds its entry as a separate file `changelog.d/+<name>.<type>.md` (see `changelog.d/README.md`). At release time, `towncrier build --version X.Y.Z` collects them into `CHANGELOG.md`. The unreleased 0.11.0 entry is moved to `changelog.d/`, and entries are added for PEtab-dev#583, PEtab-dev#584, PEtab-dev#588, PEtab-dev#590, PEtab-dev#592 and PEtab-dev#595, which did not add one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
dweindl
added a commit
to dweindl/libpetab-python
that referenced
this pull request
Nov 17, 2026
Every pull request added its changelog entry at the same place in `CHANGELOG.md`, so concurrent pull requests conflicted with each other. Now, each pull request adds its entry as a separate file `changelog.d/+<name>.<type>.md` (see `changelog.d/README.md`). At release time, `towncrier build --version X.Y.Z` collects them into `CHANGELOG.md`. The unreleased 0.11.0 entry is moved to `changelog.d/`, and entries are added for PEtab-dev#583, PEtab-dev#584, PEtab-dev#588, PEtab-dev#590, PEtab-dev#592 and PEtab-dev#595, which did not add one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
dweindl
added a commit
to dweindl/libpetab-python
that referenced
this pull request
Nov 17, 2026
…v#600) Every pull request added its changelog entry at the same place in `CHANGELOG.md`, so concurrent pull requests conflicted with each other. Now, each pull request adds its changelog entry as a separate file `changelog.d/+<name>.<type>.md` (see `changelog.d/README.md`). At release time, `towncrier build --version X.Y.Z` collects them into `CHANGELOG.md` and removes the fragments. The template in `changelog.d/template.md.j2` reproduces the existing format (`**Fixes**` etc., `* ` bullets with 2-space continuation lines). Entries are sorted alphabetically within each category; grouping them (e.g., by PEtab version or module) is done when compiling the release notes. The configuration is in `pyproject.toml`, and towncrier is added to the `test` dependency group. The release process in `doc/development.rst` is updated accordingly. Entries now link to the pull request only, without "by @user"; contributors can be credited in the release notes. The unreleased 0.11.0 entry (PEtab-dev#578) is moved to `changelog.d/`, and entries are added for PEtab-dev#583, PEtab-dev#584, PEtab-dev#588, PEtab-dev#590, PEtab-dev#592 and PEtab-dev#595, which did not add one. The behaviour changes from PEtab-dev#584 (top-level Boolean expressions are returned as `Piecewise`) and PEtab-dev#592 (stricter `PySBModel.pattern_from_string`) are listed as breaking changes. Open pull requests that edit `CHANGELOG.md` will need to move their entry to a fragment file. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix non-constant Booleans in numeric context, e.g.
1 + (x > 0), which failed withTypeError: Relational cannot be used in Add. Per the PEtab v2 spec,trueis converted to1.0andfalseto0.0.bool2numnow converts non-constant BooleansbtoPiecewise((1.0, b), (0.0, True)).piecewisevalues are converted as well, sincepiecewiseis float-valued.petab_math_strcan now printITE, which sympy may create inPiecewiseconditions (e.g. for(x > 0) == (y > 2)).Behaviour change:
sympify_petabapplies this conversion to the final result as well, so a top-level Boolean expression likex > 0is now returned asPiecewise((1.0, x > 0), (0.0, True))instead of a relational. This is consistent with the existing handling oftrue->1.0and with the PEtab test suite.num2boolconverts such aPiecewiseback to its condition instead of wrapping it inNe(..., 0), so e.g.((x > 0) + 0) && (y > 0)becomes(x > 0) && (y > 0). The expected values intest_num2boolare now floats, since all results are numeric.bool2numandnum2boolnow take anevaluateargument, so thatsympify_petab(..., evaluate=False)keeps these conversions unevaluated, e.g.1 + (1 > 0)stayspiecewise(1, 1 > 0, 0) + 1instead of becoming1 + 1.sympify_petabnow also passesevaluateon for sympy inputs.Fixes #582.
🤖 Generated with Claude Code