diff options
| author | Jay Belanger | 2004-11-08 02:21:11 +0000 |
|---|---|---|
| committer | Jay Belanger | 2004-11-08 02:21:11 +0000 |
| commit | f1e0e03c67fb21caa994e5b5474ca3abb371d131 (patch) | |
| tree | f53102004d972a685cb517256815bcab2fd73a85 | |
| parent | a653f81218951ad4776bdfe3314c76e10f7fb509 (diff) | |
| download | emacs-f1e0e03c67fb21caa994e5b5474ca3abb371d131.tar.gz emacs-f1e0e03c67fb21caa994e5b5474ca3abb371d131.zip | |
(math-do-integral-methods): Try linear, then non-linear, substitutions.
| -rw-r--r-- | lisp/calc/calcalg2.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el index 7e8484ea79f..ff23c3e5421 100644 --- a/lisp/calc/calcalg2.el +++ b/lisp/calc/calcalg2.el | |||
| @@ -981,9 +981,8 @@ | |||
| 981 | 981 | ||
| 982 | ;; Integration by substitution, for various likely sub-expressions. | 982 | ;; Integration by substitution, for various likely sub-expressions. |
| 983 | ;; (In first pass, we look only for sub-exprs that are linear in X.) | 983 | ;; (In first pass, we look only for sub-exprs that are linear in X.) |
| 984 | (or (if math-linear-subst-tried | 984 | (or (math-integ-try-linear-substitutions expr) |
| 985 | (math-integ-try-substitutions expr) | 985 | (math-integ-try-substitutions expr) |
| 986 | (math-integ-try-linear-substitutions expr)) | ||
| 987 | 986 | ||
| 988 | ;; If function has sines and cosines, try tan(x/2) substitution. | 987 | ;; If function has sines and cosines, try tan(x/2) substitution. |
| 989 | (and (let ((p (setq rat-in (math-expr-rational-in expr)))) | 988 | (and (let ((p (setq rat-in (math-expr-rational-in expr)))) |