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

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

Revision: 10779
          http://octave.svn.sourceforge.net/octave/?rev=10779&view=rev
Author:   paramaniac
Date:     2012-07-28 07:34:47 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
control: Fixed an argument check in feedback.m which caused false positive error messages. It was a copy-paste mistake affecting non-square systems. (Thanks to Tony Olivo)

Modified Paths:
--------------
    trunk/octave-forge/main/control/NEWS
    trunk/octave-forge/main/control/inst/@lti/feedback.m

Modified: trunk/octave-forge/main/control/NEWS
===================================================================
--- trunk/octave-forge/main/control/NEWS	2012-07-28 00:40:20 UTC (rev 10778)
+++ trunk/octave-forge/main/control/NEWS	2012-07-28 07:34:47 UTC (rev 10779)
@@ -1,6 +1,16 @@
 Summary of important user-visible changes for releases of the control package
 
 ===============================================================================
+control-2.3.53   Release Date: 2012-xx-yy   Release Manager: Lukas Reichlin
+===============================================================================
+
+** feedback
+   Fixed an argument check which caused false positive error messages.
+   It was a copy-paste mistake affecting non-square systems.
+   (Thanks to Tony Olivo)
+
+
+===============================================================================
 control-2.3.52   Release Date: 2012-06-25   Release Manager: Lukas Reichlin
 ===============================================================================
 

Modified: trunk/octave-forge/main/control/inst/@lti/feedback.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/feedback.m	2012-07-28 00:40:20 UTC (rev 10778)
+++ trunk/octave-forge/main/control/inst/@lti/feedback.m	2012-07-28 07:34:47 UTC (rev 10779)
@@ -1,4 +1,4 @@
-## Copyright (C) 2009, 2010, 2011   Lukas F. Reichlin
+## Copyright (C) 2009, 2010, 2011, 2012   Lukas F. Reichlin
 ##
 ## This file is part of LTI Syncope.
 ##
@@ -67,7 +67,7 @@
 
 ## Author: Lukas Reichlin <luk...@gm...>
 ## Created: October 2009
-## Version: 0.5
+## Version: 0.6
 
 function sys = feedback (sys1, sys2, feedin, feedout, fbsign = -1)
 
@@ -127,7 +127,7 @@
     error ("feedback: range of feedin indices exceeds dimensions of sys1");
   endif
 
-  if (any (feedin > p1 | feedin < 1))
+  if (any (feedout > p1 | feedout < 1))
     error ("feedback: range of feedout indices exceeds dimensions of sys1");
   endif
 

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