Changeset 7731:26e90216c47d

Timestamp:

12/15/07 05:39:17 (5 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

trac #1425 additional work based on refereeing the patch.

Location:

sage

Files:

• calculus/calculus.py (modified) (7 diffs)
• interfaces/maxima.py (modified) (3 diffs)

sage/calculus/calculus.py

@@ -9 +9 @@
 
 EXAMPLES:
-
     The basic units of the calculus package are symbolic expressions
     which are elements of the symbolic expression ring (SR). There are
@@ -142 +141 @@
         sage: float(z)
         4.6467837624329356
+
+
+    We test pickling:
+        sage: x, y = var('x,y')
+        sage: f = -sqrt(pi)*(x^3 + sin(x/cos(y)))
+        sage: bool(loads(dumps(f)) == f)
+        True
 
 COERCION EXAMPLES:
@@ -185 +191 @@
 
 TESTS:
-We test pickling:
-    sage: f = -sqrt(pi)*(x^3 + sin(x/cos(y)))
-    sage: bool(loads(dumps(f)) == f)
-    True
 
 Substitution:
@@ -203 +205 @@
     sqrt(2.000000000000000e-6*k + 12)
     sage: sqrt(c^3)
-    (2.000000000000000e-6*k + 12)^(3/2)
+    sqrt((2.000000000000000e-6*k + 12)^3)
 
 The symbolic Calculus package uses its own copy of Maxima for
@@ -233 +235 @@
 is different than the one in the interactive interpreter.
 
+
 """
 
@@ -261 +264 @@
 # The calculus package uses its own copy of maxima, which is
 # separate from the default system-wide version.
-maxima = Maxima()
+maxima = Maxima(init_code = ['display2d:false; domain: complex;'])
 
 from sage.misc.sage_eval import sage_eval
@@ -6448 +6451 @@
 syms_default = dict(syms_cur)
 
-

sage/interfaces/maxima.py

@@ -378 +378 @@
         return Expect.__call__(self, x)
         
-    def __init__(self, script_subdirectory=None, logfile=None, server=None):
+    def __init__(self, script_subdirectory=None, logfile=None, server=None,
+                 init_code = None):
         """
         Create an instance of the Maxima interpreter.   
@@ -389 +390 @@
         if not os.path.exists(STARTUP):
             raise RuntimeError, 'You must get the file local/bin/sage-maxima.lisp'
+        if init_code is None:
+            init_code = ['display2d : false'] # no ascii art output
         Expect.__init__(self,
                         name = 'maxima',
@@ -397 +400 @@
                         restart_on_ctrlc = False,
                         verbose_start = False,
-                        init_code = ['display2d : false',  # no ascii art output
-                                     #'load("mactex-utilities")'   # latex instead of plain tex from tex command (broken in maxima-5.11.0!)
-                                     ],
+                        init_code = init_code,
                         logfile = logfile,
                         eval_using_file_cutoff=eval_using_file_cutoff)