# HG changeset patch
# User jwe
# Date 1194553592 0
# Node ID 38fe664f0ef18d348e80b729926a1e24fe5c5dc7
# Parent  59dcf01bb3e38c2fcc51fd64a724368ca4027916
[project @ 2007-11-08 20:26:32 by jwe]

diff -r 59dcf01bb3e3 -r 38fe664f0ef1 scripts/control/base/bode_bounds.m
--- a/scripts/control/base/bode_bounds.m	Thu Nov 08 20:18:26 2007 +0000
+++ b/scripts/control/base/bode_bounds.m	Thu Nov 08 20:26:32 2007 +0000
@@ -68,8 +68,8 @@
     endif
   else
     ## continuous
-    iip = find (abs(pol) > norm(pol)*eps));
-    iiz = find (abs(zer) > norm(zer)*eps));
+    iip = find (abs(pol) > norm(pol)*eps);
+    iiz = find (abs(zer) > norm(zer)*eps);
 
     if (! isempty (zer))
       czer = zer(iiz);
diff -r 59dcf01bb3e3 -r 38fe664f0ef1 scripts/control/base/lsim.m
--- a/scripts/control/base/lsim.m	Thu Nov 08 20:18:26 2007 +0000
+++ b/scripts/control/base/lsim.m	Thu Nov 08 20:26:32 2007 +0000
@@ -66,7 +66,7 @@
   if (columns (x0) > 1)
     error ("lsim: Initial condition vector should have only one column");
   endif
-  if (rows (x0) > rows p(a))
+  if (rows (x0) > rows (a))
     error ("lsim: Initial condition vector is too large");
   endif
 
diff -r 59dcf01bb3e3 -r 38fe664f0ef1 scripts/control/hinf/hinf_ctr.m
--- a/scripts/control/hinf/hinf_ctr.m	Thu Nov 08 20:18:26 2007 +0000
+++ b/scripts/control/hinf/hinf_ctr.m	Thu Nov 08 20:26:32 2007 +0000
@@ -102,7 +102,7 @@
   md1112 = length (D1112);
   md1121 = length (D1121);
 
-  if (nd1111 == 0) || md1112 == 0)
+  if (nd1111 == 0 || md1112 == 0)
     d11hat = -D1122;
   else
     xx = inv (g*g*eye(nz-nu) - D1111*D1111');
diff -r 59dcf01bb3e3 -r 38fe664f0ef1 scripts/control/hinf/hinfnorm.m
--- a/scripts/control/hinf/hinfnorm.m	Thu Nov 08 20:18:26 2007 +0000
+++ b/scripts/control/hinf/hinfnorm.m	Thu Nov 08 20:26:32 2007 +0000
@@ -154,7 +154,7 @@
 
   ## check for scalar input arguments 2...5
   if (! isscalar (tol) && isscalar (gmin)
-      && isscalar (gmax) && isscalar (ptol)) )
+      && isscalar (gmax) && isscalar (ptol))
     error ("hinfnorm: tol, gmin, gmax, ptol must be scalars");
   endif
 
diff -r 59dcf01bb3e3 -r 38fe664f0ef1 scripts/control/obsolete/packsys.m
--- a/scripts/control/obsolete/packsys.m	Thu Nov 08 20:18:26 2007 +0000
+++ b/scripts/control/obsolete/packsys.m	Thu Nov 08 20:26:32 2007 +0000
@@ -45,7 +45,7 @@
   if (nargin == 5)
     if (! isscalar (dflg))
       [m, n] = size(dflg);
-      error (["packsys: dflg (%d,%d) must be a scalar", m, n);
+      error ("packsys: dflg (%d,%d) must be a scalar", m, n);
     elseif (dflg != 0 && dflg != 1)
       error ("packsys: dflg=%g must be 0 or 1", dflg);
     endif
diff -r 59dcf01bb3e3 -r 38fe664f0ef1 scripts/control/system/ss.m
--- a/scripts/control/system/ss.m	Thu Nov 08 20:18:26 2007 +0000
+++ b/scripts/control/system/ss.m	Thu Nov 08 20:26:32 2007 +0000
@@ -214,8 +214,9 @@
   endif
 
   ## check for tsam input
-  if (nargin < 5) tsam = 0;
-  elseif (! (is_sample (tsam) || tsam == 0)))
+  if (nargin < 5)
+    tsam = 0;
+  elseif (! (is_sample (tsam) || tsam == 0))
     error ("tsam must be a nonnegative real scalar");
   endif
 
diff -r 59dcf01bb3e3 -r 38fe664f0ef1 scripts/control/system/sysappend.m
--- a/scripts/control/system/sysappend.m	Thu Nov 08 20:18:26 2007 +0000
+++ b/scripts/control/system/sysappend.m	Thu Nov 08 20:26:32 2007 +0000
@@ -108,7 +108,7 @@
   endif
 
   if (make_d)
-    d = zeros (rows(c)+Ap, columns(b) + Am);
+    d = zeros (rows(c)+Ap, columns(b)+Am);
   endif
 
   ## Append new input(s) if any
@@ -171,7 +171,7 @@
 	error ("yd(%dx%d) must be a vector", rows (yd), columns (yd));
       elseif (rows (c) != length (yd) && rows (d) != length (yd))
 	error ("length(yd) = %d; c(%dx%d), d(%dx%d); mismatch",
-	       length (yd), rows (c), columns (c), rows (d), columns (d)));
+	       length (yd), rows (c), columns (c), rows (d), columns (d));
       endif
     else
       ## default yd values
diff -r 59dcf01bb3e3 -r 38fe664f0ef1 scripts/control/system/sysconnect.m
--- a/scripts/control/system/sysconnect.m	Thu Nov 08 20:18:26 2007 +0000
+++ b/scripts/control/system/sysconnect.m	Thu Nov 08 20:26:32 2007 +0000
@@ -202,7 +202,7 @@
   ## nc
   ## disp("/sysconnect");
 
-  if ((nc > 0 & find (dyi > 0))
+  if ((nc > 0) & find (dyi > 0))
     B2con = B2(1:nc,dyi);       # connection to cont states
     C2hd = C2h(dyi,1:nc);       # cont states -> outputs
   else
diff -r 59dcf01bb3e3 -r 38fe664f0ef1 scripts/control/system/sysprune.m
--- a/scripts/control/system/sysprune.m	Thu Nov 08 20:18:26 2007 +0000
+++ b/scripts/control/system/sysprune.m	Thu Nov 08 20:26:32 2007 +0000
@@ -129,7 +129,7 @@
   if (! isstruct (sys))
     error ("Asys must be a system data structure (see ss, tf, or zp)");
   elseif (pp < lo)
-    error("%d output_idx entries, system has only %d outputs", lo, pp]);
+    error("%d output_idx entries, system has only %d outputs", lo, pp);
   elseif (mm < li)
     error("%d input_idx entries, system has only %d inputs", li, mm);
   elseif (nn+nz < lst)
diff -r 59dcf01bb3e3 -r 38fe664f0ef1 scripts/control/system/tf2ss.m
--- a/scripts/control/system/tf2ss.m	Thu Nov 08 20:18:26 2007 +0000
+++ b/scripts/control/system/tf2ss.m	Thu Nov 08 20:26:32 2007 +0000
@@ -93,7 +93,7 @@
   nn = length (num);
   nd = length (den);
   if (nn > nd)
-    error ("deg(num)=%d > deg(den)= %d", nn, nd));
+    error ("deg(num)=%d > deg(den)= %d", nn, nd);
   endif
 
    ## Check sizes