Update roman_numerals.py

This commit is contained in:
lighting9999 2025-02-10 18:12:37 +08:00 committed by GitHub
parent e6ea0ba222
commit 07721a89e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,32 +1,11 @@
ROMAN = [
(1000000, "M_"),
(900000, "C_M_"),
(500000, "D_"),
(400000, "C_D_"),
(100000, "C_"),
(90000, "X_C_"),
(50000, "L_"),
(40000, "X_L_"),
(10000, "X_"),
(9000, "I_X_"),
(5000, "V_"),
(4000, "I_V_"),
(1000, "M"),
(900, "CM"),
(500, "D"),
(400, "CD"),
(100, "C"),
(90, "XC"),
(50, "L"),
(40, "XL"),
(10, "X"),
(9, "IX"),
(5, "V"),
(4, "IV"),
(1, "I"),
(1000000, "M_"), (900000, "C_M_"), (500000, "D_"), (400000, "C_D_"),
(100000, "C_"), (90000, "X_C_"), (50000, "L_"), (40000, "X_L_"),
(10000, "X_"), (9000, "I_X_"), (5000, "V_"), (4000, "I_V_"),
(1000, "M"), (900, "CM"), (500, "D"), (400, "CD"),
(100, "C"), (90, "XC"), (50, "L"), (40, "XL"),
(10, "X"), (9, "IX"), (5, "V"), (4, "IV"), (1, "I")
]
def roman_to_int(roman):
"""
Convert a Roman numeral to an integer, supporting Vinculum notation
@ -43,19 +22,14 @@ def roman_to_int(roman):
True
"""
vals = {roman: arabic for arabic, roman in ROMAN}
# Convert the list of tuples to a dictionary
i, total = 0, 0
while i < len(roman):
if i + 1 < len(roman) and roman[i : i + 2] in vals:
total += vals[roman[i : i + 2]]
i += 2
else:
total += vals[roman[i]]
i += 1
return total
if i + 1 < len(roman) and roman[i + 1] == "_":
total += vals[roman[i] + "_"]
i += 2
else:
total += vals[roman[i]]
i += 1
def int_to_roman(number):
"""
Convert an integer to a Roman numeral, supporting Vinculum notation
@ -68,7 +42,7 @@ def int_to_roman(number):
>>> all(int_to_roman(value) == key for key, value in tests.items())
True
"""
if not isinstance(number, int) or number < 1:
if not isinstance(number, int) or number <= 0:
raise ValueError("Input must be a positive integer greater than 0")
result = []
@ -78,9 +52,7 @@ def int_to_roman(number):
if number == 0:
break
return "".join(result)
if __name__ == "__main__":
import doctest
doctest.testmod()