[Hejes-devel] [921] sorszamnev tortekben javitva

[hejes-devel at nytud.hu]

Revision: 921
Author:   mittelholcz
Date:     2013-09-03 11:15:52 +0200 (Tue, 03 Sep 2013)
Log Message:
-----------
sorszamnev tortekben javitva

Modified Paths:
--------------
    trunk/web2py/applications/helyesiras_webdev/modules/szamok.py

Modified: trunk/web2py/applications/helyesiras_webdev/modules/szamok.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/szamok.py	2013-09-02 14:37:32 UTC (rev 920)
+++ trunk/web2py/applications/helyesiras_webdev/modules/szamok.py	2013-09-03 09:15:52 UTC (rev 921)
@@ -163,6 +163,43 @@
 #'googol' : 10^100
 }
 
+KGROUPSFRACT = { # key is index of '000 group
+2	: ['ezred'],
+3	: ['milliomod'],
+4	: ['milliárdod'], # 'ezermillió'],
+5	: ['billiomod'],
+6	: ['billiárdod'], # 'ezerbillió'],
+7	: ['trilliomod'],
+8	: ['trilliárdod'], # 'ezertrillió'],
+9	: ['kvadrilliomod'],
+10	: ['kvadrilliárdod'], # 'ezerkvadrillió'],
+11	: ['kvintilliomod'],
+12	: ['kvintilliárdod'], # 'ezerkvintillió'],
+13	: ['szextilliomod'], # 10^36
+14	: ['szextilliárdod'],
+15	: ['szeptilliomod'],
+16	: ['szeptilliárdod'],
+17	: ['oktilliomod'],
+18	: ['oktilliárdod'],
+19	: ['nonilliomod'],
+20	: ['nonilliárdod'],
+21	: ['decilliomod'],
+22	: ['decilliárdod'], # 10^63
+23	: ['undecilliomod'],
+24	: ['undecilliárdod'],
+25	: ['bidecilliomod'],
+26	: ['bidecilliárdod'],
+27	: ['tridecilliomod'],
+28	: ['tridecilliárdod'],
+29	: ['kvadecilliomod'],
+30	: ['kvadecilliárdad'],
+31	: ['kvintdecilliomod'],
+32	: ['kvintdecilliárdod'],
+33	: ['szexdecilliomod'],
+34	: ['szexdecilliárdod'] # 10^99
+#'googol' : 10^100
+}
+
 DECIMALS = {
 3	: 'ezred',
 6	: 'milliomod',
@@ -531,7 +568,7 @@
       else:
         s2 = []
         for x in s:
-          for y in KGROUPSORD[k]:
+          for y in KGROUPSFRACT[k]:
             s2.append(x + y)
         s = s2
     return s