aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-10-14 03:09:19 +0000
committerdos-reis <gdr@axiomatics.org>2008-10-14 03:09:19 +0000
commit1b563ad4798a9e1212841694616a86876877ed28 (patch)
treed3afb6181b03f5e4a743179987c625ffce381b29
parent88f88f9394c6611118f20517b8a29b735c79dcfe (diff)
downloadopen-axiom-1b563ad4798a9e1212841694616a86876877ed28.tar.gz
Fix AW/292
* algebra/defintef.spad.pamphlet (checkForPole): Handler exponention. (checkSMP): Likewise.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/algebra/defintef.spad.pamphlet8
-rw-r--r--src/input/aw-292.input5
-rw-r--r--src/input/mapleok.input.pamphlet4
4 files changed, 17 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 637d3a64..b77c8bce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
2008-10-13 Waldek Hebisch <hebisch@math.uni.wroc.pl>
+ Fix AW/292
+ * algebra/defintef.spad.pamphlet (checkForPole): Handler exponention.
+ (checkSMP): Likewise.
+
+2008-10-13 Waldek Hebisch <hebisch@math.uni.wroc.pl>
+
Fix AW/23
* algebra/fspace.spad.pamphlet (isExpt): Tidy.
* algebra/algfunc.spad.pamphlet (inroot): Likewise.
diff --git a/src/algebra/defintef.spad.pamphlet b/src/algebra/defintef.spad.pamphlet
index b8f542cb..5e654da2 100644
--- a/src/algebra/defintef.spad.pamphlet
+++ b/src/algebra/defintef.spad.pamphlet
@@ -105,8 +105,8 @@ ElementaryFunctionDefiniteIntegration(R, F): Exports == Implementation where
for t in v::List(P) repeat
((w := checkFor0(t, x, a, b)) case "failed") or (w::B) => return w
false
- (r := retractIfCan(p)@Union(K, "failed")) case "failed" => "failed"
- k := r::K
+ (z := isExpt p) case "failed" => "failed"
+ k := z.var
-- functions with no real zeros
is?(k, "exp"::SE) or is?(k, "acot"::SE) or is?(k, "cosh"::SE) => false
-- special case for log
@@ -139,8 +139,8 @@ ElementaryFunctionDefiniteIntegration(R, F): Exports == Implementation where
-- one? n => true -- only one summand has a pole
(n = 1) => true -- only one summand has a pole
"failed" -- at least 2 summands have a pole
- (r := retractIfCan(p)@Union(K, "failed")) case "failed" => "failed"
- kk := r::K
+ (z := isExpt p) case "failed" => "failed"
+ kk := z.var
-- nullary operators have no poles
nullary? operator kk => false
f := first argument kk
diff --git a/src/input/aw-292.input b/src/input/aw-292.input
new file mode 100644
index 00000000..7a5ddb00
--- /dev/null
+++ b/src/input/aw-292.input
@@ -0,0 +1,5 @@
+--
+-- expected: (1 - cos(1)*sin(1))/2
+--
+integrate(sin(x)^2,x=0..1)
+
diff --git a/src/input/mapleok.input.pamphlet b/src/input/mapleok.input.pamphlet
index bce65f47..652a3a03 100644
--- a/src/input/mapleok.input.pamphlet
+++ b/src/input/mapleok.input.pamphlet
@@ -2950,7 +2950,7 @@ in2045:=integrate(atan(1/tan(z)), z= 0..2*%pi)
-- - 3%pi
-- Type: Union(f1: OrderedCompletion Expression Integer,...)
-in1502a:=integrate(log(z)^2*log(-z), z= 0..%plusInfinity,"noPole")
+in1502a:=integrate(log(z)^2*log(-z), z= 0..%plusInfinity)
--
-- + infinity
-- Type: Union(f1: OrderedCompletion Expression Integer,...)
@@ -3988,7 +3988,7 @@ in2094a:=integrate(asinh(z)-acoth(z), z= -1..1,"noPole")
-- 2
-- Type: Union(f1: OrderedCompletion Expression Integer,...)
-in2096a:=integrate(log(z)^2, z= %minusInfinity..%plusInfinity,"noPole")
+in2096a:=integrate(log(z)^2, z= %minusInfinity..%plusInfinity)
--
-- + infinity
-- Type: Union(f1: OrderedCompletion Expression Integer,...)