diff options
| author | Walter Bender <walter@sugarlabs.org> | 2010-09-15 18:54:54 (GMT) |
|---|---|---|
| committer | Walter Bender <walter@sugarlabs.org> | 2010-09-15 18:54:54 (GMT) |
| commit | 637c7b1e55c711f3d26596c04aa8d6442f9ac4ed (patch) | |
| tree | 2d6271b61e80db27fba16fdb95b7cbcb2f3e3ac3 | |
| parent | 1fb4749c35a9455884ddab4a37a39a94a2a8ca45 (diff) | |
added more formulas for custom slidesv17
| -rw-r--r-- | constants.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/constants.py b/constants.py index 70025c3..d07337f 100644 --- a/constants.py +++ b/constants.py @@ -30,17 +30,25 @@ BOTTOM = 1 SLIDE = 0 STATOR = 1 -CUSTOM = {'C': ['log(x, 10)', 'x', 'pow(10, x)', 'x', '1', '10', '1'], - 'D': ['log(x, 10)', 'x', 'pow(10, x)', 'x', '1', '10', '1'], - 'CI': ['log(10/x, 10)', 'x', '10/pow(10, x)', 'x', '1', '10', '1'], - 'DI': ['log(10/x, 10)', 'x', '10/pow(10, x)', 'x', '1', '10', '1'], +CUSTOM = {'C': ['log(x,10)', 'x', 'pow(10,x)', 'x', '1', '10', '1'], + 'D': ['log(x,10)', 'x', 'pow(10,x)', 'x', '1', '10', '1'], + 'CI': ['log(10/x,10)', 'x', '10/pow(10,x)', 'x', '1', '10', '1'], + 'DI': ['log(10/x,10)', 'x', '10/pow(10,x)', 'x', '1', '10', '1'], 'L': ['x/10', 'x', 'x*10', 'x', '0', '10', '0.5'], 'L2': ['x/10', 'x', 'x*10', 'x', '0', '10', '0.5'], - 'A': ['log(x, 10)/2', 'x', 'pow(10, x*2)', 'x', '1', '100', '9'], - 'A2': ['log(x, 10)/2', 'x', 'pow(10, x*2)', 'x', '1', '100', '9'], - 'K': ['log(x, 10)/3', 'x', 'pow(10, x*3)', 'x', '1', '1000', '99'], - 'K2': ['log(x, 10)/3', 'x', 'pow(10, x*3)', 'x', '1', '1000', '99'], - 'Log': ['log(x, 10)', 'log(x, 10)', 'log(pow(10, x), 10)', 'x', + 'A': ['log(x,10)/2', 'x', 'pow(10,x*2)', 'x', '1', '100', '9'], + 'A2': ['log(x,10)/2', 'x', 'pow(10,x*2)', 'x', '1', '100', '9'], + 'K': ['log(x,10)/3', 'x', 'pow(10,x*3)', 'x', '1', '1000', '99'], + 'K2': ['log(x,10)/3', 'x', 'pow(10,x*3)', 'x', '1', '1000', '99'], + 'S': ['log(sin(x*pi/180)*10,10)','int(x)', + 'asin(pow(10,x)/10)*180/pi', 'x', '5', '90', '5'], + 'S2': ['log(sin(x*pi/180)*10,10)','int(x)', + 'asin(pow(10,x)/10)*180/pi', 'x', '5', '90', '5'], + 'T': ['log(tan(x*pi/180)*10,10)','x', + 'atan(pow(10,x)/10)*180/pi', 'x', '5', '45', '2.5'], + 'T2': ['log(tan(x*pi/180)*10,10)','x', + 'atan(pow(10,x)/10)*180/pi', 'x', '5', '45', '2.5'], + 'Log': ['log(x,10)', 'log(x,10)', 'log(pow(10,x), 10)', 'x', '1', '10', '1'], - 'Log2': ['log(x, 10)', 'log(x, 10)', 'log(pow(10, x), 10)', 'x', + 'Log2': ['log(x,10)', 'log(x,10)', 'log(pow(10,x), 10)', 'x', '1', '10', '1']} |