Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion SQDMetal/Utilities/QUtilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ def parse_value_length(strVal:str|float|int):
- fm → 1e-15 m
- m → 1 m (base unit)

The single-character ``m`` suffix is only accepted when the text left
after removing it is numeric: ``"5m"`` is 5 metres, whereas an
unsupported unit such as ``"5cm"`` is returned unchanged.

Parameters
----------
strVal : str | float | int
Expand Down Expand Up @@ -105,7 +109,10 @@ def parse_value_length(strVal:str|float|int):
elif strVal[-2:] == "fm":
return float(strVal[:-2] + "e-15")
elif strVal[-1:] == "m":
return float(strVal[:-2])
try:
return float(strVal[:-1])
except ValueError:
return strVal
else:
assert len(strVal) > 1, f"Length '{strVal}' is invalid."
return strVal
Expand Down
49 changes: 49 additions & 0 deletions UnitTests/testQUtilities.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import unittest

from SQDMetal.Utilities.QUtilities import QUtilities


class TestParseValueLength(unittest.TestCase):
def test_prefixed_units(self):
cases = {
'5mm': 5e-3,
'12 um': 12e-6,
'0.5mm': 0.5e-3,
'5um': 5e-6,
'5nm': 5e-9,
'5pm': 5e-12,
'5fm': 5e-15,
}
for text, expected in cases.items():
with self.subTest(text=text):
self.assertAlmostEqual(QUtilities.parse_value_length(text), expected,
delta=abs(expected)*1e-12)

def test_metre_suffix(self):
# Regression: the single-'m' branch used to strip two characters, so
# '5m' and '1m' raised ValueError and '10m'/'0.5m' lost their value.
cases = {
'1m': 1.0,
'5m': 5.0,
'10m': 10.0,
'0.5m': 0.5,
'2.5 m': 2.5,
}
for text, expected in cases.items():
with self.subTest(text=text):
self.assertAlmostEqual(QUtilities.parse_value_length(text), expected,
delta=abs(expected)*1e-12)

def test_numeric_passthrough(self):
self.assertEqual(QUtilities.parse_value_length(5), 5)
self.assertEqual(QUtilities.parse_value_length(2.5), 2.5)

def test_invalid_input(self):
# An unsupported unit is returned unchanged, as documented.
self.assertEqual(QUtilities.parse_value_length('5cm'), '5cm')
with self.assertRaises(AssertionError):
QUtilities.parse_value_length('m')


if __name__ == '__main__':
unittest.main()
Loading