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.

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

Jump to bottom

Handle non-standard unicode characters in models #282

Merged
merged 3 commits into from
Feb 17, 2024
Merged

Handle non-standard unicode characters in models #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd4aa3d
Apply NFKC normalization when parsing
bgyori Feb 17, 2024
67c1656
Add regression test for parsing
bgyori Feb 17, 2024
073630a
Fix test case with assert
bgyori Feb 17, 2024
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
5 changes: 4 additions & 1 deletion mira/metamodel/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@

import sympy
import re
import unicodedata


def get_parseable_expression(s: str) -> str:
"""Return an expression that can be parsed using sympy."""
s = s.replace('lambda', 'XXlambdaXX')
return re.sub(r'\.(?=\D)', 'XX_XX', s)
s = re.sub(r'\.(?=\D)', 'XX_XX', s)
s = unicodedata.normalize('NFKC', s)
return s


def revert_parseable_expression(s: str) -> str:
Expand Down
6 changes: 6 additions & 0 deletions tests/test_metamodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,3 +238,9 @@ def test_from_askenet_petri_mathml():
mathml_str = sorted_json_str(mathml_tm.dict())
org_str = sorted_json_str(tm.dict())
assert mathml_str == org_str


def test_safe_parse():
eps = 'ϵ'
eps_sym = sympy.Symbol(eps)
assert safe_parse_expr(eps, local_dict={eps: eps_sym}) == eps_sym
Loading