diff --git a/src/tools/roman-numeral-converter/roman-numeral-converter.service.test.ts b/src/tools/roman-numeral-converter/roman-numeral-converter.service.test.ts index 21a747cf..6d64d859 100644 --- a/src/tools/roman-numeral-converter/roman-numeral-converter.service.test.ts +++ b/src/tools/roman-numeral-converter/roman-numeral-converter.service.test.ts @@ -13,14 +13,17 @@ describe('roman-numeral-converter', () => { expect(arabicToRoman(0.9)).toEqual(''); }); + it('should convert numbers greater than 3999999 to empty string', () => { + expect(arabicToRoman(3999999.1)).toEqual(''); + expect(arabicToRoman(4000000)).toEqual(''); + expect(arabicToRoman(10000000)).toEqual(''); + }); + it('should convert floating points number to the lower integer in roman version', () => { - expect(arabicToRoman(-100)).toEqual(''); - expect(arabicToRoman(-42)).toEqual(''); - expect(arabicToRoman(-26)).toEqual(''); - expect(arabicToRoman(-10)).toEqual(''); - expect(arabicToRoman(0)).toEqual(''); - expect(arabicToRoman(0.5)).toEqual(''); - expect(arabicToRoman(0.9)).toEqual(''); + expect(arabicToRoman(1.1)).toEqual('I'); + expect(arabicToRoman(1.9)).toEqual('I'); + expect(arabicToRoman(17.6)).toEqual('XVII'); + expect(arabicToRoman(29.999)).toEqual('XXIX'); }); it('should convert positive integers to roman numbers', () => { @@ -67,7 +70,10 @@ describe('roman-numeral-converter', () => { expect(arabicToRoman(999)).toEqual('CMXCIX'); expect(arabicToRoman(1000)).toEqual('M'); expect(arabicToRoman(2000)).toEqual('MM'); - expect(arabicToRoman(9000)).toEqual('MMMMMMMMM'); + expect(arabicToRoman(4000)).toEqual('IV'); + expect(arabicToRoman(5000)).toEqual('V'); + expect(arabicToRoman(9000)).toEqual('IX'); + expect(arabicToRoman(10000)).toEqual('X'); }); }); }); diff --git a/src/tools/roman-numeral-converter/roman-numeral-converter.service.ts b/src/tools/roman-numeral-converter/roman-numeral-converter.service.ts index df2408a0..64e8a516 100644 --- a/src/tools/roman-numeral-converter/roman-numeral-converter.service.ts +++ b/src/tools/roman-numeral-converter/roman-numeral-converter.service.ts @@ -1,7 +1,21 @@ +export const MIN_ARABIC_TO_ROMAN = 1; +export const MAX_ARABIC_TO_ROMAN = 3999999; export function arabicToRoman(num: number) { - if (num < 1) return ''; + if (num < MIN_ARABIC_TO_ROMAN || num > MAX_ARABIC_TO_ROMAN) return ''; const lookup: { [key: string]: number } = { + 'M': 1000000, + 'CM': 900000, + 'D': 500000, + 'CD': 400000, + 'C': 100000, + 'XC': 90000, + 'L': 50000, + 'XL': 40000, + 'X': 10000, + 'IX': 9000, + 'V': 5000, + 'IV': 4000, M: 1000, CM: 900, D: 500, @@ -26,7 +40,16 @@ export function arabicToRoman(num: number) { return roman; } +const ROMAN_NUMBER_REGEX = new RegExp(/^M{0,3}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$/); + +export function isValidRomanNumber(romanNumber: string) { + return ROMAN_NUMBER_REGEX.test(romanNumber); +} + export function romanToArabic(s: string) { + if (!isValidRomanNumber(s)) { + return null; + } const map: { [key: string]: number } = { I: 1, V: 5, X: 10, L: 50, C: 100, D: 500, M: 1000 }; return [...s].reduce((r, c, i, s) => (map[s[i + 1]] > map[c] ? r - map[c] : r + map[c]), 0); } diff --git a/src/tools/roman-numeral-converter/roman-numeral-converter.vue b/src/tools/roman-numeral-converter/roman-numeral-converter.vue index c55380d0..5f2a466a 100644 --- a/src/tools/roman-numeral-converter/roman-numeral-converter.vue +++ b/src/tools/roman-numeral-converter/roman-numeral-converter.vue @@ -2,21 +2,29 @@
- + + +
- {{ outputRoman }} +
- Copy + + Copy +

- + + +
{{ outputNumeral }}
- Copy + + Copy +
@@ -25,14 +33,41 @@