|
From: <tho...@us...> - 2012-04-03 20:51:34
|
Revision: 10138
http://octave.svn.sourceforge.net/octave/?rev=10138&view=rev
Author: thomas-weber
Date: 2012-04-03 20:51:27 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Fixes for error "invalid assignment to cs-list outside multiple assignment"
Patch from Rafael Laboissiere <ra...@la...>
Modified Paths:
--------------
trunk/octave-forge/main/fixed/inst/fixedpoint.m
Modified: trunk/octave-forge/main/fixed/inst/fixedpoint.m
===================================================================
--- trunk/octave-forge/main/fixed/inst/fixedpoint.m 2012-04-03 13:55:17 UTC (rev 10137)
+++ trunk/octave-forge/main/fixed/inst/fixedpoint.m 2012-04-03 20:51:27 UTC (rev 10138)
@@ -209,10 +209,10 @@
if (size(zero) != [n,n])
error ("FAILED");
endif
- zero.int = zero.int+1;
- zero.dec = zero.dec+1;
- if (any(any(zero.x)) || any(any(zero.int != is+1)) ||
- any(any(zero.dec != ds+1)))
+ zero_int_plus_one = zero.int+1;
+ zero_dec_plus_one = zero.dec+1;
+ if (any(any(zero.x)) || any(any(zero_int_plus_one != is+1)) ||
+ any(any(zero_dec_plus_one != ds+1)))
error ("FAILED");
endif
for i=1:100
@@ -312,10 +312,10 @@
if (size(onei) != [n,n])
error ("FAILED");
endif
- onei.int = onei.int+1;
- onei.dec = onei.dec+1;
- if (any(any(onei.x != 1+1i)) || any(any(onei.int != is*(1+1i)+1)) ||
- any(any(onei.dec != ds*(1+1i)+1)))
+ onei_int_plus_one = onei.int+1;
+ onei_dec_plus_one = onei.dec+1;
+ if (any(any(onei.x != 1+1i)) || any(any(onei_int_plus_one != is*(1+1i)+1)) ||
+ any(any(onei_dec_plus_one != ds*(1+1i)+1)))
error ("FAILED");
endif
for i=1:100
@@ -392,8 +392,7 @@
if (any(any(abs(a(1,:).x - x(1,:)) > feps)) || !isfixed(a))
error ("FAILED");
endif
- a(1,:).dec = a(1,:).dec + 1;
- if (a(1,:).dec != ds+1)
+ if (a(1,:).dec + 1 != ds+1)
error("FAILED");
endif
if (a(2,:).dec != ds)
@@ -411,8 +410,7 @@
!isfixed(a))
error ("FAILED");
endif
- a(1,:).dec = a(1,:).dec + 1;
- if (a(1,:).dec != ds*(1+1i)+1)
+ if (a(1,:).dec + 1 != ds*(1+1i)+1)
error("FAILED");
endif
if (a(2,:).dec != ds*(1+1i))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-04-03 20:53:33
|
Revision: 10139
http://octave.svn.sourceforge.net/octave/?rev=10139&view=rev
Author: thomas-weber
Date: 2012-04-03 20:53:27 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Cope with the change in the behavior of ismatrix()
ismatrix([]) used to return 0 in Octave 3.2, but now returns returns 1 in 3.6.
Patch from Rafael Laboissiere <ra...@la...>
Modified Paths:
--------------
trunk/octave-forge/main/fixed/inst/fixedpoint.m
Modified: trunk/octave-forge/main/fixed/inst/fixedpoint.m
===================================================================
--- trunk/octave-forge/main/fixed/inst/fixedpoint.m 2012-04-03 20:51:27 UTC (rev 10138)
+++ trunk/octave-forge/main/fixed/inst/fixedpoint.m 2012-04-03 20:53:27 UTC (rev 10139)
@@ -180,7 +180,7 @@
error ("FAILED");
endif
empty = fixed(is,ds,[]);
- if (isscalar(empty) || ismatrix(empty) || !isfixed(empty) ||
+ if (isscalar(empty) || !isfixed(empty) ||
isvector(empty) || !isempty(empty) || isempty(zero))
error ("FAILED");
endif
@@ -278,7 +278,7 @@
error ("FAILED");
endif
empty = fixed(is*(1+1i),ds*(1+1i),[]);
- if (isscalar(empty) || ismatrix(empty) || !isfixed(empty) ||
+ if (isscalar(empty) || !isfixed(empty) ||
isvector(empty) || !isempty(empty) || isempty(onei) ||
iscomplex(empty))
## Not complex, since its type is narrowed!!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|