Merge pull request #308 from mitodl/long_int_fix

Fixing bug with long ints

Author: jolyonb

README.md

@@ -4,9 +4,9 @@
 
 A library of graders for edX Custom Response problems.
 
-Version 2.3.1 ([changelog](docs/changelog.md))
+Version 2.3.2 ([changelog](docs/changelog.md))
 
-Copyright 2017-2020 Jolyon Bloomfield and Chris Chudzicki
+Copyright 2017-2021 Jolyon Bloomfield and Chris Chudzicki
 
 Licensed under the [BSD-3 License](LICENSE).
 

docs/changelog.md

@@ -6,6 +6,10 @@ This is a major new version with many new features added. We have been very care
 
 ## Version 2.3
 
+### Version 2.3.2
+
+* Fixed a bug where long integers passed in as a variable (via `DiscreteSet`) or user-defined constant would cause an error in evaluation (such numbers are now cast as floats).
+
 ### Version 2.3.1
 
 * Added a feature to math graders to remove default constants such as `pi` or `i`.

docs/grading_math/sampling.md

@@ -230,6 +230,8 @@ Sample from any discrete set of values that are specified in a tuple. A single v
 >>> sampler = DiscreteSet((1, 3, 5, 7, 9))
 >>> # Always select 3.5
 >>> sampler = DiscreteSet(3.5)
+>>> # This is equivalent to the above:
+>>> sampler = 3.5
 >>> # A tuple can also be used to specify a discrete set
 >>> sampler = (1, 3, 5, 7, 9)
 >>> # Select randomly between two matrices

mitxgraders/helpers/calc/expressions.py

@@ -389,7 +389,7 @@ def get_grammar(self):
         plus = Literal("+")
 
         # Also accept unicode emdash
-        emdash = Literal("\u2014") 
+        emdash = Literal("\u2014")
         emdash.setParseAction(lambda: "-")
 
         minus = Literal("-") | emdash
@@ -776,12 +776,18 @@ def eval_variable(parse_result, variables):
         Returns a copy of the variable in self.vars
 
         We return a copy so that nothing in self.vars is mutated.
+        
+        If the variable is a long integer, we convert it to a float so that numpy methods work on it.
 
         NOTE: The variable's value's class must implement a __copy__ method.
             (numpy ndarrays do implement this method)
         """
         value = variables[parse_result[0]]
-        return copy.copy(value)
+        value = copy.copy(value)
+        # Convert python long integers to floats
+        if isinstance(value, six.integer_types):
+            value = float(value)
+        return value
 
     @staticmethod
     def eval_function(parse_result, functions):

mitxgraders/version.py

@@ -4,4 +4,4 @@
 """
 from __future__ import print_function, division, absolute_import, unicode_literals
 
-__version__ = "2.3.1"
+__version__ = "2.3.2"

python_lib.zip

@@ -275,3 +275,6 @@ def test_min_max():
            r"Expected at least 2 inputs, but received 1.")
     with raises(ArgumentError, match=msg):
         evaluator('max(1.5)')
+
+def test_large_numbers():
+    assert evaluator('x', variables={'x': 10 ** 30})[0] == 1e30