Skip to content

Commit da299d4

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 657073d commit da299d4

File tree

1 file changed

+34
-9
lines changed

1 file changed

+34
-9
lines changed

conversions/roman_numerals.py

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,32 @@
11
ROMAN = [
2-
(1000000, "M_"), (900000, "C_M_"), (500000, "D_"), (400000, "C_D_"),
3-
(100000, "C_"), (90000, "X_C_"), (50000, "L_"), (40000, "X_L_"),
4-
(10000, "X_"), (9000, "I_X_"), (5000, "V_"), (4000, "I_V_"),
5-
(1000, "M"), (900, "CM"), (500, "D"), (400, "CD"),
6-
(100, "C"), (90, "XC"), (50, "L"), (40, "XL"),
7-
(10, "X"), (9, "IX"), (5, "V"), (4, "IV"), (1, "I")
2+
(1000000, "M_"),
3+
(900000, "C_M_"),
4+
(500000, "D_"),
5+
(400000, "C_D_"),
6+
(100000, "C_"),
7+
(90000, "X_C_"),
8+
(50000, "L_"),
9+
(40000, "X_L_"),
10+
(10000, "X_"),
11+
(9000, "I_X_"),
12+
(5000, "V_"),
13+
(4000, "I_V_"),
14+
(1000, "M"),
15+
(900, "CM"),
16+
(500, "D"),
17+
(400, "CD"),
18+
(100, "C"),
19+
(90, "XC"),
20+
(50, "L"),
21+
(40, "XL"),
22+
(10, "X"),
23+
(9, "IX"),
24+
(5, "V"),
25+
(4, "IV"),
26+
(1, "I"),
827
]
28+
29+
930
def roman_to_int(roman):
1031
"""
1132
Convert a Roman numeral to an integer, supporting Vinculum notation
@@ -27,13 +48,15 @@ def roman_to_int(roman):
2748
i, total = 0, 0
2849
while i < len(roman):
2950
# 先匹配 2 个字符的罗马数字(如 I_、X_)
30-
if i + 1 < len(roman) and roman[i:i+2] in vals:
31-
total += vals[roman[i:i+2]]
51+
if i + 1 < len(roman) and roman[i : i + 2] in vals:
52+
total += vals[roman[i : i + 2]]
3253
i += 2
3354
else:
3455
total += vals[roman[i]]
3556
i += 1
3657
return total
58+
59+
3760
def int_to_roman(number):
3861
"""
3962
Convert an integer to a Roman numeral, supporting Vinculum notation
@@ -56,7 +79,9 @@ def int_to_roman(number):
5679
if number == 0:
5780
break
5881
return "".join(result)
59-
82+
83+
6084
if __name__ == "__main__":
6185
import doctest
86+
6287
doctest.testmod()

0 commit comments

Comments
 (0)