Merge pull request #689 from the-virtual-brain/TVB-3089

TVB-3089 Compatibility with latest numexpr

tvb_library/tvb/datatypes/equations.py

@@ -423,8 +423,7 @@ def evaluate(self, var):
             product *= i + 1
 
         self.parameters["factorial"] = product
-        _pattern = RefBase.evaluate(self.equation,
-                                         global_dict=self.parameters)
+        _pattern = super().evaluate(var)
         _pattern /= max(_pattern)
         _pattern *= self.parameters["a"]
         return _pattern
@@ -472,7 +471,7 @@ def evaluate(self, var):
         Generate a discrete representation of the equation for the space
         represented by ``var``.
         """
-        _pattern = RefBase.evaluate(self.equation, global_dict=self.parameters)
+        _pattern = super().evaluate(var)
         _pattern /= max(_pattern)
 
         _pattern *= self.parameters["a"]
@@ -588,4 +587,4 @@ def evaluate(self, var):
         self.parameters["gamma_a_1"] = sp_gamma(self.parameters["a_1"])
         self.parameters["gamma_a_2"] = sp_gamma(self.parameters["a_2"])
 
-        return RefBase.evaluate(self.equation, global_dict=self.parameters)
+        return super().evaluate(var)