16587: roll back previous commit, less the small fixes

Author: rwst

src/sage/functions/generalized.py

@@ -54,11 +54,7 @@
 from sage.symbolic.function import BuiltinFunction
 from sage.rings.all import ComplexIntervalField, ZZ
 
-class GeneralizedFunction(BuiltinFunction):
-    def _evalf_(self, *args, **kwds):
-        return self.gen_eval(*args)
-
-class FunctionDiracDelta(GeneralizedFunction):
+class FunctionDiracDelta(BuiltinFunction):
     r"""
     The Dirac delta (generalized) function, `\delta(x)` (``dirac_delta(x)``).
 
@@ -145,9 +141,6 @@ def _eval_(self, x):
             sage: dirac_delta(x).subs(x=1)
             0
         """
-        return self.gen_eval(x)
-    
-    def gen_eval(self, x):
         try:
             approx_x = ComplexIntervalField()(x)
             if bool(approx_x.imag() == 0):      # x is real
@@ -157,10 +150,13 @@ def gen_eval(self, x):
                     return ZZ(0)
         except TypeError:                     # x is symbolic
             pass
+        
+    def _evalf_(self, *args, **kwds):
+        return self._eval_(*args, **kwds)
 
 dirac_delta = FunctionDiracDelta()
 
-class FunctionHeaviside(GeneralizedFunction):
+class FunctionHeaviside(BuiltinFunction):
     r"""
     The Heaviside step function, `H(x)` (``heaviside(x)``).
 
@@ -250,9 +246,6 @@ def _eval_(self, x):
             sage: t.subs(x=1)
             2
         """
-        return self.gen_eval(x)
-
-    def gen_eval(self, x):
         try:
             approx_x = ComplexIntervalField()(x)
             if bool(approx_x.imag() == 0):      # x is real
@@ -266,6 +259,9 @@ def gen_eval(self, x):
         except TypeError:                     # x is symbolic
             pass
 
+    def _evalf_(self, *args, **kwds):
+        return self._eval_(*args, **kwds)
+
     def _derivative_(self, x, diff_param=None):
         """
         Derivative of Heaviside step function
@@ -279,7 +275,7 @@ def _derivative_(self, x, diff_param=None):
 
 heaviside = FunctionHeaviside()
 
-class FunctionUnitStep(GeneralizedFunction):
+class FunctionUnitStep(BuiltinFunction):
     r"""
     The unit step function, `\mathrm{u}(x)` (``unit_step(x)``).
 
@@ -361,9 +357,6 @@ def _eval_(self, x):
             sage: unit_step(x).subs(x=0)
             1
         """
-        return self.gen_eval(x)
-
-    def gen_eval(self, x):
         try:
             approx_x = ComplexIntervalField()(x)
             if bool(approx_x.imag() == 0):      # x is real
@@ -377,6 +370,9 @@ def gen_eval(self, x):
         except TypeError:                     # x is symbolic
             pass
 
+    def _evalf_(self, *args, **kwds):
+        return self._eval_(*args, **kwds)
+
     def _derivative_(self, x, diff_param=None):
         """
         Derivative of unit step function
@@ -390,7 +386,7 @@ def _derivative_(self, x, diff_param=None):
 
 unit_step = FunctionUnitStep()
 
-class FunctionSignum(GeneralizedFunction):
+class FunctionSignum(BuiltinFunction):
     r"""
     The signum or sgn function `\mathrm{sgn}(x)` (``sgn(x)``).
 
@@ -499,9 +495,6 @@ def _eval_(self, x):
             return x.sign()
         if hasattr(x,'sgn'): # or a sgn method
             return x.sgn()
-        return self.gen_eval(x)
-    
-    def gen_eval(self, x):
         try:
             approx_x = ComplexIntervalField()(x)
             if bool(approx_x.imag() == 0):      # x is real
@@ -515,6 +508,9 @@ def gen_eval(self, x):
         except TypeError:                     # x is symbolic
             pass
 
+    def _evalf_(self, *args, **kwds):
+        return self._eval_(*args, **kwds)
+
     def _derivative_(self, x, diff_param=None):
         """
         Derivative of sgn function
@@ -530,7 +526,7 @@ def _derivative_(self, x, diff_param=None):
 sgn = FunctionSignum()
 sign = sgn
 
-class FunctionKroneckerDelta(GeneralizedFunction):
+class FunctionKroneckerDelta(BuiltinFunction):
     r"""
     The Kronecker delta function `\delta_{m,n}` (``kronecker_delta(m, n)``).
 
@@ -610,9 +606,6 @@ def _eval_(self, m, n):
         if bool(repr(m) > repr(n)):
             return kronecker_delta(n, m)
 
-        return self.gen_eval(m, n)
-
-    def gen_eval(self, m, n):
         x = m - n
         try:
             approx_x = ComplexIntervalField()(x)
@@ -626,6 +619,9 @@ def gen_eval(self, m, n):
         except TypeError:                     # x is symbolic
             pass
 
+    def _evalf_(self, *args, **kwds):
+        return self._eval_(*args, **kwds)
+
     def _derivative_(self, *args, **kwds):
         """
         Derivative of Kronecker delta