Skip to content

Allow for scientific notation #23

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
SBlokhuizen merged 1 commit into from
Mar 3, 2025
Merged

Allow for scientific notation #23

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
27 changes: 27 additions & 0 deletions tests/test_yaml_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,30 @@ def assert_tendencies_correct(tendencies):
assert tendencies[6].duration == approx(2)
assert tendencies[6].from_ == approx(8)
assert tendencies[6].to == approx(0)


def test_scientific_notation():
"""Test if scientific notation is parsed correctly."""
waveforms = {
"waveform:\n- {type: linear, to: 1.5e5}": 1.5e5,
"waveform:\n- {type: linear, to: 1.5e+5}": 1.5e5,
"waveform:\n- {type: linear, to: 1.5E+5}": 1.5e5,
"waveform:\n- {type: linear, to: 1.5e-5}": 1.5e-5,
"waveform:\n- {type: linear, to: 1.5E-5}": 1.5e-5,
"waveform:\n- {type: linear, to: 1e5}": 1e5,
"waveform:\n- {type: linear, to: 1e+5}": 1e5,
"waveform:\n- {type: linear, to: 1E+5}": 1e5,
"waveform:\n- {type: linear, to: 1e-5}": 1e-5,
"waveform:\n- {type: linear, to: 1E-5}": 1e-5,
"waveform:\n- {type: linear, to: 0e5}": 0.0,
"waveform:\n- {type: linear, to: 0E0}": 0.0,
"waveform:\n- {type: linear, to: -1.5e5}": -1.5e5,
"waveform:\n- {type: linear, to: -1E+5}": -1e5,
"waveform:\n- {type: linear, to: -1.5e-5}": -1.5e-5,
}

yaml_parser = YamlParser()

for waveform, expected_value in waveforms.items():
yaml_parser.parse_waveforms(waveform)
assert yaml_parser.waveform.tendencies[0].to == expected_value
21 changes: 20 additions & 1 deletion waveform_editor/yaml_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import re

import holoviews as hv
import yaml

Expand Down Expand Up @@ -48,7 +50,24 @@ def parse_waveforms(self, yaml_str):
"""
self.has_yaml_error = False
try:
waveform_yaml = yaml.load(yaml_str, Loader=LineNumberYamlLoader)
loader = LineNumberYamlLoader
# Parse scientific notation as a float, instead of a string. For
# more information see: https://stackoverflow.com/a/30462009/8196245
loader.add_implicit_resolver(
"tag:yaml.org,2002:float",
re.compile(
"""^(?:
[-+]?(?:[0-9][0-9_]*)\\.[0-9_]*(?:[eE][-+]?[0-9]+)?
|[-+]?(?:[0-9][0-9_]*)(?:[eE][-+]?[0-9]+)
|\\.[0-9_]+(?:[eE][-+][0-9]+)?
|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*
|[-+]?\\.(?:inf|Inf|INF)
|\\.(?:nan|NaN|NAN))$""",
re.X,
),
list("-+0123456789."),
)
waveform_yaml = yaml.load(yaml_str, Loader=loader)

if not isinstance(waveform_yaml, dict):
raise yaml.YAMLError(
Expand Down