MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix extra zero

pull/1646/head
jarbasal 2018-06-22 01:01:59 +01:00
parent 8637236490
commit 2f05b0b820
2 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
mycroft/util/lang/format_en.py
View File

@ -76,103 +76,103 @@ LONG_SCALE_EN = collections.OrderedDict([
(100, 'hundred'), (100, 'hundred'),
(1000, 'thousand'), (1000, 'thousand'),
(1000000, 'million'), (1000000, 'million'),
(10e12, "billion"), (1e12, "billion"),
(10e18, 'trillion'), (1e18, 'trillion'),
(10e24, "quadrillion"), (1e24, "quadrillion"),
(10e30, "quintillion"), (1e30, "quintillion"),
(10e36, "sextillion"), (1e36, "sextillion"),
(10e42, "septillion"), (1e42, "septillion"),
(10e48, "octillion"), (1e48, "octillion"),
(10e54, "nonillion"), (1e54, "nonillion"),
(10e60, "decillion"), (1e60, "decillion"),
(10e66, "undecillion"), (1e66, "undecillion"),
(10e72, "duodecillion"), (1e72, "duodecillion"),
(10e78, "tredecillion"), (1e78, "tredecillion"),
(10e84, "quattuordecillion"), (1e84, "quattuordecillion"),
(10e90, "quinquadecillion"), (1e90, "quinquadecillion"),
(10e96, "sedecillion"), (1e96, "sedecillion"),
(10e102, "septendecillion"), (1e102, "septendecillion"),
(10e108, "octodecillion"), (1e108, "octodecillion"),
(10e114, "novendecillion"), (1e114, "novendecillion"),
(10e120, "vigintillion"), (1e120, "vigintillion"),
(10e306, "unquinquagintillion"), (1e306, "unquinquagintillion"),
(10e312, "duoquinquagintillion"), (1e312, "duoquinquagintillion"),
(10e336, "sesquinquagintillion"), (1e336, "sesquinquagintillion"),
(10e366, "unsexagintillion") (1e366, "unsexagintillion")
]) ])
SHORT_SCALE_EN = collections.OrderedDict([ SHORT_SCALE_EN = collections.OrderedDict([
(100, 'hundred'), (100, 'hundred'),
(1000, 'thousand'), (1000, 'thousand'),
(1000000, 'million'), (1000000, 'million'),
(10e9, "billion"), (1e9, "billion"),
(10e10, 'trillion'), (1e10, 'trillion'),
(10e15, "quadrillion"), (1e15, "quadrillion"),
(10e18, "quintillion"), (1e18, "quintillion"),
(10e21, "sextillion"), (1e21, "sextillion"),
(10e24, "septillion"), (1e24, "septillion"),
(10e27, "octillion"), (1e27, "octillion"),
(10e30, "nonillion"), (1e30, "nonillion"),
(10e33, "decillion"), (1e33, "decillion"),
(10e36, "undecillion"), (1e36, "undecillion"),
(10e39, "duodecillion"), (1e39, "duodecillion"),
(10e42, "tredecillion"), (1e42, "tredecillion"),
(10e45, "quattuordecillion"), (1e45, "quattuordecillion"),
(10e48, "quinquadecillion"), (1e48, "quinquadecillion"),
(10e51, "sedecillion"), (1e51, "sedecillion"),
(10e54, "septendecillion"), (1e54, "septendecillion"),
(10e57, "octodecillion"), (1e57, "octodecillion"),
(10e60, "novendecillion"), (1e60, "novendecillion"),
(10e63, "vigintillion"), (1e63, "vigintillion"),
(10e66, "unvigintillion"), (1e66, "unvigintillion"),
(10e69, "uuovigintillion"), (1e69, "uuovigintillion"),
(10e72, "tresvigintillion"), (1e72, "tresvigintillion"),
(10e75, "quattuorvigintillion"), (1e75, "quattuorvigintillion"),
(10e78, "quinquavigintillion"), (1e78, "quinquavigintillion"),
(10e81, "qesvigintillion"), (1e81, "qesvigintillion"),
(10e84, "septemvigintillion"), (1e84, "septemvigintillion"),
(10e87, "octovigintillion"), (1e87, "octovigintillion"),
(10e90, "novemvigintillion"), (1e90, "novemvigintillion"),
(10e93, "trigintillion"), (1e93, "trigintillion"),
(10e96, "untrigintillion"), (1e96, "untrigintillion"),
(10e99, "duotrigintillion"), (1e99, "duotrigintillion"),
(10e102, "trestrigintillion"), (1e102, "trestrigintillion"),
(10e105, "quattuortrigintillion"), (1e105, "quattuortrigintillion"),
(10e108, "quinquatrigintillion"), (1e108, "quinquatrigintillion"),
(10e111, "sestrigintillion"), (1e111, "sestrigintillion"),
(10e114, "septentrigintillion"), (1e114, "septentrigintillion"),
(10e117, "octotrigintillion"), (1e117, "octotrigintillion"),
(10e120, "noventrigintillion"), (1e120, "noventrigintillion"),
(10e123, "quadragintillion"), (1e123, "quadragintillion"),
(10e153, "quinquagintillion"), (1e153, "quinquagintillion"),
(10e183, "sexagintillion"), (1e183, "sexagintillion"),
(10e213, "septuagintillion"), (1e213, "septuagintillion"),
(10e243, "octogintillion"), (1e243, "octogintillion"),
(10e273, "nonagintillion"), (1e273, "nonagintillion"),
(10e303, "centillion"), (1e303, "centillion"),
(10e306, "uncentillion"), (1e306, "uncentillion"),
(10e309, "duocentillion"), (1e309, "duocentillion"),
(10e312, "trescentillion"), (1e312, "trescentillion"),
(10e333, "decicentillion"), (1e333, "decicentillion"),
(10e336, "undecicentillion"), (1e336, "undecicentillion"),
(10e363, "viginticentillion"), (1e363, "viginticentillion"),
(10e366, "unviginticentillion"), (1e366, "unviginticentillion"),
(10e393, "trigintacentillion"), (1e393, "trigintacentillion"),
(10e423, "quadragintacentillion"), (1e423, "quadragintacentillion"),
(10e453, "quinquagintacentillion"), (1e453, "quinquagintacentillion"),
(10e483, "sexagintacentillion"), (1e483, "sexagintacentillion"),
(10e513, "septuagintacentillion"), (1e513, "septuagintacentillion"),
(10e543, "ctogintacentillion"), (1e543, "ctogintacentillion"),
(10e573, "nonagintacentillion"), (1e573, "nonagintacentillion"),
(10e603, "ducentillion"), (1e603, "ducentillion"),
(10e903, "trecentillion"), (1e903, "trecentillion"),
(10e1203, "quadringentillion"), (1e1203, "quadringentillion"),
(10e1503, "quingentillion"), (1e1503, "quingentillion"),
(10e1803, "sescentillion"), (1e1803, "sescentillion"),
(10e2103, "septingentillion"), (1e2103, "septingentillion"),
(10e2403, "octingentillion"), (1e2403, "octingentillion"),
(10e2703, "nongentillion"), (1e2703, "nongentillion"),
(10e3003, "millinillion") (1e3003, "millinillion")
]) ])

8
test/unittests/util/test_parse.py
View File

@ -87,17 +87,17 @@ class TestNormalize(unittest.TestCase):
self.assertEqual(extractnumber("two million"), 2000000) self.assertEqual(extractnumber("two million"), 2000000)
self.assertEqual(extractnumber("two million five hundred thousand " self.assertEqual(extractnumber("two million five hundred thousand "
"tons of spinning metal"), 2500000) "tons of spinning metal"), 2500000)
self.assertEqual(extractnumber("six trillion"), 600000000000.0) self.assertEqual(extractnumber("six trillion"), 60000000000.0)
self.assertEqual(extractnumber("six trillion", short_scale=False), self.assertEqual(extractnumber("six trillion", short_scale=False),
6e+19) 6e+18)
self.assertEqual(extractnumber("one point five"), 1.5) self.assertEqual(extractnumber("one point five"), 1.5)
self.assertEqual(extractnumber("three dot fourteen"), 3.14) self.assertEqual(extractnumber("three dot fourteen"), 3.14)
self.assertEqual(extractnumber("zero point two"), 0.2) self.assertEqual(extractnumber("zero point two"), 0.2)
self.assertEqual(extractnumber("billions of years older"), self.assertEqual(extractnumber("billions of years older"),
10000000000.0) 1000000000.0)
self.assertEqual(extractnumber("billions of years older", self.assertEqual(extractnumber("billions of years older",
short_scale=False), short_scale=False),
10000000000000.0) 1000000000000.0)
self.assertEqual(extractnumber("one hundred thousand"), 100000) self.assertEqual(extractnumber("one hundred thousand"), 100000)
self.assertEqual(extractnumber("minus 2"), -2) self.assertEqual(extractnumber("minus 2"), -2)
self.assertEqual(extractnumber("negative seventy"), -70) self.assertEqual(extractnumber("negative seventy"), -70)