From: Paul K. <pki...@us...> - 2005-09-08 02:00:31
|
Update of /cvsroot/octave/octave-forge/main/comm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19391/main/comm Modified Files: ademodce.m amodce.m apkconst.m awgn.m bchpoly.m bi2de.m biterr.m de2bi.m decode.m demodmap.m encode.m eyediagram.m gfweight.m lloyds.m modmap.m rsdecof.m rsencof.m scatterplot.m symerr.m wgn.m Log Message: [for Bill Denney] isstr -> ischar Index: decode.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/decode.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- decode.m 15 Jun 2004 21:09:46 -0000 1.3 +++ decode.m 8 Sep 2005 02:00:17 -0000 1.4 @@ -119,7 +119,7 @@ endif if (nargin > 3) - if (!isstr(typ)) + if (!ischar(typ)) error ("decode: type argument must be a string"); else ## Why the hell did matlab decide on such an ugly way of passing 2 args! Index: rsencof.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/rsencof.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rsencof.m 1 Apr 2003 19:37:15 -0000 1.2 +++ rsencof.m 8 Sep 2005 02:00:17 -0000 1.3 @@ -44,7 +44,7 @@ usage("rsencof (in, out [, t [, pad]])"); endif - if (!isstr(in) || !isstr(out)) + if (!ischar(in) || !ischar(out)) error ("rsencof: input and output filenames must be strings"); endif @@ -52,7 +52,7 @@ pad = 1; for i=1:length(varargin) arg = varargin{i}; - if (isstr(arg)) + if (ischar(arg)) if (strcmp(arg,"pad")) pad = 1; elseif (strcmp(arg,"nopad")) Index: scatterplot.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/scatterplot.m,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- scatterplot.m 2 May 2005 20:13:48 -0000 1.9 +++ scatterplot.m 8 Sep 2005 02:00:17 -0000 1.10 @@ -105,7 +105,7 @@ if (nargin > 3) if (isempty(str)) fmt = "w p 1"; - elseif (isstr(str)) + elseif (ischar(str)) fmt = __pltopt__ ("scatterplot", str); else error ("scatterplot: plot format must be a string"); Index: encode.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/encode.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- encode.m 18 Mar 2003 21:50:12 -0000 1.2 +++ encode.m 8 Sep 2005 02:00:17 -0000 1.3 @@ -102,7 +102,7 @@ endif if (nargin > 3) - if (!isstr(typ)) + if (!ischar(typ)) error ("encode: type argument must be a string"); else ## Why the hell did matlab decide on such an ugly way of passing 2 args! Index: amodce.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/amodce.m,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- amodce.m 18 Mar 2003 21:50:06 -0000 1.1 +++ amodce.m 8 Sep 2005 02:00:17 -0000 1.2 @@ -100,7 +100,7 @@ num = []; den = []; narg = 1; - if (!isstr(typ)) + if (!ischar(typ)) error ("amodce: modulation type must be a string"); elseif (strcmp(typ,"am") || strcmp(typ,"amdsb-tc")) if (length(varargin) > 0) Index: modmap.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/modmap.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- modmap.m 15 Mar 2004 22:23:01 -0000 1.2 +++ modmap.m 8 Sep 2005 02:00:17 -0000 1.3 @@ -132,7 +132,7 @@ error ("modmap: too many output arguments"); endif - if (!isstr(method)) + if (!ischar(method)) error ("modmap: mapping method to use must be a string"); endif Index: wgn.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/wgn.m,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- wgn.m 25 May 2004 14:59:04 -0000 1.5 +++ wgn.m 8 Sep 2005 02:00:17 -0000 1.6 @@ -63,7 +63,7 @@ for i=1:length(varargin) arg = varargin{i}; - if (isstr(arg)) + if (ischar(arg)) if (strcmp(arg,"real")) out = "real"; elseif (strcmp(arg,"complex")) Index: awgn.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/awgn.m,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- awgn.m 25 May 2004 14:59:04 -0000 1.5 +++ awgn.m 8 Sep 2005 02:00:17 -0000 1.6 @@ -65,7 +65,7 @@ for i=1:length(varargin) arg = varargin{i}; - if (isstr(arg)) + if (ischar(arg)) if (strcmp(arg,"measured")) meas = 1; elseif (strcmp(arg,"dB")) Index: rsdecof.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/rsdecof.m,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- rsdecof.m 30 Aug 2005 01:18:34 -0000 1.4 +++ rsdecof.m 8 Sep 2005 02:00:17 -0000 1.5 @@ -40,7 +40,7 @@ usage("rsdecof (in, out [, t])"); endif - if (!isstr(in) || !isstr(out)) + if (!ischar(in) || !ischar(out)) error ("rsdecof: input and output filenames must be strings"); endif Index: bchpoly.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/bchpoly.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bchpoly.m 15 Jul 2004 23:11:33 -0000 1.2 +++ bchpoly.m 8 Sep 2005 02:00:17 -0000 1.3 @@ -110,7 +110,7 @@ for i=1:length(varargin) arg = varargin{i}; - if (isstr(arg)) + if (ischar(arg)) probe = 1; if (nargout > 1) error ("bchpoly: only one output argument allowed when probing valid codes"); Index: lloyds.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/lloyds.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- lloyds.m 16 Jun 2004 15:13:33 -0000 1.3 +++ lloyds.m 8 Sep 2005 02:00:17 -0000 1.4 @@ -99,7 +99,7 @@ if (nargin < 4) type = "centroid"; - elseif (!isstr(type)) + elseif (!ischar(type)) error ("lloyds: expecting string argument for type"); endif Index: de2bi.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/de2bi.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- de2bi.m 6 Feb 2003 05:14:59 -0000 1.2 +++ de2bi.m 8 Sep 2005 02:00:17 -0000 1.3 @@ -53,30 +53,30 @@ f = 'right-msb'; elseif (nargin == 2) p = 2; - if (isstr(n)) + if (ischar(n)) f = n; n = floor ( log (max (max (d), 1)) ./ log (p) ) + 1; else f = 'right-msb'; endif elseif (nargin == 3) - if (isstr(n)) + if (ischar(n)) f = n; n = p p = 2; - elseif (isstr(p)) + elseif (ischar(p)) f = p; p = 2; else f = 'right-msb'; endif elseif (nargin == 3) - if (isstr(n)) + if (ischar(n)) tmp = f f = n; n = p p = tmp; - elseif (isstr(p)) + elseif (ischar(p)) tmp = f; f = p; p = tmp; Index: bi2de.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/bi2de.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bi2de.m 6 Feb 2003 05:14:59 -0000 1.2 +++ bi2de.m 8 Sep 2005 02:00:17 -0000 1.3 @@ -45,14 +45,14 @@ p = 2; f = 'right-msb'; case 2, - if (isstr(p)) + if (ischar(p)) f = p; p = 2; else f = 'right-msb'; endif case 3, - if (isstr(p)) + if (ischar(p)) tmp = f; f = p; p = tmp; Index: gfweight.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/gfweight.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gfweight.m 18 Mar 2003 21:50:16 -0000 1.2 +++ gfweight.m 8 Sep 2005 02:00:17 -0000 1.3 @@ -47,7 +47,7 @@ [ign, gen] = cyclgen(arg2, arg1); elseif (ismatrix(arg1)) if (nargin == 2) - if (isstr(arg2)) + if (ischar(arg2)) if (strcmp(arg2,"gen")) gen = arg1; elseif (strcmp(arg2,"par")) Index: symerr.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/symerr.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- symerr.m 18 Mar 2003 21:50:21 -0000 1.2 +++ symerr.m 8 Sep 2005 02:00:17 -0000 1.3 @@ -95,7 +95,7 @@ endif if (nargin > 2) - if (isstr(_flag)) + if (ischar(_flag)) if (strcmp(_flag,"row-wise")) if (strcmp(type,"column")) error ("symerr: row-wise comparison not possible with column inputs"); Index: apkconst.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/apkconst.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- apkconst.m 2 May 2005 15:30:15 -0000 1.3 +++ apkconst.m 8 Sep 2005 02:00:17 -0000 1.4 @@ -69,7 +69,7 @@ for i=1:length(varargin) arg = varargin{i}; - if (isstr(arg)) + if (ischar(arg)) if (strcmp(arg,"n")) try text(); Index: eyediagram.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/eyediagram.m,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- eyediagram.m 30 Aug 2005 01:18:34 -0000 1.6 +++ eyediagram.m 8 Sep 2005 02:00:17 -0000 1.7 @@ -119,7 +119,7 @@ if (nargin > 4) if (isempty(str)) fmt = "w l 1"; - elseif (isstr(str)) + elseif (ischar(str)) fmt = __pltopt__ ("eyediagram", str); else error ("eyediagram: plot format must be a string"); Index: demodmap.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/demodmap.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- demodmap.m 27 Mar 2003 21:14:34 -0000 1.2 +++ demodmap.m 8 Sep 2005 02:00:17 -0000 1.3 @@ -98,7 +98,7 @@ if (nargin > 3) method = varargin{1}; - if (!isstr(method) || (!strcmp(method,"ask") && ... + if (!ischar(method) || (!strcmp(method,"ask") && ... isempty(findstr(method,"msk")) && isempty(findstr(method,"fsk")) && ... isempty(findstr(method,"samp")) && !strcmp(method,"psk") && ... !strcmp(method,"qask") && !strcmp(method,"qam") && ... Index: ademodce.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/ademodce.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ademodce.m 27 Mar 2003 21:14:33 -0000 1.2 +++ ademodce.m 8 Sep 2005 02:00:17 -0000 1.3 @@ -103,7 +103,7 @@ num = []; den = []; narg = 1; - if (!isstr(typ)) + if (!ischar(typ)) error ("ademodce: modulation type must be a string"); elseif (strcmp(typ,"am") || strcmp(typ,"amdsb-tc")) if (length(varargin) > 0) Index: biterr.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/comm/biterr.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- biterr.m 18 Feb 2003 04:34:09 -0000 1.2 +++ biterr.m 8 Sep 2005 02:00:17 -0000 1.3 @@ -110,7 +110,7 @@ k = 0; for i =1:length(varargin) arg = varargin{i}; - if (isstr(arg)) + if (ischar(arg)) if (strcmp(arg,"row-wise")) if (strcmp(type,"column")) error ("biterr: row-wise comparison not possible with column inputs"); |