fixing accuracy

Author: mmatera

mathics/builtin/assignment.py

@@ -863,43 +863,38 @@ class Information(PrefixOperator):
 
 
     >> a = 2;
-    >> Information[a]
-     = a = 2
-
-
+    X> Information[a]
+     | a = 2
     >> f[x_] := x ^ 2
     >> g[f] ^:= 2
     >> f::usage = "f[x] returns the square of x";
     X> Information[f]
-     = f[x] returns the square of x
-
-    >> ? Table
-     =
-     .   'Table[expr, {i, n}]'
-     .     evaluates expr with i ranging from 1 to n, returning
-     . a list of the results.
-     .   'Table[expr, {i, start, stop, step}]'
-     .     evaluates expr with i ranging from start to stop,
-     . incrementing by step.
-     .   'Table[expr, {i, {e1, e2, ..., ei}}]'
-     .     evaluates expr with i taking on the values e1, e2,
-     . ..., ei.
-     .
-
-    >> Information[Table]
-     =
-     .   'Table[expr, {i, n}]'
-     .     evaluates expr with i ranging from 1 to n, returning
-     . a list of the results.
-     .   'Table[expr, {i, start, stop, step}]'
-     .     evaluates expr with i ranging from start to stop,
-     . incrementing by step.
-     .   'Table[expr, {i, {e1, e2, ..., ei}}]'
-     .     evaluates expr with i taking on the values e1, e2,
-     . ..., ei.
-     .
-     . Attributes[Table] = {HoldAll, Protected}
-     .
+     | f[x] returns the square of x
+
+    X> ? Table
+     |   'Table[expr, {i, n}]'
+     |     evaluates expr with i ranging from 1 to n, returning
+     | a list of the results.
+     |   'Table[expr, {i, start, stop, step}]'
+     |     evaluates expr with i ranging from start to stop,
+     | incrementing by step.
+     |   'Table[expr, {i, {e1, e2, ..., ei}}]'
+     |     evaluates expr with i taking on the values e1, e2,
+     | ..., ei.
+
+    X> Information[Table]
+     |   'Table[expr, {i, n}]'
+     |     evaluates expr with i ranging from 1 to n, returning
+     | a list of the results.
+     |   'Table[expr, {i, start, stop, step}]'
+     |     evaluates expr with i ranging from start to stop,
+     | incrementing by step.
+     |   'Table[expr, {i, {e1, e2, ..., ei}}]'
+     |     evaluates expr with i taking on the values e1, e2,
+     | ..., ei.
+     |
+     | Attributes[Table] = {HoldAll, Protected}
+     |
     """
 
     operator = "??"
@@ -910,14 +905,14 @@ class Information(PrefixOperator):
 
     def format_definition(self, symbol, evaluation, options, grid=True):
         'StandardForm,TraditionalForm,OutputForm: Information[symbol_, OptionsPattern[Information]]'
+        ret = Symbol("Null")
         lines = []
         if isinstance(symbol, String):
             evaluation.print_out(symbol)
-            evaluation.evaluate(Expression('Information', Symbol('System`String')))
-            return
+            return ret
         if not isinstance(symbol, Symbol):
             evaluation.message('Information', 'notfound', symbol)
-            return Symbol('Null')
+            return ret
         # Print the "usage" message if available.
         usagetext = _get_usage_string(symbol, evaluation)
         if usagetext is not None:
@@ -928,17 +923,16 @@ def format_definition(self, symbol, evaluation, options, grid=True):
 
         if grid:
             if lines:
-                return Expression(
+                infoshow = Expression(
                     'Grid', Expression(
                         'List', *(Expression('List', line) for line in lines)),
                     Expression(
                         'Rule', Symbol('ColumnAlignments'), Symbol('Left')))
-            else:
-                return Symbol('Null')
+                evaluation.print_out(infoshow)
         else:
             for line in lines:
                 evaluation.print_out(Expression('InputForm', line))
-            return Symbol('Null')
+        return ret
 
         # It would be deserable to call here the routine inside Definition, but for some reason it fails...
         # Instead, I just copy the code from Definition
@@ -1005,7 +999,9 @@ def rhs(expr):
 
     def format_definition_input(self, symbol, evaluation, options):
         'InputForm: Information[symbol_, OptionsPattern[Information]]'
-        return self.format_definition(symbol, evaluation, options, grid=False)
+        self.format_definition(symbol, evaluation, options, grid=False)
+        ret = Symbol("Null")
+        return ret
 
 
 class Clear(Builtin):

mathics/builtin/constants.py

@@ -118,10 +118,10 @@ def get_constant(self, precision, evaluation, preference=None):
                     return MachineReal(value)
         elif preference == "sympy":
             if hasattr(self, "sympy_name"):
-                value = sympy_constant(self.sympy_name, d)
+                value = sympy_constant(self.sympy_name, d+2)
         elif preference == "mpmath":
             if hasattr(self, "sympy_name"):
-                value = mp_constant(self.mpmath_name, d)
+                value = mp_constant(self.mpmath_name, d+2)
         if value:
             return PrecisionReal(sympy.Float(str(value), d))
         # If the value is not available, return none
@@ -272,8 +272,8 @@ def to_numpy(self, expr=None, **kwargs):
             # return mpmath.degree
             return numpy.pi / 180
 
-    def apply_N(self, precision, evaluation):
-        "N[Degree, precision_]"
+    def apply_N(self, precision, evaluation, options={}):
+        "N[Degree, precision_, OptionsPattern[%(name)s]]"
         try:
             d = get_precision(precision, evaluation)
         except PrecisionValueError:
@@ -311,8 +311,8 @@ class E(MPMathConstant, NumpyConstant, SympyConstant):
     numpy_name = "e"
     sympy_name = "E"
 
-    def apply_N(self, precision, evaluation):
-        "N[E, precision_]"
+    def apply_N(self, precision, evaluation, options={}):
+        "N[E, precision_, OptionsPattern[%(name)s]]"
         return self.get_constant(precision, evaluation)