Skip to content
Draft
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
7 changes: 4 additions & 3 deletions src/unitpy/definitions/ledger.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,15 @@ def add_derived_quantities():

def add_with_prefix(entry: Entry):
for pre in ledger.prefixes.values():
prefixed_abbrs = [abbr + entry.abbr for abbr in pre.abbr]
ledger.add_unit(
Entry(
label=pre.label + entry.label,
abbr=pre.abbr[0] + entry.abbr,
abbr=prefixed_abbrs[0],
base_unit=entry.base_unit,
multiplier=entry.multiplier,
prefix=pre,
additional_labels=get_additional_labels(pre.abbr, entry.additional_labels)
additional_labels=prefixed_abbrs[1:] + get_additional_labels(pre.abbr, entry.additional_labels)
)
)

Expand Down Expand Up @@ -208,4 +209,4 @@ def add_extra_quantities():
add_extra_quantities()


ledger.add_in_main_duplicates()
ledger.add_in_main_duplicates()
2 changes: 1 addition & 1 deletion src/unitpy/definitions/prefix.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def __repr__(self):
"femto": Prefix("femto", 1e-15, ("f",)),
"pico": Prefix("pico", 1e-12, ("p",)),
"nano": Prefix("nano", 1e-9, ("n",)),
"micro": Prefix("micro", 1e-6, ("u", "µ")),
"micro": Prefix("micro", 1e-6, ("u", "µ", "μ", "𝜇", "𝝁")),
"milli": Prefix("milli", 1e-3, ("m",)),
"centi": Prefix("centi", 1e-2, ("c",)),
"deci": Prefix("deci", 1e-1, ("d",)),
Expand Down
2 changes: 1 addition & 1 deletion src/unitpy/utils/parsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def get_number(self) -> int | float | None:
return None

def get_unit(self) -> Unit | None:
match = re.match(r'[a-zA-Z_]+', self.expression[self.pos:])
match = re.match(r'[^+\-*/^()]+', self.expression[self.pos:])
if match:
value = self.expression[self.pos:self.pos + match.end()]
if value in ledger:
Expand Down
9 changes: 8 additions & 1 deletion tests/test_define_unit.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,11 @@ def test_unit_prefix():
def test_unit_prefix2():
u = unitpy.Unit("kPa")
assert u.abbr == "kPa"
assert u.multiplier == 1000
assert u.multiplier == 1000


@pytest.mark.parametrize("micro_symbol", ["µ", "μ", "𝜇", "𝝁"])
def test_unit_micro_prefix_symbols(micro_symbol):
u = unitpy.Unit(f"{micro_symbol}m")
assert u == unitpy.Unit("um")
assert u.multiplier == 1e-6
4 changes: 4 additions & 0 deletions tests/test_parsing_unit.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
["ns", {ledger.get_entry("ns"): 1}],
["mK", {ledger.get_entry("mK"): 1}],
["Gg", {ledger.get_entry("Gg"): 1}],
["µm", {ledger.get_entry("um"): 1}],
["μm", {ledger.get_entry("um"): 1}],
["𝜇m", {ledger.get_entry("um"): 1}],
["𝝁m", {ledger.get_entry("um"): 1}],

# division
["g/ml", {ledger.get_entry("g"): 1, ledger.get_entry("ml"): -1}],
Expand Down