New constant for calculator and new tests

courseware/capa/calc.py

@@ -4,6 +4,7 @@ import math
 import operator
 
 import numpy
+import scipy.constants
 
 from pyparsing import Word, alphas, nums, oneOf, Literal
 from pyparsing import ZeroOrMore, OneOrMore, StringStart
@@ -24,7 +25,12 @@ default_functions = {'sin' : numpy.sin,
                      'abs':numpy.abs
                      }
 default_variables = {'j':numpy.complex(0,1), 
-                     'e':numpy.complex(numpy.e)
+                     'e':numpy.e,
+                     'pi':numpy.pi, 
+                     'k':scipy.constants.k,
+                     'c':scipy.constants.c, 
+                     'T':298.15,
+                     'q':scipy.constants.e
                      }
 
 log = logging.getLogger("mitx.courseware.capa")

courseware/tests.py

@@ -27,6 +27,9 @@ class ModelsTest(unittest.TestCase):
         self.assertEqual(calc.evaluator({},{}, "-1"), -1)
         self.assertEqual(calc.evaluator({},{}, "-0.33"), -.33)
         self.assertEqual(calc.evaluator({},{}, "-.33"), -.33)
+        self.assertEqual(calc.evaluator(variables, functions, "R1*R3"), 8.0)
+        self.assertTrue(abs(calc.evaluator(variables, functions, "sin(e)-0.41"))<0.01)
+        self.assertTrue(abs(calc.evaluator(variables, functions, "k*T/q-0.025"))<0.001)
         exception_happened = False
         try: 
             evaluator({},{}, "5+7 QWSEKO")