Changeset 7482:8e9e9c966222

Timestamp:

12/01/07 21:26:37 (5 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

Mainly fix trac #1160 -- major bug in maxima used in notebook mode. I also improved the doctest coverage.

• In particular doctest coverage was somewhat improved by me in maxima.py.
• I implemented maxima.chdir and magma.chdir
• I implemented better conversions from maxima to our floating point numbers.

Location:

sage

Files:

• interfaces/magma.py (modified) (1 diff)
• interfaces/maxima.py (modified) (8 diffs)
• server/notebook/js.py (modified) (1 diff)

sage/interfaces/magma.py

@@ -253 +253 @@
             raise AttributeError
         return MagmaFunction(self, attrname)
+
+    def chdir(self, dir):
+        """
+        Change the Magma interpreters current working directory.
+        
+        EXAMPLES:
+            sage: magma.eval('System("pwd")')   # optional and random
+            '/Users/was/s/devel/sage-main/sage'
+            sage: magma.chdir('..')             # optional
+            sage: magma.eval('System("pwd")')   # optional and random
+            '/Users/was/s/devel/sage-main'
+        """
+        self.eval('ChangeDirectory("%s")'%dir, strip=False)
 
     def eval(self, x, strip=True):

sage/interfaces/maxima.py

@@ -607 +607 @@
             self.quit()
 
-            
+
+    ###########################################
+    # System -- change directory, etc
+    ###########################################
+    def chdir(self, dir):
+        """
+        Change Maxima's current working directory.
+        
+        EXAMPLES:
+           sage: maxima.chdir('/')
+        """
+        self.lisp('(ext::cd "%s")'%dir)
+
+    ###########################################
+    # Direct access to underlying lisp interpreter. 
+    ###########################################
+    def lisp(self, cmd):
+        """
+        Send a lisp command to maxima.
+
+        NOTE: The output of this command is very raw -- not pretty.
+
+        EXAMPLES:
+            sage: maxima.lisp("(+ 2 17)")   # random formated output
+             :lisp (+ 2 17)
+            19
+            (
+        """
+        self._eval_line(':lisp %s\n""'%cmd, allow_use_file=False, wait_for_prompt=False, reformat=False, error_check=False)
+        self._expect_expr('(%i)')
+        return self._before()
 
     ###########################################
@@ -675 +705 @@
 
     def trait_names(self, verbose=True, use_disk_cache=True):
+        """
+        Return all Maxima commands, which is useful for tab completion.
+
+        EXAMPLES:
+           sage: len(maxima.trait_names(verbose=False))    # random output
+           1743
+        """
         try:
             return self.__trait_names
@@ -696 +733 @@
 
     def _object_class(self):
+        """
+        Return the Python class of Maxima elements.
+
+        EXAMPLES:
+            sage: maxima._object_class()
+            <class 'sage.interfaces.maxima.MaximaElement'>
+        """
         return MaximaElement
 
     def _true_symbol(self):
+        """
+        Return the true symbol in Maxima.
+        
+        EXAMPLES:
+            sage: maxima._true_symbol()
+            'true'
+            sage: maxima.eval('is(2 = 2)')
+            'true'
+        """
         return 'true'
 
     def _false_symbol(self):
+        """
+        Return the false symbol in Maxima.
+        
+        EXAMPLES:
+            sage: maxima._false_symbol()
+            'false'
+            sage: maxima.eval('is(2 = 4)')
+            'false'
+        """
         return 'false'
 
@@ -796 +858 @@
         
     def console(self):
+        r"""
+        Start the interactive Maxima console.  This is a completely separate maxima
+        session from this interface.    To interact with this session, you should
+        instead use \code{maxima.interact()}.
+        
+        EXAMPLES:
+            sage: maxima.console()             # not tested (since we can't)
+            Maxima 5.13.0 http://maxima.sourceforge.net
+            Using Lisp CLISP 2.41 (2006-10-13)
+            Distributed under the GNU Public License. See the file COPYING.
+            Dedicated to the memory of William Schelter.
+            This is a development version of Maxima. The function bug_report()
+            provides bug reporting information.
+            (%i1)
+
+        sage: maxima.interact()     # this is not tested either
+          --> Switching to Maxima <-- 
+        maxima: 2+2
+        4
+        maxima: 
+          --> Exiting back to SAGE <-- 
+        """
         maxima_console()
     
     def version(self):
+        """
+        Return the version of Maxima that Sage includes.
+        
+        EXAMPLES:
+            sage: maxima.version()
+            '5.13.0'
+        """
         return maxima_version()
 
@@ -1207 +1298 @@
                    # the comparison thus when no comparable in interfaced system.
 
-    def sage_object(self):
-         from sage.calculus.calculus import symbolic_expression_from_maxima_string
-         return symbolic_expression_from_maxima_string(self.name(), maxima=self.parent())
-
-    def numer(self):
-        return self.comma('numer')
-
-    def real(self):
-        return self.realpart()
-
-    def imag(self):
-        return self.imagpart()
-
-    def _complex_mpfr_field_(self, CC):
+    def _sage_(self):
+        """
+        Attempt to make a native Sage object out of this maxima object.  This is useful
+        for automatic coercions in addition to other things.
+
+        EXAMPLES:
+            sage: a = maxima('sqrt(2) + 2.5'); a
+            sqrt(2)+2.5
+            sage: b = a._sage_(); b
+            sqrt(2) + 2.50000000000000
+            sage: type(b)
+            <class 'sage.calculus.calculus.SymbolicArithmetic'>
+
+        We illustrate an automatic coercion:
+            sage: c = b + sqrt(3); c
+            sqrt(3) + sqrt(2) + 2.50000000000000
+            sage: type(c)
+            <class 'sage.calculus.calculus.SymbolicArithmetic'>
+            sage: d = sqrt(3) + b; d
+            sqrt(3) + sqrt(2) + 2.50000000000000
+            sage: type(d)
+            <class 'sage.calculus.calculus.SymbolicArithmetic'>
+        """
+        from sage.calculus.calculus import symbolic_expression_from_maxima_string
+        #return symbolic_expression_from_maxima_string(self.name(), maxima=self.parent())
+        return symbolic_expression_from_maxima_string(repr(self))
+
+    def _complex_mpfr_field_(self, C):
         """
         EXAMPLES:
@@ -1229 +1334 @@
             sage: ComplexField(10)(maxima('2342.23482943872+234*%i'))
              2300. + 230.*I
-        """
-        return sage.rings.complex_number.ComplexNumber( CC, self.real(), self.imag() )
+            sage: ComplexField(200)(maxima('1+%i'))
+            1.0000000000000000000000000000000000000000000000000000000000 + 1.0000000000000000000000000000000000000000000000000000000000*I
+            sage: ComplexField(200)(maxima('sqrt(-2)'))
+            1.4142135623730950488016887242096980785696718753769480731767*I
+            sage: N(sqrt(-2), 200)
+            1.4142135623730950488016887242096980785696718753769480731767*I
+        """
+        return C(self._sage_())
+
+    def _mpfr_(self, R):
+        """
+        EXAMPLES:
+            sage: RealField(100)(maxima('sqrt(2)+1'))
+            2.4142135623730950488016887242
+        """
+        return R(self._sage_())
+
+    def _complex_double_(self, C):
+        """
+        EXAMPLES:
+            sage: CDF(maxima('sqrt(2)+1'))
+            2.41421356237
+        """
+        return C(self._sage_())
+
+    def _real_double_(self, R):
+        """
+        EXAMPLES:
+            sage: RDF(maxima('sqrt(2)+1'))
+            2.41421356237
+        """
+        return R(self._sage_())
+
+    def numer(self):
+        """
+        Return numerical approximation to self as a Maxima object.
+
+        EXAMPLES:
+            sage: a = maxima('sqrt(2)').numer(); a
+            1.414213562373095
+            sage: type(a)
+            <class 'sage.interfaces.maxima.MaximaElement'>
+        """
+        return self.comma('numer')
 
     def str(self):
+        """
+        Return string representation of this maxima object.
+
+        EXAMPLES:
+            sage: maxima('sqrt(2) + 1/3').str()
+            'sqrt(2)+1/3'
+        """
         P = self._check_valid()
         return P.get(self._name)
 
     def __repr__(self):
+        """
+        Return print representation of this object.
+
+        EXAMPLES:
+            sage: maxima('sqrt(2) + 1/3').__repr__()
+            'sqrt(2)+1/3'
+        """
         P = self._check_valid()
         try:
@@ -1491 +1652 @@
 
     def subst(self, val):
+        """
+        Substitute a value or several values into this Maxima object.
+
+        EXAMPLES:
+            sage: maxima('a^2 + 3*a + b').subst('b=2')
+            a^2+3*a+2
+            sage: maxima('a^2 + 3*a + b').subst('a=17')
+            b+340
+            sage: maxima('a^2 + 3*a + b').subst('a=17, b=2')
+            342
+        """
         return self.comma(val)
 
     def comma(self, args):
+        """
+        Form the expression that would be written 'self, args' in Maxima.
+
+        EXAMPLES:
+            sage: maxima('sqrt(2) + I').comma('numer')
+            I+1.414213562373095
+            sage: maxima('sqrt(2) + I*a').comma('a=5')
+            5*I+sqrt(2)
+        """
         self._check_valid()
         P = self.parent()
@@ -1499 +1680 @@
 
     def _latex_(self):
+        """
+        Return Latex representation of this Maxima object.
+
+        This calls the tex command in Maxima, then does a little `
+        post-processing to fix bugs in the resulting Maxima output.
+        
+        EXAMPLES:
+            sage: maxima('sqrt(2) + 1/3 + asin(5)')._latex_()
+            '\\sin^{-1}\\cdot5+\\sqrt{2}+{{1}\\over{3}}'
+        """
         self._check_valid()
         P = self.parent()

sage/server/notebook/js.py

@@ -901 +901 @@
    with(theform) {
       var system = options[selectedIndex].value;
-      if (confirm("Are you sure you wish to change the evaluation system to " + system + "? All cells will be evaluted using " + system + " until you change the system back.")) {
+      if (confirm("All cells will be evaluted using " + system + " until you change the system back.")) {
           system_select(system);
       } else {