From: <sch...@pr...> - 2004-02-01 15:02:53
|
Update of /cvsroot/octave/octave-forge/extra/NaN In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21742 Modified Files: mod.m rem.m Log Message: fix for ML5.3 Index: mod.m =================================================================== RCS file: /cvsroot/octave/octave-forge/extra/NaN/mod.m,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mod.m 29 Jan 2004 23:23:33 -0000 1.1 +++ mod.m 1 Feb 2004 15:01:01 -0000 1.2 @@ -35,14 +35,18 @@ % http://www.dpmi.tu-graz.ac.at/~schloegl/matlab/NaN/ -s = warning('off'); +s = warning; +warning('off'); -if isscalar(x) +if all(size(x)==1) x = repmat(x,size(y)); end; -if isscalar(y) +if all(size(y)==1) y = repmat(y,size(x)); end; +if any(size(x)~=size(y)), + error('Size if input arguments do not fit.\n'); +end; t = floor(x./y); z = x - y.*t; Index: rem.m =================================================================== RCS file: /cvsroot/octave/octave-forge/extra/NaN/rem.m,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- rem.m 29 Jan 2004 23:23:33 -0000 1.1 +++ rem.m 1 Feb 2004 15:01:01 -0000 1.2 @@ -34,14 +34,19 @@ % http://www.dpmi.tu-graz.ac.at/~schloegl/matlab/NaN/ -s = warning('off'); +s = warning; +warning('off'); -if isscalar(x) +if all(size(x)==1) x = repmat(x,size(y)); end; -if isscalar(y) +if all(size(y)==1) y = repmat(y,size(x)); end; +if any(size(x)~=size(y)), + fprintf(2,'Error REM: size if input arguments do not fit.\n'); + return; +end; t = fix(x./y); z = x - y.*t; |