From 006b6cd0673e6f120f217fbf829ee60f13337c75 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Thu, 5 Jan 2012 15:47:57 -0500 Subject: [PATCH] Took out extreme suffixes, at Jerry's request --- courseware/calc.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/courseware/calc.py b/courseware/calc.py index 8aaaad2c23..69ccc0162a 100644 --- a/courseware/calc.py +++ b/courseware/calc.py @@ -19,9 +19,10 @@ def evaluator(variables, functions, string): "+" : operator.add, "-" : operator.sub, } - suffixes={'%':0.01,'k':1e3,'M':1e6,'G':1e9,'T':1e12,'P':1e15, - 'E':1e18,'Z':1e21,'Y':1e24,'c':1e-2,'m':1e-3,'u':1e-6, - 'n':1e-9,'p':1e-12,'f':1e-15,'a':1e-18,'z':1e-21,'y':1e-24} + suffixes={'%':0.01,'k':1e3,'M':1e6,'G':1e9, + 'T':1e12,#'P':1e15,'E':1e18,'Z':1e21,'Y':1e24, + 'c':1e-2,'m':1e-3,'u':1e-6, + 'n':1e-9,'p':1e-12,'f'}#:1e-15,'a':1e-18,'z':1e-21,'y':1e-24} def super_float(text): ''' Like float, but with si extensions. 1k goes to 1000'''