changeset 1258:bb776b0c5ef8 octave-forge

fix for ML5.3
author schloegl
date Sun, 01 Feb 2004 15:01:01 +0000
parents 7a2af2b41ce2
children c9d8712d9255
files extra/NaN/mod.m extra/NaN/rem.m
diffstat 2 files changed, 15 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/extra/NaN/mod.m	Sat Jan 31 21:45:28 2004 +0000
+++ b/extra/NaN/mod.m	Sun Feb 01 15:01:01 2004 +0000
@@ -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;
--- a/extra/NaN/rem.m	Sat Jan 31 21:45:28 2004 +0000
+++ b/extra/NaN/rem.m	Sun Feb 01 15:01:01 2004 +0000
@@ -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;