Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[10116] trunk/octave-forge/main/optim
|
From: <car...@us...> - 2012-03-30 15:15:02
|
Revision: 10116
http://octave.svn.sourceforge.net/octave/?rev=10116&view=rev
Author: carandraug
Date: 2012-03-30 15:14:48 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
optim: upgrade license to GPLv3+ and mention on DESCRIPTION the other package licenses
Modified Paths:
--------------
trunk/octave-forge/main/optim/COPYING
trunk/octave-forge/main/optim/DESCRIPTION
trunk/octave-forge/main/optim/inst/LinearRegression.m
trunk/octave-forge/main/optim/inst/__bracket_min.m
trunk/octave-forge/main/optim/inst/__poly_2_extrema.m
trunk/octave-forge/main/optim/inst/__semi_bracket.m
trunk/octave-forge/main/optim/inst/adsmax.m
trunk/octave-forge/main/optim/inst/battery.m
trunk/octave-forge/main/optim/inst/bfgsmin.m
trunk/octave-forge/main/optim/inst/bfgsmin_example.m
trunk/octave-forge/main/optim/inst/brent_line_min.m
trunk/octave-forge/main/optim/inst/cdiff.m
trunk/octave-forge/main/optim/inst/cg_min.m
trunk/octave-forge/main/optim/inst/cpiv_bard.m
trunk/octave-forge/main/optim/inst/curvefit_stat.m
trunk/octave-forge/main/optim/inst/d2_min.m
trunk/octave-forge/main/optim/inst/dcdp.m
trunk/octave-forge/main/optim/inst/de_min.m
trunk/octave-forge/main/optim/inst/deriv.m
trunk/octave-forge/main/optim/inst/dfdp.m
trunk/octave-forge/main/optim/inst/dfpdp.m
trunk/octave-forge/main/optim/inst/dfxpdp.m
trunk/octave-forge/main/optim/inst/expfit.m
trunk/octave-forge/main/optim/inst/fmin.m
trunk/octave-forge/main/optim/inst/fmins.m
trunk/octave-forge/main/optim/inst/fminsearch.m
trunk/octave-forge/main/optim/inst/fminunc_compat.m
trunk/octave-forge/main/optim/inst/gjp.m
trunk/octave-forge/main/optim/inst/jacobs.m
trunk/octave-forge/main/optim/inst/leasqr.m
trunk/octave-forge/main/optim/inst/line_min.m
trunk/octave-forge/main/optim/inst/linprog.m
trunk/octave-forge/main/optim/inst/mdsmax.m
trunk/octave-forge/main/optim/inst/minimize.m
trunk/octave-forge/main/optim/inst/nelder_mead_min.m
trunk/octave-forge/main/optim/inst/nmsmax.m
trunk/octave-forge/main/optim/inst/nonlin_curvefit.m
trunk/octave-forge/main/optim/inst/nonlin_residmin.m
trunk/octave-forge/main/optim/inst/nrm.m
trunk/octave-forge/main/optim/inst/optim_problems.m
trunk/octave-forge/main/optim/inst/optimset_compat.m
trunk/octave-forge/main/optim/inst/polyconf.m
trunk/octave-forge/main/optim/inst/polyfitinf.m
trunk/octave-forge/main/optim/inst/powell.m
trunk/octave-forge/main/optim/inst/private/__dfdp__.m
trunk/octave-forge/main/optim/inst/private/__lm_svd__.m
trunk/octave-forge/main/optim/inst/residmin_stat.m
trunk/octave-forge/main/optim/inst/rosenbrock.m
trunk/octave-forge/main/optim/inst/samin_example.m
trunk/octave-forge/main/optim/inst/test_d2_min_1.m
trunk/octave-forge/main/optim/inst/test_d2_min_2.m
trunk/octave-forge/main/optim/inst/test_d2_min_3.m
trunk/octave-forge/main/optim/inst/test_fminunc_1.m
trunk/octave-forge/main/optim/inst/test_min_1.m
trunk/octave-forge/main/optim/inst/test_min_2.m
trunk/octave-forge/main/optim/inst/test_min_3.m
trunk/octave-forge/main/optim/inst/test_min_4.m
trunk/octave-forge/main/optim/inst/test_minimize_1.m
trunk/octave-forge/main/optim/inst/test_nelder_mead_min_1.m
trunk/octave-forge/main/optim/inst/test_nelder_mead_min_2.m
trunk/octave-forge/main/optim/inst/test_wpolyfit.m
trunk/octave-forge/main/optim/inst/vfzero.m
trunk/octave-forge/main/optim/inst/wpolyfit.m
trunk/octave-forge/main/optim/inst/wrap_f_dfdp.m
trunk/octave-forge/main/optim/inst/wsolve.m
trunk/octave-forge/main/optim/src/__bfgsmin.cc
trunk/octave-forge/main/optim/src/__disna_optim__.cc
trunk/octave-forge/main/optim/src/numgradient.cc
trunk/octave-forge/main/optim/src/numhessian.cc
trunk/octave-forge/main/optim/src/samin.cc
Modified: trunk/octave-forge/main/optim/COPYING
===================================================================
--- trunk/octave-forge/main/optim/COPYING 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/COPYING 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,337 +1 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+See individual files for licenses
Modified: trunk/octave-forge/main/optim/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/optim/DESCRIPTION 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/DESCRIPTION 2012-03-30 15:14:48 UTC (rev 10116)
@@ -7,5 +7,5 @@
Description: Non-linear optimization toolkit.
Depends: octave (>= 2.9.7), miscellaneous (>= 1.0.10), struct (>= 1.0.9)
Autoload: no
-License: GPL version 2 or later and GFDL
+License: GFDL, GPLv3+, modified BSD, public domain
Url: http://octave.sf.net
Modified: trunk/octave-forge/main/optim/inst/LinearRegression.m
===================================================================
--- trunk/octave-forge/main/optim/inst/LinearRegression.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/LinearRegression.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,42 +1,41 @@
-function [p,y_var,r,p_var]=LinearRegression(F,y,weight)
+## Copyright (C) 2007 Andreas Stahel <And...@bf...>
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
-% general linear regression
-%
-% [p,y_var,r,p_var]=LinearRegression(F,y)
-% [p,y_var,r,p_var]=LinearRegression(F,y,weight)
-%
-% determine the parameters p_j (j=1,2,...,m) such that the function
-% f(x) = sum_(i=1,...,m) p_j*f_j(x) fits as good as possible to the
-% given values y_i = f(x_i)
-%
-% parameters
-% F n*m matrix with the values of the basis functions at the support points
-% in column j give the values of f_j at the points x_i (i=1,2,...,n)
-% y n column vector of given values
-% weight n column vector of given weights
-%
-% return values
-% p m vector with the estimated values of the parameters
-% y_var estimated variance of the error
-% r weighted norm of residual
-% p_var estimated variance of the parameters p_j
-
-
-## Copyright (C) 2007 Andreas Stahel <And...@bf...>
+## general linear regression
##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
+## [p,y_var,r,p_var]=LinearRegression(F,y)
+## [p,y_var,r,p_var]=LinearRegression(F,y,weight)
##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
+## determine the parameters p_j (j=1,2,...,m) such that the function
+## f(x) = sum_(i=1,...,m) p_j*f_j(x) fits as good as possible to the
+## given values y_i = f(x_i)
##
-## You should have received a copy of the GNU General Public License
-## along with this program; If not, see <http://www.gnu.org/licenses/>.
+## parameters
+## F n*m matrix with the values of the basis functions at the support points
+## in column j give the values of f_j at the points x_i (i=1,2,...,n)
+## y n column vector of given values
+## weight n column vector of given weights
+##
+## return values
+## p m vector with the estimated values of the parameters
+## y_var estimated variance of the error
+## r weighted norm of residual
+## p_var estimated variance of the parameters p_j
+function [p,y_var,r,p_var]=LinearRegression(F,y,weight)
+
if (nargin < 2 || nargin >= 4)
usage('wrong number of arguments in [p,y_var,r,p_var]=LinearRegression(F,y)');
end
Modified: trunk/octave-forge/main/optim/inst/__bracket_min.m
===================================================================
--- trunk/octave-forge/main/optim/inst/__bracket_min.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/__bracket_min.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,3 +1,19 @@
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
+## Copyright (C) 2009 Levente Torok <Tor...@gm...>
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
+
## [a, b, ga, gb, nev] = semi_bracket (f, dx, a, narg, args)
##
## Find an interval containing a local minimum of the function
@@ -6,10 +22,6 @@
## a < b.
## nev is the number of function evaluations
-## Author : Etienne Grossmann <et...@is...>
-## Modified by: Levente Torok <Tor...@gm...>
-## This software is distributed under the terms of the GPL
-
function [a, b, ga, gb, n] = __bracket_min (f, dx, narg, args)
[a,b, ga,gb, n] = __semi_bracket (f, dx, 0, narg, args);
Modified: trunk/octave-forge/main/optim/inst/__poly_2_extrema.m
===================================================================
--- trunk/octave-forge/main/optim/inst/__poly_2_extrema.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/__poly_2_extrema.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,3 +1,19 @@
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
+## Copyright (C) 2009 Levente Torok <Tor...@gm...>
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
+
## ex = poly_2_ex (l, f) - Extremum of a 1-var deg-2 polynomial
##
## l : 3 : variable values
@@ -7,10 +23,9 @@
##
## Assuming that f(i) = a*l(i)^2 + b* l(i) + c = P(l(i)) for some a, b, c,
## ex is the extremum of the polynome P.
-##
+
function ex = __poly_2_extrema (l, f)
-
### This somewhat helps if solution is very close to one of the points.
[f,i] = sort (f);
l = l(i);
@@ -36,4 +51,4 @@
# ex - ex0
# end
ex = l(1) + ex;
-end
\ No newline at end of file
+end
Modified: trunk/octave-forge/main/optim/inst/__semi_bracket.m
===================================================================
--- trunk/octave-forge/main/optim/inst/__semi_bracket.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/__semi_bracket.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,3 +1,19 @@
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
+## Copyright (C) 2009 Levente Torok <Tor...@gm...>
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
+
## [a, b, ga, gb, nev] = semi_bracket (f, dx, a, narg, args)
##
## Find an interval containing a local minimum of the function
@@ -7,10 +23,6 @@
## a < b.
## nev is the number of function evaluations.
-## Author : Etienne Grossmann <et...@is...>
-## Modified by: Levente Torok <Tor...@gm...>
-## This software is distributed under the terms of the GPL
-
function [a,b,ga,gb,n] = __semi_bracket (f, dx, a, narg, args)
step = 1;
Modified: trunk/octave-forge/main/optim/inst/adsmax.m
===================================================================
--- trunk/octave-forge/main/optim/inst/adsmax.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/adsmax.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,44 +1,57 @@
-function [x, fmax, nf] = adsmax(f, x, stopit, savit, P, varargin)
-%ADSMAX Alternating directions method for direct search optimization.
-% [x, fmax, nf] = ADSMAX(FUN, x0, STOPIT, SAVIT, P) attempts to
-% maximize the function FUN, using the starting vector x0.
-% The alternating directions direct search method is used.
-% Output arguments:
-% x = vector yielding largest function value found,
-% fmax = function value at x,
-% nf = number of function evaluations.
-% The iteration is terminated when either
-% - the relative increase in function value between successive
-% iterations is <= STOPIT(1) (default 1e-3),
-% - STOPIT(2) function evaluations have been performed
-% (default inf, i.e., no limit), or
-% - a function value equals or exceeds STOPIT(3)
-% (default inf, i.e., no test on function values).
-% Progress of the iteration is not shown if STOPIT(5) = 0 (default 1).
-% If a non-empty fourth parameter string SAVIT is present, then
-% `SAVE SAVIT x fmax nf' is executed after each inner iteration.
-% By default, the search directions are the co-ordinate directions.
-% The columns of a fifth parameter matrix P specify alternative search
-% directions (P = EYE is the default).
-% NB: x0 can be a matrix. In the output argument, in SAVIT saves,
-% and in function calls, x has the same shape as x0.
-% ADSMAX(fun, x0, STOPIT, SAVIT, P, P1, P2,...) allows additional
-% arguments to be passed to fun, via feval(fun,x,P1,P2,...).
+%% Copyright (C) 2002 N.J.Higham
+%% Copyright (C) 2003 Andy Adler <ad...@nc...>
+%%
+%% This program is free software; you can redistribute it and/or modify it under
+%% the terms of the GNU General Public License as published by the Free Software
+%% Foundation; either version 3 of the License, or (at your option) any later
+%% version.
+%%
+%% This program is distributed in the hope that it will be useful, but WITHOUT
+%% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+%% FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+%% details.
+%%
+%% You should have received a copy of the GNU General Public License along with
+%% this program; if not, see <http://www.gnu.org/licenses/>.
+%%ADSMAX Alternating directions method for direct search optimization.
+%% [x, fmax, nf] = ADSMAX(FUN, x0, STOPIT, SAVIT, P) attempts to
+%% maximize the function FUN, using the starting vector x0.
+%% The alternating directions direct search method is used.
+%% Output arguments:
+%% x = vector yielding largest function value found,
+%% fmax = function value at x,
+%% nf = number of function evaluations.
+%% The iteration is terminated when either
+%% - the relative increase in function value between successive
+%% iterations is <= STOPIT(1) (default 1e-3),
+%% - STOPIT(2) function evaluations have been performed
+%% (default inf, i.e., no limit), or
+%% - a function value equals or exceeds STOPIT(3)
+%% (default inf, i.e., no test on function values).
+%% Progress of the iteration is not shown if STOPIT(5) = 0 (default 1).
+%% If a non-empty fourth parameter string SAVIT is present, then
+%% `SAVE SAVIT x fmax nf' is executed after each inner iteration.
+%% By default, the search directions are the co-ordinate directions.
+%% The columns of a fifth parameter matrix P specify alternative search
+%% directions (P = EYE is the default).
+%% NB: x0 can be a matrix. In the output argument, in SAVIT saves,
+%% and in function calls, x has the same shape as x0.
+%% ADSMAX(fun, x0, STOPIT, SAVIT, P, P1, P2,...) allows additional
+%% arguments to be passed to fun, via feval(fun,x,P1,P2,...).
+%% Reference:
+%% N. J. Higham, Optimization by direct search in matrix computations,
+%% SIAM J. Matrix Anal. Appl, 14(2): 317-333, 1993.
+%% N. J. Higham, Accuracy and Stability of Numerical Algorithms,
+%% Second edition, Society for Industrial and Applied Mathematics,
+%% Philadelphia, PA, 2002; sec. 20.5.
+
% From Matrix Toolbox
% Copyright (C) 2002 N.J.Higham
% www.maths.man.ac.uk/~higham/mctoolbox
-% distributed under the terms of the GNU General Public License
-%
% Modifications for octave by A.Adler 2003
-% $Id$
-% Reference:
-% N. J. Higham, Optimization by direct search in matrix computations,
-% SIAM J. Matrix Anal. Appl, 14(2): 317-333, 1993.
-% N. J. Higham, Accuracy and Stability of Numerical Algorithms,
-% Second edition, Society for Industrial and Applied Mathematics,
-% Philadelphia, PA, 2002; sec. 20.5.
+function [x, fmax, nf] = adsmax(f, x, stopit, savit, P, varargin)
x0 = x(:); % Work with column vector internally.
n = length(x0);
Modified: trunk/octave-forge/main/optim/inst/battery.m
===================================================================
--- trunk/octave-forge/main/optim/inst/battery.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/battery.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,33 +1,32 @@
-# Copyright (C) 2004 Michael Creel <mic...@ua...>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; If not, see <http://www.gnu.org/licenses/>.
-# (c) Michael Creel <mic...@ua...>
+## Copyright (C) 2004 Michael Creel <mic...@ua...>
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
-# battery.m: repeatedly call bfgs using a battery of
-# start values, to attempt to find global min
-# of a nonconvex function
-
-# INPUTS:
-# func: function to mimimize
-# args: args of function
-# minarg: argument to minimize w.r.t. (usually = 1)
-# startvals: kxp matrix of values to try for sure (don't include all zeros, that's automatic)
-# max iters per start value
-# number of additional random start values to try
-
+## battery.m: repeatedly call bfgs using a battery of
+## start values, to attempt to find global min
+## of a nonconvex function
+##
+## INPUTS:
+## func: function to mimimize
+## args: args of function
+## minarg: argument to minimize w.r.t. (usually = 1)
+## startvals: kxp matrix of values to try for sure (don't include all zeros, that's automatic)
+## max iters per start value
+## number of additional random start values to try
+##
# OUTPUT: theta - the best value found - NOT iterated to convergence
-
+
function theta = battery(func, args, minarg, startvals, maxiters)
# setup
Modified: trunk/octave-forge/main/optim/inst/bfgsmin.m
===================================================================
--- trunk/octave-forge/main/optim/inst/bfgsmin.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/bfgsmin.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,18 +1,17 @@
-## Copyright (C) 2006 Michael Creel <mic...@ua...>
+## Copyright (C) 2006 Michael Creel <mic...@ua...>
##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## bfgsmin: bfgs or limited memory bfgs minimization of function
##
Modified: trunk/octave-forge/main/optim/inst/bfgsmin_example.m
===================================================================
--- trunk/octave-forge/main/optim/inst/bfgsmin_example.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/bfgsmin_example.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,18 +1,17 @@
-# Copyright (C) 2004,2005,2006 Michael Creel <mic...@ua...>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+## Copyright (C) 2004,2005,2006 Michael Creel <mic...@ua...>
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
# usage: bfgsmin_example (to run) or edit bfgsmin_example (to examine)
##
Modified: trunk/octave-forge/main/optim/inst/brent_line_min.m
===================================================================
--- trunk/octave-forge/main/optim/inst/brent_line_min.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/brent_line_min.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,3 +1,18 @@
+## Copyright (C) 2009 Levente Torok <Tor...@gm...>
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
+
## -*- texinfo -*-
## @deftypefn {Function File} {[@var{s},@var{v},@var{n}]} brent_line_min ( @var{f},@var{df},@var{args},@var{ctl} )
## Line minimization of f along df
@@ -32,7 +47,6 @@
## given.
## @end deftypefn
-
function [s,gs,nev] = brent_line_min( f,dx,args,ctl )
verbose = 0;
Modified: trunk/octave-forge/main/optim/inst/cdiff.m
===================================================================
--- trunk/octave-forge/main/optim/inst/cdiff.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/cdiff.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,14 +1,17 @@
-## Copyright (C) 2002 Etienne Grossmann. All rights reserved.
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
##
-## This program is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
##
-## This is distributed in the hope that it will be useful, but WITHOUT
+## This program is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-## for more details.
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## c = cdiff (func,wrt,N,dfunc,stack,dx) - Code for num. differentiation
## = "function df = dfunc (var1,..,dvar,..,varN) .. endfunction
@@ -42,7 +45,7 @@
## Default:10*sqrt(eps)
##
## See also : ndiff, eval, todisk
-##
+
function c = cdiff (func,wrt,nargs,dfunc,stack,dx)
if nargin<2,
Modified: trunk/octave-forge/main/optim/inst/cg_min.m
===================================================================
--- trunk/octave-forge/main/optim/inst/cg_min.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/cg_min.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,3 +1,19 @@
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
+## Copyright (C) 2009 Levente Torok <Tor...@gm...>
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
+
## -*- texinfo -*-
## @deftypefn {Function File} {[@var{x0},@var{v},@var{nev}]} cg_min ( @var{f},@var{df},@var{args},@var{ctl} )
## NonLinear Conjugate Gradient method to minimize function @var{f}.
@@ -54,10 +70,6 @@
## @seealso{ bfgsmin, http://en.wikipedia.org/wiki/Nonlinear_conjugate_gradient }
## @end deftypefn
-## Author : Etienne Grossmann <et...@is...>
-## Modified by: Levente Torok <Tor...@gm...>
-## This software is distributed under the terms of the GPL
-
function [x,v,nev] = cg_min (f, dfn, args, ctl)
verbose = 0;
Modified: trunk/octave-forge/main/optim/inst/cpiv_bard.m
===================================================================
--- trunk/octave-forge/main/optim/inst/cpiv_bard.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/cpiv_bard.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,42 +1,41 @@
-%% Copyright (C) 2010, 2011 Olaf Till
+%% Copyright (C) 2010, 2011 Olaf Till <ola...@un...>
%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the GNU General Public License as published by
-%% the Free Software Foundation; either version 2 of the License, or (at
-%% your option) any later version.
+%% This program is free software; you can redistribute it and/or modify it under
+%% the terms of the GNU General Public License as published by the Free Software
+%% Foundation; either version 3 of the License, or (at your option) any later
+%% version.
%%
-%% This program is distributed in the hope that it will be useful, but
-%% WITHOUT ANY WARRANTY; without even the implied warranty of
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%% General Public License for more details.
+%% This program is distributed in the hope that it will be useful, but WITHOUT
+%% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+%% FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+%% details.
%%
-%% You should have received a copy of the GNU General Public License
-%% along with this program; if not, write to the Free Software
-%% Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301USA
+%% You should have received a copy of the GNU General Public License along with
+%% this program; if not, see <http://www.gnu.org/licenses/>.
+%% [lb, idx, ridx, mv] = cpiv_bard (v, m[, incl])
+%%
+%% v: column vector; m: matrix; incl (optional): index. length (v)
+%% must equal rows (m). Finds column vectors w and l with w == v + m *
+%% l, w >= 0, l >= 0, l.' * w == 0. Chooses idx, w, and l so that
+%% l(~idx) == 0, l(idx) == -inv (m(idx, idx)) * v(idx), w(idx) roughly
+%% == 0, and w(~idx) == v(~idx) + m(idx, ~idx).' * l(idx). idx indexes
+%% at least everything indexed by incl, but l(incl) may be < 0. lb:
+%% l(idx) (column vector); idx: logical index, defined above; ridx:
+%% ~idx & w roughly == 0; mv: [m, v] after performing a Gauss-Jordan
+%% 'sweep' (with gjp.m) on each diagonal element indexed by idx.
+%% Except the handling of incl (which enables handling of equality
+%% constraints in the calling code), this is called solving the
+%% 'complementary pivot problem' (Cottle, R. W. and Dantzig, G. B.,
+%% 'Complementary pivot theory of mathematical programming', Linear
+%% Algebra and Appl. 1, 102--125. References for the current
+%% algorithm: Bard, Y.: Nonlinear Parameter Estimation, p. 147--149,
+%% Academic Press, New York and London 1974; Bard, Y., 'An eclectic
+%% approach to nonlinear programming', Proc. ANU Sem. Optimization,
+%% Canberra, Austral. Nat. Univ.).
+
function [lb, idx, ridx, m] = cpiv_bard (v, m, incl)
- %% [lb, idx, ridx, mv] = cpiv_bard (v, m[, incl])
- %%
- %% v: column vector; m: matrix; incl (optional): index. length (v)
- %% must equal rows (m). Finds column vectors w and l with w == v + m *
- %% l, w >= 0, l >= 0, l.' * w == 0. Chooses idx, w, and l so that
- %% l(~idx) == 0, l(idx) == -inv (m(idx, idx)) * v(idx), w(idx) roughly
- %% == 0, and w(~idx) == v(~idx) + m(idx, ~idx).' * l(idx). idx indexes
- %% at least everything indexed by incl, but l(incl) may be < 0. lb:
- %% l(idx) (column vector); idx: logical index, defined above; ridx:
- %% ~idx & w roughly == 0; mv: [m, v] after performing a Gauss-Jordan
- %% 'sweep' (with gjp.m) on each diagonal element indexed by idx.
- %% Except the handling of incl (which enables handling of equality
- %% constraints in the calling code), this is called solving the
- %% 'complementary pivot problem' (Cottle, R. W. and Dantzig, G. B.,
- %% 'Complementary pivot theory of mathematical programming', Linear
- %% Algebra and Appl. 1, 102--125. References for the current
- %% algorithm: Bard, Y.: Nonlinear Parameter Estimation, p. 147--149,
- %% Academic Press, New York and London 1974; Bard, Y., 'An eclectic
- %% approach to nonlinear programming', Proc. ANU Sem. Optimization,
- %% Canberra, Austral. Nat. Univ.).
-
n = length (v);
if (n > size (v, 1))
error ('first argument is no column vector'); % the most typical mistake
Modified: trunk/octave-forge/main/optim/inst/curvefit_stat.m
===================================================================
--- trunk/octave-forge/main/optim/inst/curvefit_stat.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/curvefit_stat.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,20 +1,19 @@
## Copyright (C) 2011 Olaf Till <ola...@un...>
##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or
-## (at your option) any later version.
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
##
-## You should have received a copy of the GNU General Public License
-## along with this program; If not, see <http://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
-##
## @deftypefn {Function File} {@var{info} =} residmin_stat (@var{f}, @var{p}, @var{x}, @var{y}, @var{settings})
##
## Frontend for computation of statistics for fitting of values,
@@ -30,7 +29,6 @@
## also a second obligatory argument which will be set to @var{x}.
##
## @seealso {residmin_stat}
-##
## @end deftypefn
function ret = curvefit_stat (f, pfin, x, y, settings)
Modified: trunk/octave-forge/main/optim/inst/d2_min.m
===================================================================
--- trunk/octave-forge/main/optim/inst/d2_min.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/d2_min.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,18 +1,17 @@
-
-## Copyright (C) 2002 Etienne Grossmann. All rights reserved.
+## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
##
-## This program is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
##
-## This is distributed in the hope that it will be useful, but WITHOUT
+## This program is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-## for more details.
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
##
-## Changelog:
-## 2002 / 05 / 09 : Heuristic for negative hessian
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## [x,v,nev,h,args] = d2_min(f,d2f,args,ctl,code) - Newton-like minimization
##
@@ -82,9 +81,6 @@
function [xbest,vbest,nev,hbest,args] = d2_min (f,d2f,args,ctl,code)
-## Author : Etienne Grossmann <et...@cs...>
-##
-
maxout = inf;
maxinner = 30 ;
Modified: trunk/octave-forge/main/optim/inst/dcdp.m
===================================================================
--- trunk/octave-forge/main/optim/inst/dcdp.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/dcdp.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,29 +1,29 @@
%% Copyright (C) 2010, 2011 Olaf Till <ola...@un...>
%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the GNU General Public License as published by
-%% the Free Software Foundation; either version 2 of the License, or
-%% (at your option) any later version.
+%% This program is free software; you can redistribute it and/or modify it under
+%% the terms of the GNU General Public License as published by the Free Software
+%% Foundation; either version 3 of the License, or (at your option) any later
+%% version.
%%
-%% This program is distributed in the hope that it will be useful,
-%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-%% GNU General Public License for more details.
+%% This program is distributed in the hope that it will be useful, but WITHOUT
+%% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+%% FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+%% details.
%%
-%% You should have received a copy of the GNU General Public License
-%% along with this program; If not, see <http://www.gnu.org/licenses/>.
+%% You should have received a copy of the GNU General Public License along with
+%% this program; if not, see <http://www.gnu.org/licenses/>.
+%% function prt = dcdp (f, p, dp, func[, bounds])
+%%
+%% This is an interface to __dfdp__.m, similar to dfdp.m, but for
+%% functions only of parameters 'p', not of independents 'x'. See
+%% dfdp.m.
+%%
+%% dfpdp is more general and is meant to be used instead of dcdp in
+%% optimization.
+
function prt = dcdp (f, p, dp, func, bounds)
- %% function prt = dcdp (f, p, dp, func[, bounds])
- %%
- %% This is an interface to __dfdp__.m, similar to dfdp.m, but for
- %% functions only of parameters 'p', not of independents 'x'. See
- %% dfdp.m.
- %%
- %% dfpdp is more general and is meant to be used instead of dcdp in
- %% optimization.
-
if (ischar (func))
func = str2func (func);
end
@@ -40,3 +40,4 @@
hook.diff_onesided = dp < 0;
prt = __dfdp__ (p, func, hook);
+end
Modified: trunk/octave-forge/main/optim/inst/de_min.m
===================================================================
--- trunk/octave-forge/main/optim/inst/de_min.m 2012-03-30 15:02:12 UTC (rev 10115)
+++ trunk/octave-forge/main/optim/inst/de_min.m 2012-03-30 15:14:48 UTC (rev 10116)
@@ -1,22 +1,18 @@
-## Copyright (C) 2009-2010 Christian Fischer <cfi...@it...>
## Copyright (C) 1996, 1997 R. Storn
+## Copyright (C) 2009-2010 Christian Fischer <cfi...@it...>
##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or
-## (at your option) any later version.
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 3 of the License, or (at your option) any later
+## version.
##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
+## This program is distri...
[truncated message content] |
