More warning fixes.

Author: tobydriscoll

dplot.m

@@ -26,7 +26,6 @@
 
 w = w(:);
 beta = beta(:);
-n = length(w);
 z = z(:);
 
 % Parse input
@@ -47,12 +46,12 @@
 end
 
 % Integer arguments must be converted to specific values
-if (length(R)==1) & (R == round(R))
+if (length(R)==1) && (R == round(R))
   m = R+2;
   R = linspace(0,1,m);
   R([1,m]) = [];
 end
-if (length(theta)==1) & (theta == round(theta))
+if (length(theta)==1) && (theta == round(theta))
   m = theta+1;
   theta = linspace(0,2*pi,m);
   theta(m) = [];
@@ -66,10 +65,10 @@
 ax = [findobj(fig,'tag','PhysicalAxes');...
       findobj(fig,'tag','CanonicalAxes')];
 if length(ax)==2
-  draw2 = logical(1);
+  draw2 = true;
   vis = get(ax,'vis');
 else
-  draw2 = logical(0);
+  draw2 = false;
   ax = gca;
   vis = {'on'};
 end
@@ -98,7 +97,7 @@
 for j = 1:length(R)
   % Start with evenly spaced theta
   tp = linspace(0,2*pi,20)';
-  new = logical(ones(length(tp),1));
+  new = true(length(tp),1);
   wp = NaN*new;
 
   % The individual points will be shown as they are found
@@ -111,9 +110,9 @@
 
   % Adaptively refine theta to make smooth curve
   iter = 0;
-  while (any(new)) & (iter < maxrefn)
+  while (any(new)) && (iter < maxrefn)
     drawnow
-    zp = R(j)*exp(i*tp(new));
+    zp = R(j)*exp(1i*tp(new));
     neww = dmap(zp,w,beta,z,c,qdat);
     wp(new) = neww;
     iter = iter + 1;
@@ -131,7 +130,7 @@
 
   % Set the lines to be solid
   set(linh(j,1),'erasemode','back')
-  set(linh(j,1),'marker','none','linestyle','-','user',R(j)*exp(i*tp))
+  set(linh(j,1),'marker','none','linestyle','-','user',R(j)*exp(1i*tp))
   if draw2
     % Replace the points with (hopefully) a smooth circle
     tp = linspace(0,2*pi,101);
@@ -147,8 +146,8 @@
 linh = gobjects(length(theta),2);
 for j = 1:length(theta)
   Rp = linspace(0,1,14)';
-  zp = Rp*exp(i*theta(j));
-  new = logical(ones(length(zp),1));
+  zp = Rp*exp(1i*theta(j));
+  new = true(length(zp),1);
   wp = NaN*new;
 
   % The individual points will be shown as they are found
@@ -161,7 +160,7 @@
 
   % Adaptively refine to make smooth curve
   iter = 0;
-  while (any(new)) & (iter < maxrefn)
+  while (any(new)) && (iter < maxrefn)
     drawnow
     neww = dmap(zp(new),w,beta,z,c,qdat);
     wp(new) = neww;

hpplot.m

@@ -50,7 +50,7 @@
 end
 
 % Integer arguments must be converted to specific values
-if (length(re)==1) & (re == round(re))
+if (length(re)==1) && (re == round(re))
   if re < 1
     re = [];
   elseif re < 2
@@ -62,7 +62,7 @@
     re = linspace(z(1)-dre,z(n-1)+dre,m);
   end
 end
-if (length(im)==1) & (im == round(im))
+if (length(im)==1) && (im == round(im))
   if length(re) < 2
     im = linspace(0,4,im+1);
     im(1) = [];
@@ -79,10 +79,10 @@
 ax = [findobj(fig,'tag','PhysicalAxes');...
       findobj(fig,'tag','CanonicalAxes')];
 if length(ax)==2
-  draw2 = logical(1);
+  draw2 = true;
   vis = get(ax,'vis');
 else
-  draw2 = logical(0);
+  draw2 = false;
   ax = gca;
   vis = {'on'};
 end
@@ -115,10 +115,10 @@
 linh = gobjects(length(re),2);
 for j = 1:length(re)
   % Start evenly spaced
-  zp = re(j) + i*[linspace(0,y2,15) Inf].';
-  new = logical(ones(size(zp)));
+  zp = re(j) + 1i*[linspace(0,y2,15) Inf].';
+  new = true(size(zp));
   new(end) = 0;
-  wp = repmat(NaN,length(zp),1);
+  wp = NaN(length(zp),1);
   wp(end) = w(n);
 
   % The individual points will be shown as they are found
@@ -131,7 +131,7 @@
 
   % Adaptive refinement to make smooth curve
   iter = 0;
-  while (any(new)) & (iter < maxrefn)
+  while (any(new)) && (iter < maxrefn)
     drawnow
     neww = hpmap(zp(new),w,beta,z,c,qdat);
     wp(new) = neww;
@@ -165,10 +165,10 @@
 linh = gobjects(length(im),2);
 for j = 1:length(im)
   % Start evenly spaced
-  zp = [-Inf linspace(z1,z2,15) Inf].' + i*im(j);
-  new = logical(ones(size(zp)));
+  zp = [-Inf linspace(z1,z2,15) Inf].' + 1i*im(j);
+  new = true(size(zp));
   new([1 end]) = 0;
-  wp = repmat(NaN,length(zp),1);
+  wp = NaN(length(zp),1);
   wp([1 end]) = w(n);
 
   % The individual points will be shown as they are found
@@ -181,7 +181,7 @@
 
   % Adaptive refinement to make smooth curve
   iter = 0;
-  while (any(new)) & (iter < maxrefn)
+  while (any(new)) && (iter < maxrefn)
     drawnow
     neww = hpmap(zp(new),w,beta,z,c,qdat);
     wp(new) = neww;

plotpoly.m

@@ -42,7 +42,7 @@
 R = max(lim(2)-lim(1),lim(4)-lim(3));
 
 % Renumber to start with two finite vertices
-first = min(find(~atinf & ~atinf([2:n,1])));
+first = find(~atinf & ~atinf([2:n,1]), 1 );
 if isempty(first), 
   error('There must be two consecutive finite vertices.')
 end
@@ -76,7 +76,7 @@
       theta = theta - pi/2;
     end
     % Make label; markers will be added last
-    pos = w(j) + .035*R*exp(i*theta);
+    pos = w(j) + .035*R*exp(1i*theta);
     %%lblh(j,1) = plot(real(w(j)),imag(w(j)),'.','markersize',12);
     lblh(j,2) = text(real(pos),imag(pos),int2str(renum(j)),...
 	'ver','mid','hor','cen');
@@ -91,29 +91,29 @@
   else
     % Unbounded edge (first of two consecutive)
     ang = ang-pi*beta(j);
-    z = [w(j);w(j)+R*exp(i*ang)];
+    z = [w(j);w(j)+R*exp(1i*ang)];
     edgeh(j) = plot(real(z),imag(z),'-','linewid',lw);
     % Make first label outside axes box
     if nargin == 3
       theta = ang;
       Rx = (lim(1:2) - real(w(j))) / (cos(theta)+eps*(cos(theta)==0));
       Ry = (lim(3:4) - imag(w(j))) / (sin(theta)+eps*(sin(theta)==0));
       RR = [Rx,Ry];
-      pos = w(j) + (min(RR(RR>0))+.07*R)*exp(i*theta);
+      pos = w(j) + (min(RR(RR>0))+.07*R)*exp(1i*theta);
       str = sprintf('%i (inf)',renum(j+1));
       lblh(j+1,1) = text(real(pos),imag(pos),str,'ver','mid','hor','cen');
     end
 
     % Second unbounded edge
     ang = ang-pi*beta(jp1);
-    z = [w(rem(j+1,n)+1)-R*exp(i*ang);w(rem(j+1,n)+1)];
+    z = [w(rem(j+1,n)+1)-R*exp(1i*ang);w(rem(j+1,n)+1)];
     edgeh(j+1) = plot(real(z),imag(z),'-','linewid',lw);
     if nargin == 3
       theta = ang + pi;
       Rx = (lim(1:2) - real(z(2))) / (cos(theta)+eps*(cos(theta)==0));
       Ry = (lim(3:4) - imag(z(2))) / (sin(theta)+eps*(sin(theta)==0));
       RR = [Rx,Ry];
-      pos = z(2) + (min(RR(RR>0))+.07*R)*exp(i*theta);
+      pos = z(2) + (min(RR(RR>0))+.07*R)*exp(1i*theta);
       str = sprintf('%i (inf)',renum(j+1));
       lblh(j+1,2) = text(real(pos),imag(pos),str,'ver','mid','hor','cen');
     end
@@ -129,7 +129,7 @@
   if any( abs([beta(n)-1 beta(1) beta(2)-1]) < 3*eps)
     theta = theta + pi -(beta(1)+1)*pi/2;
   end
-  pos = w(1) + .035*R*exp(i*theta);
+  pos = w(1) + .035*R*exp(1i*theta);
   %%lblh(1,1) = plot(real(w(1)),imag(w(1)),'.','markersize',12);
   lblh(1,2) = text(real(pos),imag(pos),int2str(renum(1)),...
       'ver','mid','hor','cen');