21819: fixes

sagemath · Jan 6, 2017 · be39e50 · be39e50
1 parent 2fb1d2d
commit be39e50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/sage/functions/error.py b/src/sage/functions/error.py
@@ -526,3 +526,5 @@ def _derivative_(self, x, diff_param=None):
 
 erfinv = Function_erfinv()
 
+from sage.structure.sage_object import register_unpickle_override
+register_unpickle_override('sage.functions.other', 'Function_erf', Function_erf)
diff --git a/src/sage/functions/other.py b/src/sage/functions/other.py
@@ -881,6 +881,7 @@ def _eval_(self, x, y):
         if x == 0:
             return -Ei(-y)
         if x == Rational(1)/2: #only for x>0
+            from sage.functions.error import erf
             return sqrt(pi)*(1-erf(sqrt(y)))
         return None
Original file line number	Diff line number	Diff line change
Expand Up		@@ -526,3 +526,5 @@ def _derivative_(self, x, diff_param=None):

		erfinv = Function_erfinv()

		from sage.structure.sage_object import register_unpickle_override
		register_unpickle_override('sage.functions.other', 'Function_erf', Function_erf)