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

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

Revision: 8139
          http://octave.svn.sourceforge.net/octave/?rev=8139&view=rev
Author:   i7tiol
Date:     2011-02-25 10:07:07 +0000 (Fri, 25 Feb 2011)

Log Message:
-----------
Fix new bounds handling. Fix demo 2.

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

Modified: trunk/octave-forge/main/optim/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/optim/DESCRIPTION	2011-02-25 08:58:49 UTC (rev 8138)
+++ trunk/octave-forge/main/optim/DESCRIPTION	2011-02-25 10:07:07 UTC (rev 8139)
@@ -1,6 +1,6 @@
 Name: Optim
 Version: 1.0.16
-Date: 2011-01-01
+Date: 2011-02-25
 Author: Various Authors
 Maintainer: The Octave Community
 Title: Optimzation.

Modified: trunk/octave-forge/main/optim/inst/leasqr.m
===================================================================
--- trunk/octave-forge/main/optim/inst/leasqr.m	2011-02-25 08:58:49 UTC (rev 8138)
+++ trunk/octave-forge/main/optim/inst/leasqr.m	2011-02-25 10:07:07 UTC (rev 8139)
@@ -538,8 +538,9 @@
   hook.eq_idx = false (size (vc, 1) + n_gencstr, 1);
   hook.eq_idx(eq_idx) = true; % logical index of equality constraints in
 				% all constraints
-  hook.bounds = bounds; % bounds, subset of linear inequality
+  hook.lbound = bounds(:, 1); % bounds, subset of linear inequality
 				% constraints in mc and vc
+  hook.ubound = bounds(:, 2);
 
   %% passed values of constraints for initial parameters
   hook.pin_cstr = pin_cstr;
@@ -783,7 +784,7 @@
 %!  %% other configuration (default values):
 %!  tolerance = .0001;
 %!  max_iterations = 20;
-%!  weights = ones (5, 1);
+%!  weights = ones (1, 5);
 %!  dp = [.001; .001]; % bidirectional numeric gradient stepsize
 %!  dFdp = 'dfdp'; % function for gradient (numerical)
 %!


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