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

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

Revision: 8086
          http://octave.svn.sourceforge.net/octave/?rev=8086&view=rev
Author:   paramaniac
Date:     2011-02-04 17:11:52 +0000 (Fri, 04 Feb 2011)

Log Message:
-----------
control: fix typos, support nargin==3 for mconnect

Modified Paths:
--------------
    trunk/octave-forge/main/control/devel/@frd/frd.m
    trunk/octave-forge/main/control/inst/@lti/mconnect.m
    trunk/octave-forge/main/control/inst/@ss/ss.m
    trunk/octave-forge/main/control/inst/@tf/tf.m

Modified: trunk/octave-forge/main/control/devel/@frd/frd.m
===================================================================
--- trunk/octave-forge/main/control/devel/@frd/frd.m	2011-02-04 15:23:30 UTC (rev 8085)
+++ trunk/octave-forge/main/control/devel/@frd/frd.m	2011-02-04 17:11:52 UTC (rev 8086)
@@ -98,13 +98,13 @@
 
     otherwise                           # default case
       argc = numel (varargin);          # number of additional arguments after H and w
-      if (issample (varargin{1}, -10))  # sys = frd (H, w, tsam, "prop1, "val1", ...)
+      if (issample (varargin{1}, -10))  # sys = frd (H, w, tsam, "prop1", val1, ...)
         tsam = varargin{1};             # discrete-time
         argc--;                         # tsam is not a property-value pair
         if (argc > 0)                   # if there are any properties and values ...
           varargin = varargin(2:end);   # remove tsam from property-value list
         endif
-      else                              # sys = frd (H, w, "prop1, "val1", ...)
+      else                              # sys = frd (H, w, "prop1", val1, ...)
         tsam = 0;                       # continuous-time
       endif
   endswitch

Modified: trunk/octave-forge/main/control/inst/@lti/mconnect.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/mconnect.m	2011-02-04 15:23:30 UTC (rev 8085)
+++ trunk/octave-forge/main/control/inst/@lti/mconnect.m	2011-02-04 17:11:52 UTC (rev 8086)
@@ -1,4 +1,4 @@
-## Copyright (C) 2009   Lukas F. Reichlin
+## Copyright (C) 2009, 2010, 2011   Lukas F. Reichlin
 ##
 ## This file is part of LTI Syncope.
 ##
@@ -61,11 +61,11 @@
 
 ## Author: Lukas Reichlin <luk...@gm...>
 ## Created: October 2009
-## Version: 0.1
+## Version: 0.2
 
-function sys = mconnect (sys, M, in_idx, out_idx)
+function sys = mconnect (sys, M, in_idx, out_idx = ":")
 
-  if (nargin != 2 && nargin != 4)
+  if (nargin < 2 || nargin > 4)
     print_usage ();
   endif
 
@@ -82,7 +82,7 @@
 
   sys = __sys_connect__ (sys, M);
 
-  if (nargin == 4)
+  if (nargin > 2)
     sys = __sys_prune__ (sys, out_idx, in_idx);
   endif
 

Modified: trunk/octave-forge/main/control/inst/@ss/ss.m
===================================================================
--- trunk/octave-forge/main/control/inst/@ss/ss.m	2011-02-04 15:23:30 UTC (rev 8085)
+++ trunk/octave-forge/main/control/inst/@ss/ss.m	2011-02-04 17:11:52 UTC (rev 8086)
@@ -116,7 +116,7 @@
     else
       print_usage ();
     endif
-  elseif (nargin > 4)                 # default case  sys = ss (a, b, c, d, "prop1, "val1", ...)
+  elseif (nargin > 4)                 # default case  sys = ss (a, b, c, d, "prop1", val1, ...)
     argc = numel (varargin);          # number of additional arguments after d
     if (issample (varargin{1}, -10))  # sys = ss (a, b, c, d, tsam, "prop1, "val1", ...)
       tsam = varargin{1};

Modified: trunk/octave-forge/main/control/inst/@tf/tf.m
===================================================================
--- trunk/octave-forge/main/control/inst/@tf/tf.m	2011-02-04 15:23:30 UTC (rev 8085)
+++ trunk/octave-forge/main/control/inst/@tf/tf.m	2011-02-04 17:11:52 UTC (rev 8086)
@@ -131,7 +131,7 @@
       den = __vec2tfpoly__ (den);
       argc = numel (varargin);
 
-      if (issample (varargin{1}, -10))         # sys = tf (num, den, tsam, "prop1, "val1", ...)
+      if (issample (varargin{1}, -10))         # sys = tf (num, den, tsam, "prop1", val1, ...)
         tsam = varargin{1};
         argc--;
         
@@ -144,7 +144,7 @@
         if (argc > 0)
           varargin = varargin(2:end);
         endif
-      else                                     # sys = tf (num, den, "prop1, "val1", ...)
+      else                                     # sys = tf (num, den, "prop1", val1, ...)
         tsam = 0;
         tfvar = "s";
       endif


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