Ticket #7682: trac-7682-realintervalfield-printing.patch

sage/rings/real_mpfi.pxd

@@ -18 +18 @@
 
 cdef class RealIntervalField_class(sage.rings.ring.Field):
     cdef int __prec
-    cdef object print_options
+    cpdef dict print_options
     # Cache RealField instances for the lower, upper, and middle bounds. 
     # These have the same precision as the interval field;
     # __lower_field rounds down, __upper_field rounds up.

sage/rings/real_mpfi.pyx

@@ -227 +227 @@
 printing_style = 'question'
 printing_error_digits = 0
 
-_PRINT_OPTIONS = {'skip_zeroes': False, 'truncate': True, 'scientific_notation': 'extreme', 
-                  'style': 'question', 'error_digits': 0}
+_PRINT_OPTIONS = {'style': 'question', 'error_digits': 0}
 
 
 #*****************************************************************************
@@ -465 +464 @@
             deprecation("The sci_not keyword is deprecated.  Use scientific_notation instead.")
             scientific_notation=sci_not
         
-        self.print_options=_PRINT_OPTIONS.copy()
         if scientific_notation is not None:
-            self.print_options['scientific_notation']=scientific_notation
-
+            print_options['scientific_notation']=scientific_notation
+
+        self.print_options={}
         realfield_print_options={}
-        for key in real_mpfr._PRINT_OPTIONS:
-            if key in self.print_options:
-                realfield_print_options[key]=self.print_options[key]
-
+        for key,val in print_options.items():
+            if key in _PRINT_OPTIONS:
+                self.print_options[key]=val
+            else:
+                realfield_print_options[key]=val
+            
         self.__lower_field = RealField(prec=prec, rnd="RNDD", 
                                                    print_options=realfield_print_options)
         self.__middle_field = RealField(prec=prec, rnd="RNDN", 
@@ -515 +516 @@
         x.init = 1
         return x
 
+
+    property print_options:
+        """
+        Options for printing a real number.
+        """
+        def __get__(self):
+            """
+            Get the printing options.
+            """
+            return self.print_options
+
+        def __set__(self,newval):
+            """
+            Set the printing options.
+            """
+            self.print_options=newval
+
+        def __del__(self):
+            """
+            Reset the printing options to be empty.
+            """
+            self.print_options={}
+
     def _repr_(self):
         s = "Real Interval Field with %s bits of precision"%self.__prec
         return s
@@ -921 +945 @@
         
         -  ``status`` - (bool -) optional flag
         """
-        from sage.misc.misc import deprecation
         if status is None:
-            deprecation("scientific_notation() is deprecated.  Use self.print_options['scientific_notation'] instead")
-            return self.print_options['scientific_notation']
+            return self._lower_field().print_options['scientific_notation']
         else:
-            deprecation("scientific_notation() is deprecated.  Use self.print_options['scientific_notation']=value instead")
-            self.print_options['scientific_notation'] = status
+            for f in self._lower_field(), self._upper_field():
+                f.print_options['scientific_notation']=status
         
     def zeta(self, n=2):
         """
@@ -1423 +1445 @@
             sage: RIF(0, 3^-150)
             1.?e-71
         """
+        print_options=(<RealIntervalField_class>self._parent).print_options
         if base < 2 or base > 36:
             raise ValueError, "the base (=%s) must be between 2 and 36"%base
 
@@ -1440 +1463 @@
             deprecation("The no_sci keyword is deprecated.  Use scientific_notation=%r instead."%deprecated_option[no_sci])
             scientific_notation=deprecated_option[no_sci]
         if scientific_notation not in [None, 'always','extreme']:
+            # TODO: 'never' is not checked above, but is in the error message
             raise ValueError, "scientific_notation must be one of 'always', 'extreme', or 'never'."
-        elif scientific_notation is None:
-            scientific_notation = (<RealIntervalField_class>self._parent).print_options.get('scientific_notation',_PRINT_OPTIONS['scientific_notation'])
-        
 
 
         if e is None:
@@ -1453 +1474 @@
                 e = 'e'
 
         if style is None:
-            style = printing_style
+            if 'style' in print_options:
+                style=print_options['style']
+            elif 'style' in self.print_options:
+                style=self.print_options['style']
+            else:
+                style = printing_style
         if error_digits is None:
             error_digits = printing_error_digits
 
@@ -1467 +1493 @@
             return "[%s .. %s]"%(t1, t2)
         
         elif style == 'question':
-            if scientific_notation=='always':
+            if scientific_notation is None or scientific_notation=='extreme':
+                prefer_sci = False
+            elif scientific_notation=='always':
                 prefer_sci = True
-            elif scientific_notation=='extreme':
-                prefer_sci = False
             else:
                 raise ValueError, "scientific_notation must be 'always' or 'extreme'"
             return self._str_question_style(base, error_digits, e, prefer_sci)