[Octave-cvsupdate] SF.net SVN: octave:[11024] trunk/octave-forge/main/optim

[<i7...@us...>]

Revision: 11024
          http://octave.svn.sourceforge.net/octave/?rev=11024&view=rev
Author:   i7tiol
Date:     2012-09-14 21:33:53 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
Fixed wrong test for existence of 'options' in leasqr. New release.

Modified Paths:
--------------
    trunk/octave-forge/main/optim/DESCRIPTION
    trunk/octave-forge/main/optim/NEWS
    trunk/octave-forge/main/optim/inst/leasqr.m

Modified: trunk/octave-forge/main/optim/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/optim/DESCRIPTION	2012-09-14 19:36:44 UTC (rev 11023)
+++ trunk/octave-forge/main/optim/DESCRIPTION	2012-09-14 21:33:53 UTC (rev 11024)
@@ -1,6 +1,6 @@
 Name: Optim
-Version: 1.2.0
-Date: 2012-06-12
+Version: 1.2.1
+Date: 2012-09-14
 Author: various authors
 Maintainer: Octave-Forge community <oct...@li...>
 Title: Optimization.

Modified: trunk/octave-forge/main/optim/NEWS
===================================================================
--- trunk/octave-forge/main/optim/NEWS	2012-09-14 19:36:44 UTC (rev 11023)
+++ trunk/octave-forge/main/optim/NEWS	2012-09-14 21:33:53 UTC (rev 11024)
@@ -1,3 +1,9 @@
+optim 1.2.1:
+------------
+
+ ** Bugfix in leasqr.m: errors when a function 'options' is in
+    namespace.
+
 Summary of important user-visible changes for optim 1.2.0:
 -------------------------------------------------------------------
 

Modified: trunk/octave-forge/main/optim/inst/leasqr.m
===================================================================
--- trunk/octave-forge/main/optim/inst/leasqr.m	2012-09-14 19:36:44 UTC (rev 11023)
+++ trunk/octave-forge/main/optim/inst/leasqr.m	2012-09-14 21:33:53 UTC (rev 11024)
@@ -570,7 +570,7 @@
   %% only preliminary, for testing
   hook.testing = false;
   hook.new_s = false;
-  if (exist ('options'))
+  if (nargin > 9)
     if (isfield (options, 'testing'))
       hook.testing = options.testing;
     end

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