[Octave-cvsupdate] SF.net SVN: octave:[7503] trunk/octave-forge/main/control/inst

[<par...@us...>]

Revision: 7503
          http://octave.svn.sourceforge.net/octave/?rev=7503&view=rev
Author:   paramaniac
Date:     2010-08-10 16:11:46 +0000 (Tue, 10 Aug 2010)

Log Message:
-----------
control: fix some functions because issquare doesn't return the size any more

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/care.m
    trunk/octave-forge/main/control/inst/dare.m
    trunk/octave-forge/main/control/inst/dlyap.m
    trunk/octave-forge/main/control/inst/lyap.m

Modified: trunk/octave-forge/main/control/inst/care.m
===================================================================
--- trunk/octave-forge/main/control/inst/care.m	2010-08-06 08:53:34 UTC (rev 7502)
+++ trunk/octave-forge/main/control/inst/care.m	2010-08-10 16:11:46 UTC (rev 7503)
@@ -54,28 +54,25 @@
     print_usage ();
   endif
 
-  asize = issquare (a);
   [brows, bcols] = size (b);
-  qsize = issquare (q);
-  rsize = issquare (r);
 
-  if (! asize)
+  if (! issquare (a))
     error ("care: a is not square");
   endif
 
-  if (! qsize)
+  if (! issquare (q))
     error ("care: q is not square");
   endif
 
-  if (! rsize)
+  if (! issquare (r))
     error ("care: r is not square");
   endif
   
-  if (asize != brows)
+  if (rows (a) != brows)
     error ("care: a, b are not conformable");
   endif
   
-  if (rsize != bcols)
+  if (columns (r) != bcols)
     error ("care: b, r are not conformable");
   endif
 

Modified: trunk/octave-forge/main/control/inst/dare.m
===================================================================
--- trunk/octave-forge/main/control/inst/dare.m	2010-08-06 08:53:34 UTC (rev 7502)
+++ trunk/octave-forge/main/control/inst/dare.m	2010-08-10 16:11:46 UTC (rev 7503)
@@ -54,28 +54,25 @@
     print_usage ();
   endif
 
-  asize = issquare (a);
   [brows, bcols] = size (b);
-  qsize = issquare (q);
-  rsize = issquare (r);
 
-  if (! asize)
+  if (! issquare (a))
     error ("dare: a is not square");
   endif
 
-  if (! qsize)
+  if (! issquare (q))
     error ("dare: q is not square");
   endif
 
-  if (! rsize)
+  if (! issquare (r))
     error ("dare: r is not square");
   endif
   
-  if (asize != brows)
+  if (rows (a) != brows)
     error ("dare: a, b are not conformable");
   endif
   
-  if (rsize != bcols)
+  if (columns (r) != bcols)
     error ("dare: b, r are not conformable");
   endif
 

Modified: trunk/octave-forge/main/control/inst/dlyap.m
===================================================================
--- trunk/octave-forge/main/control/inst/dlyap.m	2010-08-06 08:53:34 UTC (rev 7502)
+++ trunk/octave-forge/main/control/inst/dlyap.m	2010-08-10 16:11:46 UTC (rev 7503)
@@ -42,14 +42,14 @@
   switch (nargin)
     case 2  # Lyapunov equation
 
-      na = issquare (a);
-      nb = issquare (b);
+      na = rows (a);
+      nb = rows (b);
   
-      if (! na)
+      if (! issquare (a))
         error ("lyap: a must be square");
       endif
 
-      if (! nb)
+      if (! issquare (b))
         error ("lyap: b must be square")
       endif
   
@@ -67,15 +67,15 @@
   
     case 3  # Sylvester equation
   
-      n = issquare (a);
-      m = issquare (b);
+      n = rows (a);
+      m = rows (b);
       [crows, ccols] = size (c);
 
-      if (! n)
+      if (! issquare (a))
         error ("dlyap: a must be square");
       endif
 
-      if (! m)
+      if (! issquare (b))
         error ("dlyap: b must be square");
       endif
 
@@ -91,19 +91,19 @@
         print_usage ();
       endif
       
-      na = issquare (a);
-      nb = issquare (b);
-      ne = issquare (e);
+      na = rows (a);
+      nb = rows (b);
+      ne = rows (e);
       
-      if (! na)
+      if (! issquare (a))
         error ("lyap: a must be square");
       endif
       
-      if (! nb)
+      if (! issquare (b))
         error ("lyap: b must be square");
       endif
       
-      if (! ne)
+      if (! issquare (e))
         error ("lyap: e must be square");
       endif
       

Modified: trunk/octave-forge/main/control/inst/lyap.m
===================================================================
--- trunk/octave-forge/main/control/inst/lyap.m	2010-08-06 08:53:34 UTC (rev 7502)
+++ trunk/octave-forge/main/control/inst/lyap.m	2010-08-10 16:11:46 UTC (rev 7503)
@@ -42,14 +42,14 @@
   switch (nargin)
     case 2  # Lyapunov equation
 
-      na = issquare (a);
-      nb = issquare (b);
+      na = rows (a);
+      nb = rows (b);
   
-      if (! na)
+      if (! issquare (a))
         error ("lyap: a must be square");
       endif
 
-      if (! nb)
+      if (! issquare (b))
         error ("lyap: b must be square")
       endif
   
@@ -67,15 +67,15 @@
     
     case 3  # Sylvester equation
   
-      n = issquare (a);
-      m = issquare (b);
+      n = rows (a);
+      m = rows (b);
       [crows, ccols] = size (c);
     
-      if (! n)
+      if (! issquare (a))
         error ("lyap: a must be square");
       endif
 
-      if (! m)
+      if (! issquare (b))
         error ("lyap: b must be square");
       endif
 
@@ -91,19 +91,19 @@
         print_usage ();
       endif
       
-      na = issquare (a);
-      nb = issquare (b);
-      ne = issquare (e);
+      na = rows (a);
+      nb = rows (b);
+      ne = rows (e);
       
-      if (! na)
+      if (! issquare (a))
         error ("lyap: a must be square");
       endif
       
-      if (! nb)
+      if (! issquare (b))
         error ("lyap: b must be square");
       endif
       
-      if (! ne)
+      if (! issquare (e))
         error ("lyap: e must be square");
       endif
       


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.