Skip to content

Make Float Integer comparisons more robust #385

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
kwabenantim merged 3 commits into from
Jul 20, 2026
Merged

Make Float Integer comparisons more robust #385

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de056d4
#376 Make singularity zero-checks robust to Float/Integer equality
kwabenantim Jul 16, 2026
edca7aa
Merge branch 'master' into 376-robust-zero-comparisons
kwabenantim Jul 16, 2026
0ae700e
#376 Use structural is_zero for 1/A exponent check for consistency
kwabenantim Jul 17, 2026
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
7 changes: 3 additions & 4 deletions cellmlmanip/_singularity_fixes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def check_U_match(m, sp):
:param sp: The singularity point found.
:return: (Vmin, Vmax, sp)
"""
assert m is None or m[Z_wildcard] != 0
assert m is None or not m[Z_wildcard].is_zero
return m is not None and \
(sp == m[SP_wildcard] or
(isinstance(sp, (Float, float)) and
Expand Down Expand Up @@ -218,7 +218,7 @@ def check_U_match(m, sp):

for fp1 in fraction_part_1: # Check arguments in numerator (or denominator)
match = fp1.match(P_wildcard * u) # search for multiple of U
found_on_top = match is not None and P_wildcard in match and match[P_wildcard] != 0
found_on_top = match is not None and P_wildcard in match and not match[P_wildcard].is_zero
if not found_on_top:
match = fp1.match(Z_wildcard * V - Z_wildcard * SP_wildcard) # look for multiple of V - sp
found_on_top = check_U_match(match, sp)
Expand Down Expand Up @@ -293,8 +293,7 @@ def _fix_expr_parts(expr, V, U_offset, exp_function):
expr_parts.append(_generate_piecewise(ex, V, sp, Vmin, Vmax) if sp is not None else ex)
return (None, None, None, Add(*expr_parts), is_piecewise)

# 1/A
elif isinstance(expr, Pow) and len(expr.args) == 2 and expr.args[1].is_number and float(expr.args[1]) == -1.0:
elif isinstance(expr, Pow) and len(expr.args) == 2 and (expr.args[1] + S.One).is_zero: # 1/A
# Find singularities in A and adjust result to represent 1 / A
Vmin, Vmax, sp, ex, has_piecewise = _fix_expr_parts(expr.args[0], V, U_offset, exp_function)
has_piecewise = has_piecewise or Vmin is not None
Expand Down