[pure-lang-svn] SF.net SVN: pure-lang:[580] pure/trunk
Status: Beta
Brought to you by:
agraef
Menu
▾
▴
[pure-lang-svn] SF.net SVN: pure-lang:[580] pure/trunk
|
From: <ag...@us...> - 2008-08-23 11:43:07
|
Revision: 580
http://pure-lang.svn.sourceforge.net/pure-lang/?rev=580&view=rev
Author: agraef
Date: 2008-08-23 11:43:17 +0000 (Sat, 23 Aug 2008)
Log Message:
-----------
Fix result type of (^) operation in real/polar cases.
Modified Paths:
--------------
pure/trunk/lib/math.pure
pure/trunk/test/test020.log
Modified: pure/trunk/lib/math.pure
===================================================================
--- pure/trunk/lib/math.pure 2008-08-23 11:18:41 UTC (rev 579)
+++ pure/trunk/lib/math.pure 2008-08-23 11:43:17 UTC (rev 580)
@@ -295,8 +295,8 @@
z1@(_+:_)^x2 |
z1@(_<:_)^x2 = exp (ln z1*x2);
-x1^z2@(_+:_) |
-x1^z2@(_<:_) = exp (ln (complex x1)*z2);
+x1^z2@(_+:_) = exp (ln (rect x1)*z2);
+x1^z2@(_<:_) = exp (ln (polar x1)*z2);
/* Equality. */
Modified: pure/trunk/test/test020.log
===================================================================
--- pure/trunk/test/test020.log 2008-08-23 11:18:41 UTC (rev 579)
+++ pure/trunk/test/test020.log 2008-08-23 11:43:17 UTC (rev 580)
@@ -3143,12 +3143,12 @@
(^),1,1.20+:-4.30,1.00+:0.00
(^),1,1L%2L+:1,1.00+:0.00
(^),1,1L%2L+:3L%4L,1.00+:0.00
-(^),1,3<:1,1.00+:0.00
-(^),1,3<:-2.14,1.00+:-0.00
-(^),1,3.00<:-3,1.00+:-0.00
-(^),1,3.10<:2.50,1.00+:0.00
-(^),1,2L%3L<:2,1.00+:0.00
-(^),1,1L%2L<:3L%4L,1.00+:0.00
+(^),1,3<:1,1.00<:0.00
+(^),1,3<:-2.14,1.00<:-0.00
+(^),1,3.00<:-3,1.00<:-0.00
+(^),1,3.10<:2.50,1.00<:0.00
+(^),1,2L%3L<:2,1.00<:0.00
+(^),1,1L%2L<:3L%4L,1.00<:0.00
(^),1,-inf,1.00
(^),1,nan,1.00
(^),-1,1,-1.00
@@ -3166,12 +3166,12 @@
(^),-1,1.20+:-4.30,-5.95e+05+:-4.33e+05
(^),-1,1L%2L+:1,2.65e-18+:0.0432
(^),-1,1L%2L+:3L%4L,5.80e-18+:0.0948
-(^),-1,3<:1,0.000133+:-0.000334
-(^),-1,3<:-2.14,1.03e+03+:2.58e+03
-(^),-1,3.00<:-3,-3.76+:-0.356
-(^),-1,3.10<:2.50,0.000152+:-0.00294
-(^),-1,2L%3L<:2,0.0958+:-0.114
-(^),-1,1L%2L<:3L%4L,0.140+:0.313
+(^),-1,3<:1,0.000360<:-1.19
+(^),-1,3<:-2.14,2.78e+03<:1.19
+(^),-1,3.00<:-3,3.78<:-3.05
+(^),-1,3.10<:2.50,0.00294<:-1.52
+(^),-1,2L%3L<:2,0.149<:-0.872
+(^),-1,1L%2L<:3L%4L,0.343<:1.15
(^),-1,-inf,1.00
(^),-1,nan,nan
(^),0,1,0.00
@@ -3189,12 +3189,12 @@
(^),0,1.20+:-4.30,nan+:nan
(^),0,1L%2L+:1,nan+:nan
(^),0,1L%2L+:3L%4L,nan+:nan
-(^),0,3<:1,nan+:nan
-(^),0,3<:-2.14,nan+:nan
-(^),0,3.00<:-3,nan+:nan
-(^),0,3.10<:2.50,nan+:nan
-(^),0,2L%3L<:2,nan+:nan
-(^),0,1L%2L<:3L%4L,nan+:nan
+(^),0,3<:1,0.00<:nan
+(^),0,3<:-2.14,inf<:nan
+(^),0,3.00<:-3,inf<:nan
+(^),0,3.10<:2.50,inf<:nan
+(^),0,2L%3L<:2,inf<:nan
+(^),0,1L%2L<:3L%4L,0.00<:nan
(^),0,-inf,inf
(^),0,nan,nan
(^),0.00,1,0.00
@@ -3212,12 +3212,12 @@
(^),0.00,1.20+:-4.30,nan+:nan
(^),0.00,1L%2L+:1,nan+:nan
(^),0.00,1L%2L+:3L%4L,nan+:nan
-(^),0.00,3<:1,nan+:nan
-(^),0.00,3<:-2.14,nan+:nan
-(^),0.00,3.00<:-3,nan+:nan
-(^),0.00,3.10<:2.50,nan+:nan
-(^),0.00,2L%3L<:2,nan+:nan
-(^),0.00,1L%2L<:3L%4L,nan+:nan
+(^),0.00,3<:1,0.00<:nan
+(^),0.00,3<:-2.14,inf<:nan
+(^),0.00,3.00<:-3,inf<:nan
+(^),0.00,3.10<:2.50,inf<:nan
+(^),0.00,2L%3L<:2,inf<:nan
+(^),0.00,1L%2L<:3L%4L,0.00<:nan
(^),0.00,-inf,inf
(^),0.00,nan,nan
(^),1.20,1,1.20
@@ -3235,12 +3235,12 @@
(^),1.20,1.20+:-4.30,0.881+:-0.879
(^),1.20,1L%2L+:1,1.08+:0.199
(^),1.20,1L%2L+:3L%4L,1.09+:0.149
-(^),1.20,3<:1,1.20+:0.597
-(^),1.20,3<:-2.14,0.667+:-0.331
-(^),1.20,3.00<:-3,0.580+:-0.0449
-(^),1.20,3.10<:2.50,0.600+:0.211
-(^),1.20,2L%3L<:2,0.945+:0.105
-(^),1.20,1L%2L<:3L%4L,1.07+:0.0664
+(^),1.20,3<:1,1.34<:0.460
+(^),1.20,3<:-2.14,0.744<:-0.460
+(^),1.20,3.00<:-3,0.582<:-0.0772
+(^),1.20,3.10<:2.50,0.636<:0.338
+(^),1.20,2L%3L<:2,0.951<:0.111
+(^),1.20,1L%2L<:3L%4L,1.07<:0.0621
(^),1.20,-inf,0.00
(^),1.20,nan,nan
(^),-1.20,1,-1.20
@@ -3258,12 +3258,12 @@
(^),-1.20,1.20+:-4.30,-9.05e+05+:1.42e+05
(^),-1.20,1L%2L+:1,-0.00858+:0.0466
(^),-1.20,1L%2L+:3L%4L,-0.0142+:0.103
-(^),-1.20,3<:1,0.000360+:-0.000322
-(^),-1.20,3<:-2.14,1.54e+03+:1.38e+03
-(^),-1.20,3.00<:-3,-2.20+:-0.0377
-(^),-1.20,3.10<:2.50,0.000711+:-0.00173
-(^),-1.20,2L%3L<:2,0.103+:-0.0976
-(^),-1.20,1L%2L<:3L%4L,0.129+:0.343
+(^),-1.20,3<:1,0.000483<:-0.731
+(^),-1.20,3<:-2.14,2.07e+03<:0.731
+(^),-1.20,3.00<:-3,2.20<:-3.12
+(^),-1.20,3.10<:2.50,0.00187<:-1.18
+(^),-1.20,2L%3L<:2,0.142<:-0.761
+(^),-1.20,1L%2L<:3L%4L,0.366<:1.21
(^),-1.20,-inf,0.00
(^),-1.20,nan,nan
(^),1L%3L,1,0.333
@@ -3281,12 +3281,12 @@
(^),1L%3L,1.20+:-4.30,0.00312+:-0.268
(^),1L%3L,1L%2L+:1,0.263+:-0.514
(^),1L%3L,1L%2L+:3L%4L,0.392+:-0.424
-(^),1L%3L,3<:1,-0.157+:-0.0607
-(^),1L%3L,3<:-2.14,-5.54+:2.14
-(^),1L%3L,3.00<:-3,23.3+:11.7
-(^),1L%3L,3.10<:2.50,-6.90+:-13.7
-(^),1L%3L,2L%3L<:2,1.07+:-0.838
-(^),1L%3L,1L%2L<:3L%4L,0.623+:-0.245
+(^),1L%3L,3<:1,0.169<:-2.77
+(^),1L%3L,3<:-2.14,5.93<:2.77
+(^),1L%3L,3.00<:-3,26.1<:0.465
+(^),1L%3L,3.10<:2.50,15.3<:-2.04
+(^),1L%3L,2L%3L<:2,1.36<:-0.666
+(^),1L%3L,1L%2L<:3L%4L,0.669<:-0.374
(^),1L%3L,-inf,inf
(^),1L%3L,nan,nan
(^),(-1L)%4L,1,-0.250
@@ -3304,12 +3304,12 @@
(^),(-1L)%4L,1.20+:-4.30,-1.33e+05+:-4.20e+04
(^),(-1L)%4L,1L%2L+:1,0.0212+:0.00396
(^),(-1L)%4L,1L%2L+:3L%4L,0.0409+:0.0240
-(^),(-1L)%4L,3<:1,-8.31e-07+:3.80e-05
-(^),(-1L)%4L,3<:-2.14,-575.+:-2.63e+04
-(^),(-1L)%4L,3.00<:-3,-180.+:-146.
-(^),(-1L)%4L,3.10<:2.50,-0.0536+:0.0748
-(^),(-1L)%4L,2L%3L<:2,-0.0308+:-0.217
-(^),(-1L)%4L,1L%2L<:3L%4L,0.161+:0.129
+(^),(-1L)%4L,3<:1,3.80e-05<:1.59
+(^),(-1L)%4L,3<:-2.14,2.63e+04<:-1.59
+(^),(-1L)%4L,3.00<:-3,232.<:-2.46
+(^),(-1L)%4L,3.10<:2.50,0.0920<:2.19
+(^),(-1L)%4L,2L%3L<:2,0.219<:-1.71
+(^),(-1L)%4L,1L%2L<:3L%4L,0.206<:0.677
(^),(-1L)%4L,-inf,inf
(^),(-1L)%4L,nan,nan
(^),1+:2,1,1.00+:2.00
@@ -3626,12 +3626,12 @@
(^),-inf,1.20+:-4.30,nan+:nan
(^),-inf,1L%2L+:1,nan+:nan
(^),-inf,1L%2L+:3L%4L,nan+:nan
-(^),-inf,3<:1,nan+:nan
-(^),-inf,3<:-2.14,nan+:nan
-(^),-inf,3.00<:-3,nan+:nan
-(^),-inf,3.10<:2.50,nan+:nan
-(^),-inf,2L%3L<:2,nan+:nan
-(^),-inf,1L%2L<:3L%4L,nan+:nan
+(^),-inf,3<:1,inf<:nan
+(^),-inf,3<:-2.14,0.00<:nan
+(^),-inf,3.00<:-3,0.00<:nan
+(^),-inf,3.10<:2.50,0.00<:nan
+(^),-inf,2L%3L<:2,0.00<:nan
+(^),-inf,1L%2L<:3L%4L,inf<:nan
(^),-inf,-inf,0.00
(^),-inf,nan,nan
(^),nan,1,nan
@@ -3649,12 +3649,12 @@
(^),nan,1.20+:-4.30,nan+:nan
(^),nan,1L%2L+:1,nan+:nan
(^),nan,1L%2L+:3L%4L,nan+:nan
-(^),nan,3<:1,nan+:nan
-(^),nan,3<:-2.14,nan+:nan
-(^),nan,3.00<:-3,nan+:nan
-(^),nan,3.10<:2.50,nan+:nan
-(^),nan,2L%3L<:2,nan+:nan
-(^),nan,1L%2L<:3L%4L,nan+:nan
+(^),nan,3<:1,nan<:nan
+(^),nan,3<:-2.14,nan<:nan
+(^),nan,3.00<:-3,nan<:nan
+(^),nan,3.10<:2.50,nan<:nan
+(^),nan,2L%3L<:2,nan<:nan
+(^),nan,1L%2L<:3L%4L,nan<:nan
(^),nan,-inf,nan
(^),nan,nan,nan
atan2,1,1,0.785
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
