You can subscribe to this list here.
2001 
_{Jan}

_{Feb}

_{Mar}

_{Apr}

_{May}

_{Jun}

_{Jul}
(10) 
_{Aug}
(5) 
_{Sep}
(3) 
_{Oct}
(41) 
_{Nov}
(41) 
_{Dec}
(33) 

2002 
_{Jan}
(75) 
_{Feb}
(10) 
_{Mar}
(170) 
_{Apr}
(174) 
_{May}
(66) 
_{Jun}
(11) 
_{Jul}
(10) 
_{Aug}
(44) 
_{Sep}
(73) 
_{Oct}
(28) 
_{Nov}
(139) 
_{Dec}
(52) 
2003 
_{Jan}
(35) 
_{Feb}
(93) 
_{Mar}
(62) 
_{Apr}
(10) 
_{May}
(55) 
_{Jun}
(70) 
_{Jul}
(37) 
_{Aug}
(16) 
_{Sep}
(56) 
_{Oct}
(31) 
_{Nov}
(57) 
_{Dec}
(83) 
2004 
_{Jan}
(85) 
_{Feb}
(67) 
_{Mar}
(27) 
_{Apr}
(37) 
_{May}
(75) 
_{Jun}
(85) 
_{Jul}
(160) 
_{Aug}
(68) 
_{Sep}
(104) 
_{Oct}
(25) 
_{Nov}
(39) 
_{Dec}
(23) 
2005 
_{Jan}
(10) 
_{Feb}
(45) 
_{Mar}
(43) 
_{Apr}
(19) 
_{May}
(108) 
_{Jun}
(31) 
_{Jul}
(41) 
_{Aug}
(23) 
_{Sep}
(65) 
_{Oct}
(58) 
_{Nov}
(44) 
_{Dec}
(54) 
2006 
_{Jan}
(96) 
_{Feb}
(27) 
_{Mar}
(69) 
_{Apr}
(59) 
_{May}
(67) 
_{Jun}
(35) 
_{Jul}
(13) 
_{Aug}
(461) 
_{Sep}
(160) 
_{Oct}
(399) 
_{Nov}
(32) 
_{Dec}
(72) 
2007 
_{Jan}
(316) 
_{Feb}
(305) 
_{Mar}
(318) 
_{Apr}
(54) 
_{May}
(194) 
_{Jun}
(173) 
_{Jul}
(282) 
_{Aug}
(91) 
_{Sep}
(227) 
_{Oct}
(365) 
_{Nov}
(168) 
_{Dec}
(18) 
2008 
_{Jan}
(71) 
_{Feb}
(111) 
_{Mar}
(155) 
_{Apr}
(173) 
_{May}
(70) 
_{Jun}
(67) 
_{Jul}
(55) 
_{Aug}
(83) 
_{Sep}
(32) 
_{Oct}
(68) 
_{Nov}
(80) 
_{Dec}
(29) 
2009 
_{Jan}
(46) 
_{Feb}
(18) 
_{Mar}
(95) 
_{Apr}
(76) 
_{May}
(140) 
_{Jun}
(98) 
_{Jul}
(84) 
_{Aug}
(123) 
_{Sep}
(94) 
_{Oct}
(131) 
_{Nov}
(142) 
_{Dec}
(125) 
2010 
_{Jan}
(128) 
_{Feb}
(158) 
_{Mar}
(172) 
_{Apr}
(134) 
_{May}
(94) 
_{Jun}
(84) 
_{Jul}
(32) 
_{Aug}
(127) 
_{Sep}
(167) 
_{Oct}
(109) 
_{Nov}
(69) 
_{Dec}
(78) 
2011 
_{Jan}
(39) 
_{Feb}
(58) 
_{Mar}
(52) 
_{Apr}
(47) 
_{May}
(56) 
_{Jun}
(76) 
_{Jul}
(55) 
_{Aug}
(54) 
_{Sep}
(165) 
_{Oct}
(255) 
_{Nov}
(328) 
_{Dec}
(263) 
2012 
_{Jan}
(82) 
_{Feb}
(147) 
_{Mar}
(400) 
_{Apr}
(216) 
_{May}
(209) 
_{Jun}
(160) 
_{Jul}
(86) 
_{Aug}
(141) 
_{Sep}
(156) 
_{Oct}
(6) 
_{Nov}

_{Dec}

S  M  T  W  T  F  S 





1
(14) 
2
(2) 
3

4
(5) 
5
(7) 
6
(6) 
7
(18) 
8
(21) 
9
(7) 
10
(9) 
11
(5) 
12
(22) 
13
(37) 
14
(15) 
15
(21) 
16
(16) 
17
(10) 
18
(15) 
19
(18) 
20
(9) 
21
(18) 
22
(8) 
23
(11) 
24
(29) 
25
(16) 
26
(9) 
27
(4) 
28
(11) 
29
(14) 
30
(16) 
31
(7) 
From: <carandraug@us...>  20120331 22:40:47

Revision: 10124 http://octave.svn.sourceforge.net/octave/?rev=10124&view=rev Author: carandraug Date: 20120331 22:40:41 +0000 (Sat, 31 Mar 2012) Log Message:  generate_html: specify to not autoload package on DESCRIPTION and finally make new release Modified Paths:  trunk/octaveforge/extra/generate_html/DESCRIPTION Modified: trunk/octaveforge/extra/generate_html/DESCRIPTION ===================================================================  trunk/octaveforge/extra/generate_html/DESCRIPTION 20120331 22:34:10 UTC (rev 10123) +++ trunk/octaveforge/extra/generate_html/DESCRIPTION 20120331 22:40:41 UTC (rev 10124) @@ 8,6 +8,7 @@ contain the help texts for a set of functions. The package is designed to be as general as possible, but also contains convenience functions for generating a set of pages for entire packages. +Autoload: no Depends: octave (>= 3.2.0) SystemRequirements: makeinfo [Debian] texinfo License: GPLv3+ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120331 22:34:16

Revision: 10123 http://octave.svn.sourceforge.net/octave/?rev=10123&view=rev Author: carandraug Date: 20120331 22:34:10 +0000 (Sat, 31 Mar 2012) Log Message:  generate_package_html: bugfix when interpreting the information from autoload Modified Paths:  trunk/octaveforge/extra/generate_html/NEWS trunk/octaveforge/extra/generate_html/inst/generate_package_html.m Modified: trunk/octaveforge/extra/generate_html/NEWS ===================================================================  trunk/octaveforge/extra/generate_html/NEWS 20120331 21:58:47 UTC (rev 10122) +++ trunk/octaveforge/extra/generate_html/NEWS 20120331 22:34:10 UTC (rev 10123) @@ 5,5 +5,8 @@ package that the function belongs too and have a link for the package main page. + ** Autoload field when generating a package index.html page is now + correct. + ** keywords on the `See also:' will be interpreted properly (rather than just function names). Modified: trunk/octaveforge/extra/generate_html/inst/generate_package_html.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/generate_package_html.m 20120331 21:58:47 UTC (rev 10122) +++ trunk/octaveforge/extra/generate_html/inst/generate_package_html.m 20120331 22:34:10 UTC (rev 10123) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg <soren@...> +## Copyright (C) 2008 Soren Hauberg <soren@...>a ## ## 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 @@ 371,15 +371,16 @@ if (isfield (list, "buildrequires")) fprintf (fid, " <tr><td>Build Dependencies:</td><td>%s</td></tr>\n", list.buildrequires); endif   if (isfield (list, "autoload"))  if (list.autoload)  a = "Yes";  else  a = "No";  endif  fprintf (fid, " <tr><td>Autoload:</td><td>%s</td></tr>\n", a); + + ## if the package does not specify, then it is not autoloaded. Also, sometimes + ## the value is 1 (true) but other times the value is a string + if (isfield (list, "autoload") && (list.autoload == 1  + any (strcmpi ({"yes", "on", "true"}, list.autoload)))) + a = "Yes"; + else + a = "No"; endif + fprintf (fid, " <tr><td>Autoload:</td><td>%s</td></tr>\n", a); fprintf (fid, " </table>\n\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120331 21:58:53

Revision: 10122 http://octave.svn.sourceforge.net/octave/?rev=10122&view=rev Author: carandraug Date: 20120331 21:58:47 +0000 (Sat, 31 Mar 2012) Log Message:  generate_html: bump package version for release Modified Paths:  trunk/octaveforge/extra/generate_html/DESCRIPTION Modified: trunk/octaveforge/extra/generate_html/DESCRIPTION ===================================================================  trunk/octaveforge/extra/generate_html/DESCRIPTION 20120331 21:58:07 UTC (rev 10121) +++ trunk/octaveforge/extra/generate_html/DESCRIPTION 20120331 21:58:47 UTC (rev 10122) @@ 1,6 +1,6 @@ Name: generate_html Version: 0.1.3 Date: 20100225 +Version: 0.1.4 +Date: 20120331 Author: Søren Hauberg <soren@...> Maintainer: Søren Hauberg <soren@...> Title: Generate HTML web page from help texts This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120331 21:58:13

Revision: 10121 http://octave.svn.sourceforge.net/octave/?rev=10121&view=rev Author: carandraug Date: 20120331 21:58:07 +0000 (Sat, 31 Mar 2012) Log Message:  generate_html/DESCRIPTION: be specific where makeinfo is on Debian system Modified Paths:  trunk/octaveforge/extra/generate_html/DESCRIPTION Modified: trunk/octaveforge/extra/generate_html/DESCRIPTION ===================================================================  trunk/octaveforge/extra/generate_html/DESCRIPTION 20120331 21:56:22 UTC (rev 10120) +++ trunk/octaveforge/extra/generate_html/DESCRIPTION 20120331 21:58:07 UTC (rev 10121) @@ 1,14 +1,13 @@ Name: generate_html Version: 0.1.3 Date: 20100225 Author: Søren Hauberg Maintainer: Søren Hauberg +Author: Søren Hauberg <soren@...> +Maintainer: Søren Hauberg <soren@...> Title: Generate HTML web page from help texts Description: This package provides functions for generating HTML pages that contain the help texts for a set of functions. The package is designed to be as general as possible, but also contains convenience functions for generating a set of pages for entire packages. Depends: octave (>= 3.2.0) SystemRequirements: makeinfo License: GPL version 3 or later  +SystemRequirements: makeinfo [Debian] texinfo +License: GPLv3+ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120331 21:56:30

Revision: 10120 http://octave.svn.sourceforge.net/octave/?rev=10120&view=rev Author: carandraug Date: 20120331 21:56:22 +0000 (Sat, 31 Mar 2012) Log Message:  generate_html: adding email address to copyright notice Modified Paths:  trunk/octaveforge/extra/generate_html/inst/generate_alphabet.m trunk/octaveforge/extra/generate_html/inst/generate_html_manual.m trunk/octaveforge/extra/generate_html/inst/generate_operators.m trunk/octaveforge/extra/generate_html/inst/generate_package_html.m trunk/octaveforge/extra/generate_html/inst/get_html_options.m trunk/octaveforge/extra/generate_html/inst/html_help_text.m trunk/octaveforge/extra/generate_html/inst/private/find_package.m trunk/octaveforge/extra/generate_html/inst/private/get_alpha_database.m trunk/octaveforge/extra/generate_html/inst/private/get_header_title_and_footer.m trunk/octaveforge/extra/generate_html/inst/private/get_index_header_title_and_footer.m trunk/octaveforge/extra/generate_html/inst/private/get_overview_filename.m trunk/octaveforge/extra/generate_html/inst/private/get_overview_header_title_and_footer.m trunk/octaveforge/extra/generate_html/inst/private/get_pkg_list_item_filename.m trunk/octaveforge/extra/generate_html/inst/private/get_root.m trunk/octaveforge/extra/generate_html/inst/private/get_texi_conf.m trunk/octaveforge/extra/generate_html/inst/private/get_txi_files.m trunk/octaveforge/extra/generate_html/inst/private/mk_chapter_dir.m trunk/octaveforge/extra/generate_html/inst/private/mk_function_dir.m trunk/octaveforge/extra/generate_html/inst/private/mk_various_dir.m trunk/octaveforge/extra/generate_html/inst/private/octave_forge_seealso.m trunk/octaveforge/extra/generate_html/inst/texi2html.m trunk/octaveforge/extra/generate_html/inst/txi2index.m trunk/octaveforge/extra/generate_html/inst/txi2reference.m Modified: trunk/octaveforge/extra/generate_html/inst/generate_alphabet.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/generate_alphabet.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/generate_alphabet.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/generate_html_manual.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/generate_html_manual.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/generate_html_manual.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/generate_operators.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/generate_operators.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/generate_operators.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/generate_package_html.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/generate_package_html.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/generate_package_html.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/get_html_options.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/get_html_options.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/get_html_options.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/html_help_text.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/html_help_text.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/html_help_text.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/find_package.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/find_package.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/find_package.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2009 Soren Hauberg +## Copyright (C) 2009 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/get_alpha_database.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/get_alpha_database.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/get_alpha_database.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2009 Soren Hauberg +## Copyright (C) 2009 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/get_header_title_and_footer.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/get_header_title_and_footer.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/get_header_title_and_footer.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/get_index_header_title_and_footer.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/get_index_header_title_and_footer.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/get_index_header_title_and_footer.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/get_overview_filename.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/get_overview_filename.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/get_overview_filename.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/get_overview_header_title_and_footer.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/get_overview_header_title_and_footer.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/get_overview_header_title_and_footer.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/get_pkg_list_item_filename.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/get_pkg_list_item_filename.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/get_pkg_list_item_filename.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2009 Carlo de Falco +## Copyright (C) 2009 Carlo de Falco <carlo.defalco@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/get_root.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/get_root.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/get_root.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/get_texi_conf.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/get_texi_conf.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/get_texi_conf.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/get_txi_files.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/get_txi_files.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/get_txi_files.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/mk_chapter_dir.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/mk_chapter_dir.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/mk_chapter_dir.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/mk_function_dir.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/mk_function_dir.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/mk_function_dir.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/mk_various_dir.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/mk_various_dir.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/mk_various_dir.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2009 Soren Hauberg +## Copyright (C) 2009 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/private/octave_forge_seealso.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/private/octave_forge_seealso.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/private/octave_forge_seealso.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2009 Soren Hauberg +## Copyright (C) 2009 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/texi2html.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/texi2html.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/texi2html.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/txi2index.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/txi2index.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/txi2index.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 Modified: trunk/octaveforge/extra/generate_html/inst/txi2reference.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/txi2reference.m 20120331 21:44:54 UTC (rev 10119) +++ trunk/octaveforge/extra/generate_html/inst/txi2reference.m 20120331 21:56:22 UTC (rev 10120) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Soren Hauberg +## Copyright (C) 2008 Soren Hauberg <soren@...> ## ## 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120331 21:45:01

Revision: 10119 http://octave.svn.sourceforge.net/octave/?rev=10119&view=rev Author: carandraug Date: 20120331 21:44:54 +0000 (Sat, 31 Mar 2012) Log Message:  generate_html: added news file Added Paths:  trunk/octaveforge/extra/generate_html/NEWS Added: trunk/octaveforge/extra/generate_html/NEWS ===================================================================  trunk/octaveforge/extra/generate_html/NEWS (rev 0) +++ trunk/octaveforge/extra/generate_html/NEWS 20120331 21:44:54 UTC (rev 10119) @@ 0,0 +1,9 @@ +Summary of important uservisible changes for generate_html 0.1.4: + + + ** HTML pages with documentation of each function now mention the + package that the function belongs too and have a link for the + package main page. + + ** keywords on the `See also:' will be interpreted properly (rather + than just function names). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120331 21:36:19

Revision: 10118 http://octave.svn.sourceforge.net/octave/?rev=10118&view=rev Author: carandraug Date: 20120331 21:36:13 +0000 (Sat, 31 Mar 2012) Log Message:  html_help_text: reverting changes comitted by accident in r8745 Revision Links:  http://octave.svn.sourceforge.net/octave/?rev=8745&view=rev Modified Paths:  trunk/octaveforge/extra/generate_html/inst/html_help_text.m Modified: trunk/octaveforge/extra/generate_html/inst/html_help_text.m ===================================================================  trunk/octaveforge/extra/generate_html/inst/html_help_text.m 20120330 15:59:45 UTC (rev 10117) +++ trunk/octaveforge/extra/generate_html/inst/html_help_text.m 20120331 21:36:13 UTC (rev 10118) @@ 72,7 +72,6 @@ endif ## Run makeinfo pwd [text, status] = __makeinfo__ (text, "html", seealso); if (status != 0) error ("html_help_text: couln't parse file '%s'", name); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <jordigh@us...>  20120330 15:59:52

Revision: 10117 http://octave.svn.sourceforge.net/octave/?rev=10117&view=rev Author: jordigh Date: 20120330 15:59:45 +0000 (Fri, 30 Mar 2012) Log Message:  Description: Make the package compile against HDF5 1.8 Author: Rafael Laboissiere <rafael@...> Modified Paths:  trunk/octaveforge/main/fixed/src/ovfixedcomplex.cc trunk/octaveforge/main/fixed/src/ovfixedcxmat.cc trunk/octaveforge/main/fixed/src/ovfixedmat.cc trunk/octaveforge/main/fixed/src/ovfixed.cc Modified: trunk/octaveforge/main/fixed/src/ovfixedcomplex.cc ===================================================================  trunk/octaveforge/main/fixed/src/ovfixedcomplex.cc 20120330 15:14:48 UTC (rev 10116) +++ trunk/octaveforge/main/fixed/src/ovfixedcomplex.cc 20120330 15:59:45 UTC (rev 10117) @@ 349,7 +349,7 @@ bool save_as_floats) { hid_t group_hid = 1;  group_hid = H5Gcreate (loc_id, name, 0); + group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT); if (group_hid < 0 ) return false; hsize_t dims[3]; @@ 371,7 +371,8 @@ return false; }  data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT, + H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 395,7 +396,8 @@ return false; }  data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT, + H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 427,7 +429,8 @@ return false; }  data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT, + H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 458,12 +461,12 @@ hid_t group_hid, data_hid, type_hid, space_id; hsize_t rank;  group_hid = H5Gopen (loc_id, name); + group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); if (group_hid < 0 ) return false; hid_t complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UCHAR, 1);  data_hid = H5Dopen (group_hid, "int"); + data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT); type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type)) @@ 499,7 +502,7 @@ H5Tclose(type_hid); H5Dclose (data_hid);  data_hid = H5Dopen (group_hid, "dec"); + data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT); type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type)) @@ 539,7 +542,7 @@ complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UINT, sizeof(unsigned int));  data_hid = H5Dopen (group_hid, "num"); + data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT); type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type)) Modified: trunk/octaveforge/main/fixed/src/ovfixedcxmat.cc ===================================================================  trunk/octaveforge/main/fixed/src/ovfixedcxmat.cc 20120330 15:14:48 UTC (rev 10116) +++ trunk/octaveforge/main/fixed/src/ovfixedcxmat.cc 20120330 15:59:45 UTC (rev 10117) @@ 616,7 +616,7 @@ bool save_as_floats) { hid_t group_hid = 1;  group_hid = H5Gcreate (loc_id, name, 0); + group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT); if (group_hid < 0 ) return false; dim_vector d = dims (); @@ 644,7 +644,8 @@ return false; }  data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT, + H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 671,7 +672,8 @@ return false; }  data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT, + H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 707,7 +709,8 @@ return false; }  data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT, + H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 740,13 +743,13 @@ hid_t group_hid, data_hid, space_id, type_hid; hsize_t rank, rank_old;  group_hid = H5Gopen (loc_id, name); + group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); if (group_hid < 0 ) return false; hid_t complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UINT, sizeof(unsigned int));  data_hid = H5Dopen (group_hid, "int"); + data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT); type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type)) @@ 810,7 +813,7 @@ H5Tclose(type_hid); H5Dclose (data_hid);  data_hid = H5Dopen (group_hid, "dec"); + data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT); type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type)) @@ 875,7 +878,7 @@ H5Tclose(type_hid); H5Dclose (data_hid);  data_hid = H5Dopen (group_hid, "num"); + data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT); type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type)) Modified: trunk/octaveforge/main/fixed/src/ovfixedmat.cc ===================================================================  trunk/octaveforge/main/fixed/src/ovfixedmat.cc 20120330 15:14:48 UTC (rev 10116) +++ trunk/octaveforge/main/fixed/src/ovfixedmat.cc 20120330 15:59:45 UTC (rev 10117) @@ 574,7 +574,7 @@ octave_fixed_matrix::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { hid_t group_hid = 1;  group_hid = H5Gcreate (loc_id, name, 0); + group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT); if (group_hid < 0 ) return false; dim_vector d = dims (); @@ 595,7 +595,7 @@ } data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid,  H5P_DEFAULT); + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 618,7 +618,7 @@ } data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid,  H5P_DEFAULT); + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 640,7 +640,7 @@ } data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid,  H5P_DEFAULT); + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 668,10 +668,10 @@ hid_t group_hid, data_hid, space_id; hsize_t rank, rank_old;  group_hid = H5Gopen (loc_id, name); + group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); if (group_hid < 0 ) return false;  data_hid = H5Dopen (group_hid, "int"); + data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT); space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id); rank_old = rank; @@ 719,7 +719,7 @@ } H5Dclose (data_hid);  data_hid = H5Dopen (group_hid, "dec"); + data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT); space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id); @@ 766,7 +766,7 @@ } H5Dclose (data_hid);  data_hid = H5Dopen (group_hid, "num"); + data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT); space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id); Modified: trunk/octaveforge/main/fixed/src/ovfixed.cc ===================================================================  trunk/octaveforge/main/fixed/src/ovfixed.cc 20120330 15:14:48 UTC (rev 10116) +++ trunk/octaveforge/main/fixed/src/ovfixed.cc 20120330 15:59:45 UTC (rev 10117) @@ 291,7 +291,7 @@ octave_fixed::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { hid_t group_hid = 1;  group_hid = H5Gcreate (loc_id, name, 0); + group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT); if (group_hid < 0 ) return false; hsize_t dims[3]; @@ 308,7 +308,7 @@ } data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid,  H5P_DEFAULT); + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 328,7 +328,7 @@ } data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid,  H5P_DEFAULT); + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 348,7 +348,7 @@ } data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid,  H5P_DEFAULT); + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (data_hid < 0) { H5Sclose (space_hid); @@ 374,10 +374,10 @@ hid_t group_hid, data_hid, space_id; hsize_t rank;  group_hid = H5Gopen (loc_id, name); + group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); if (group_hid < 0 ) return false;  data_hid = H5Dopen (group_hid, "int"); + data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT); space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id); @@ 398,7 +398,7 @@ H5Dclose (data_hid);  data_hid = H5Dopen (group_hid, "dec"); + data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT); space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id); @@ 418,7 +418,7 @@ } H5Dclose (data_hid);  data_hid = H5Dopen (group_hid, "num"); + data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT); space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120330 15:15:02

Revision: 10116 http://octave.svn.sourceforge.net/octave/?rev=10116&view=rev Author: carandraug Date: 20120330 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/octaveforge/main/optim/COPYING trunk/octaveforge/main/optim/DESCRIPTION trunk/octaveforge/main/optim/inst/LinearRegression.m trunk/octaveforge/main/optim/inst/__bracket_min.m trunk/octaveforge/main/optim/inst/__poly_2_extrema.m trunk/octaveforge/main/optim/inst/__semi_bracket.m trunk/octaveforge/main/optim/inst/adsmax.m trunk/octaveforge/main/optim/inst/battery.m trunk/octaveforge/main/optim/inst/bfgsmin.m trunk/octaveforge/main/optim/inst/bfgsmin_example.m trunk/octaveforge/main/optim/inst/brent_line_min.m trunk/octaveforge/main/optim/inst/cdiff.m trunk/octaveforge/main/optim/inst/cg_min.m trunk/octaveforge/main/optim/inst/cpiv_bard.m trunk/octaveforge/main/optim/inst/curvefit_stat.m trunk/octaveforge/main/optim/inst/d2_min.m trunk/octaveforge/main/optim/inst/dcdp.m trunk/octaveforge/main/optim/inst/de_min.m trunk/octaveforge/main/optim/inst/deriv.m trunk/octaveforge/main/optim/inst/dfdp.m trunk/octaveforge/main/optim/inst/dfpdp.m trunk/octaveforge/main/optim/inst/dfxpdp.m trunk/octaveforge/main/optim/inst/expfit.m trunk/octaveforge/main/optim/inst/fmin.m trunk/octaveforge/main/optim/inst/fmins.m trunk/octaveforge/main/optim/inst/fminsearch.m trunk/octaveforge/main/optim/inst/fminunc_compat.m trunk/octaveforge/main/optim/inst/gjp.m trunk/octaveforge/main/optim/inst/jacobs.m trunk/octaveforge/main/optim/inst/leasqr.m trunk/octaveforge/main/optim/inst/line_min.m trunk/octaveforge/main/optim/inst/linprog.m trunk/octaveforge/main/optim/inst/mdsmax.m trunk/octaveforge/main/optim/inst/minimize.m trunk/octaveforge/main/optim/inst/nelder_mead_min.m trunk/octaveforge/main/optim/inst/nmsmax.m trunk/octaveforge/main/optim/inst/nonlin_curvefit.m trunk/octaveforge/main/optim/inst/nonlin_residmin.m trunk/octaveforge/main/optim/inst/nrm.m trunk/octaveforge/main/optim/inst/optim_problems.m trunk/octaveforge/main/optim/inst/optimset_compat.m trunk/octaveforge/main/optim/inst/polyconf.m trunk/octaveforge/main/optim/inst/polyfitinf.m trunk/octaveforge/main/optim/inst/powell.m trunk/octaveforge/main/optim/inst/private/__dfdp__.m trunk/octaveforge/main/optim/inst/private/__lm_svd__.m trunk/octaveforge/main/optim/inst/residmin_stat.m trunk/octaveforge/main/optim/inst/rosenbrock.m trunk/octaveforge/main/optim/inst/samin_example.m trunk/octaveforge/main/optim/inst/test_d2_min_1.m trunk/octaveforge/main/optim/inst/test_d2_min_2.m trunk/octaveforge/main/optim/inst/test_d2_min_3.m trunk/octaveforge/main/optim/inst/test_fminunc_1.m trunk/octaveforge/main/optim/inst/test_min_1.m trunk/octaveforge/main/optim/inst/test_min_2.m trunk/octaveforge/main/optim/inst/test_min_3.m trunk/octaveforge/main/optim/inst/test_min_4.m trunk/octaveforge/main/optim/inst/test_minimize_1.m trunk/octaveforge/main/optim/inst/test_nelder_mead_min_1.m trunk/octaveforge/main/optim/inst/test_nelder_mead_min_2.m trunk/octaveforge/main/optim/inst/test_wpolyfit.m trunk/octaveforge/main/optim/inst/vfzero.m trunk/octaveforge/main/optim/inst/wpolyfit.m trunk/octaveforge/main/optim/inst/wrap_f_dfdp.m trunk/octaveforge/main/optim/inst/wsolve.m trunk/octaveforge/main/optim/src/__bfgsmin.cc trunk/octaveforge/main/optim/src/__disna_optim__.cc trunk/octaveforge/main/optim/src/numgradient.cc trunk/octaveforge/main/optim/src/numhessian.cc trunk/octaveforge/main/optim/src/samin.cc Modified: trunk/octaveforge/main/optim/COPYING ===================================================================  trunk/octaveforge/main/optim/COPYING 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/COPYING 20120330 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 softwareto 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 machinereadable  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  machinereadable 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 royaltyfree 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 mouseclicks or menu itemswhatever 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/octaveforge/main/optim/DESCRIPTION ===================================================================  trunk/octaveforge/main/optim/DESCRIPTION 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/DESCRIPTION 20120330 15:14:48 UTC (rev 10116) @@ 7,5 +7,5 @@ Description: Nonlinear 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/octaveforge/main/optim/inst/LinearRegression.m ===================================================================  trunk/octaveforge/main/optim/inst/LinearRegression.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/LinearRegression.m 20120330 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 <Andreas.Stahel@...> +## +## 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 <Andreas.Stahel@...> +## 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/octaveforge/main/optim/inst/__bracket_min.m ===================================================================  trunk/octaveforge/main/optim/inst/__bracket_min.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/__bracket_min.m 20120330 15:14:48 UTC (rev 10116) @@ 1,3 +1,19 @@ +## Copyright (C) 2002 Etienne Grossmann <etienne@...> +## Copyright (C) 2009 Levente Torok <TorokLev@...> +## +## 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 <etienne@...> ## Modified by: Levente Torok <TorokLev@...> ## 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/octaveforge/main/optim/inst/__poly_2_extrema.m ===================================================================  trunk/octaveforge/main/optim/inst/__poly_2_extrema.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/__poly_2_extrema.m 20120330 15:14:48 UTC (rev 10116) @@ 1,3 +1,19 @@ +## Copyright (C) 2002 Etienne Grossmann <etienne@...> +## Copyright (C) 2009 Levente Torok <TorokLev@...> +## +## 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 1var deg2 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/octaveforge/main/optim/inst/__semi_bracket.m ===================================================================  trunk/octaveforge/main/optim/inst/__semi_bracket.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/__semi_bracket.m 20120330 15:14:48 UTC (rev 10116) @@ 1,3 +1,19 @@ +## Copyright (C) 2002 Etienne Grossmann <etienne@...> +## Copyright (C) 2009 Levente Torok <TorokLev@...> +## +## 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 <etienne@...> ## Modified by: Levente Torok <TorokLev@...> ## 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/octaveforge/main/optim/inst/adsmax.m ===================================================================  trunk/octaveforge/main/optim/inst/adsmax.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/adsmax.m 20120330 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 1e3), %  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 nonempty 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 coordinate 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 <adler@...> +%% +%% 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 1e3), +%%  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 nonempty 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 coordinate 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): 317333, 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 % http://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): 317333, 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/octaveforge/main/optim/inst/battery.m ===================================================================  trunk/octaveforge/main/optim/inst/battery.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/battery.m 20120330 15:14:48 UTC (rev 10116) @@ 1,33 +1,32 @@ # Copyright (C) 2004 Michael Creel <michael.creel@...> # # 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 <michael.creel@...> +## Copyright (C) 2004 Michael Creel <michael.creel@...> +## +## 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/octaveforge/main/optim/inst/bfgsmin.m ===================================================================  trunk/octaveforge/main/optim/inst/bfgsmin.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/bfgsmin.m 20120330 15:14:48 UTC (rev 10116) @@ 1,18 +1,17 @@ ## Copyright (C) 2006 Michael Creel <michael.creel@...> +## Copyright (C) 2006 Michael Creel <michael.creel@...> ## ## 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 021101301 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/octaveforge/main/optim/inst/bfgsmin_example.m ===================================================================  trunk/octaveforge/main/optim/inst/bfgsmin_example.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/bfgsmin_example.m 20120330 15:14:48 UTC (rev 10116) @@ 1,18 +1,17 @@ # Copyright (C) 2004,2005,2006 Michael Creel <michael.creel@...> # # 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 021101301 USA +## Copyright (C) 2004,2005,2006 Michael Creel <michael.creel@...> +## +## 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/octaveforge/main/optim/inst/brent_line_min.m ===================================================================  trunk/octaveforge/main/optim/inst/brent_line_min.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/brent_line_min.m 20120330 15:14:48 UTC (rev 10116) @@ 1,3 +1,18 @@ +## Copyright (C) 2009 Levente Torok <TorokLev@...> +## +## 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/octaveforge/main/optim/inst/cdiff.m ===================================================================  trunk/octaveforge/main/optim/inst/cdiff.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/cdiff.m 20120330 15:14:48 UTC (rev 10116) @@ 1,14 +1,17 @@ ## Copyright (C) 2002 Etienne Grossmann. All rights reserved. +## Copyright (C) 2002 Etienne Grossmann <etienne@...> ## ## 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/octaveforge/main/optim/inst/cg_min.m ===================================================================  trunk/octaveforge/main/optim/inst/cg_min.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/cg_min.m 20120330 15:14:48 UTC (rev 10116) @@ 1,3 +1,19 @@ +## Copyright (C) 2002 Etienne Grossmann <etienne@...> +## Copyright (C) 2009 Levente Torok <TorokLev@...> +## +## 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 <etienne@...> ## Modified by: Levente Torok <TorokLev@...> ## This software is distributed under the terms of the GPL  function [x,v,nev] = cg_min (f, dfn, args, ctl) verbose = 0; Modified: trunk/octaveforge/main/optim/inst/cpiv_bard.m ===================================================================  trunk/octaveforge/main/optim/inst/cpiv_bard.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/cpiv_bard.m 20120330 15:14:48 UTC (rev 10116) @@ 1,42 +1,41 @@ %% Copyright (C) 2010, 2011 Olaf Till +%% Copyright (C) 2010, 2011 Olaf Till <olaf.till@...> %% %% 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 021101301USA +%% 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 GaussJordan +%% '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, 102125. References for the current +%% algorithm: Bard, Y.: Nonlinear Parameter Estimation, p. 147149, +%% 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 GaussJordan  %% '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, 102125. References for the current  %% algorithm: Bard, Y.: Nonlinear Parameter Estimation, p. 147149,  %% 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/octaveforge/main/optim/inst/curvefit_stat.m ===================================================================  trunk/octaveforge/main/optim/inst/curvefit_stat.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/curvefit_stat.m 20120330 15:14:48 UTC (rev 10116) @@ 1,20 +1,19 @@ ## Copyright (C) 2011 Olaf Till <olaf.till@...> ## ## 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/octaveforge/main/optim/inst/d2_min.m ===================================================================  trunk/octaveforge/main/optim/inst/d2_min.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/d2_min.m 20120330 15:14:48 UTC (rev 10116) @@ 1,18 +1,17 @@  ## Copyright (C) 2002 Etienne Grossmann. All rights reserved. +## Copyright (C) 2002 Etienne Grossmann <etienne@...> ## ## 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)  Newtonlike minimization ## @@ 82,9 +81,6 @@ function [xbest,vbest,nev,hbest,args] = d2_min (f,d2f,args,ctl,code) ## Author : Etienne Grossmann <etienne@...> ##  maxout = inf; maxinner = 30 ; Modified: trunk/octaveforge/main/optim/inst/dcdp.m ===================================================================  trunk/octaveforge/main/optim/inst/dcdp.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/dcdp.m 20120330 15:14:48 UTC (rev 10116) @@ 1,29 +1,29 @@ %% Copyright (C) 2010, 2011 Olaf Till <olaf.till@...> %% %% 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/octaveforge/main/optim/inst/de_min.m ===================================================================  trunk/octaveforge/main/optim/inst/de_min.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/de_min.m 20120330 15:14:48 UTC (rev 10116) @@ 1,22 +1,18 @@ ## Copyright (C) 20092010 Christian Fischer <cfischer@...> ## Copyright (C) 1996, 1997 R. Storn +## Copyright (C) 20092010 Christian Fischer <cfischer@...> ## ## 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 Octave; see the file COPYING. If not, ## see <http://www.gnu.org/licenses/>;. ## ## Changelog: ## +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## de_min: global optimisation using differential evolution ## @@ 121,7 +117,6 @@ ## ctl.XVmax = [ 2 2]; ## [x, obj_value, nfeval, convergence] = de_min (@f, ctl); ## ## Author : Christian Fischer <cfischer@...> ## Keywords: globaloptimisation optimisation minimisation function [bestmem, bestval, nfeval, convergence] = de_min(fcn, varargin) Modified: trunk/octaveforge/main/optim/inst/deriv.m ===================================================================  trunk/octaveforge/main/optim/inst/deriv.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/deriv.m 20120330 15:14:48 UTC (rev 10116) @@ 2,15 +2,18 @@ ## Copyright (C) 2011 Joaquín Ignacio Aramendía <samsagax@...> ## Copyright (C) 2011 Carnë Draug <carandraug+dev@...> ## ## 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, 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/>;. ## * texinfo * ## @deftypefn {Function File} {@var{dx} =} deriv (@var{f}, @var{x0}) Modified: trunk/octaveforge/main/optim/inst/dfdp.m ===================================================================  trunk/octaveforge/main/optim/inst/dfdp.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/dfdp.m 20120330 15:14:48 UTC (rev 10116) @@ 3,43 +3,43 @@ %% Copyright (C) 19921994 Ray Muzic %% Copyright (C) 2010, 2011 Olaf Till <olaf.till@...> %% %% 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 = dfdp (x, f, p, dp, func[, bounds]) +%% numerical partial derivatives (Jacobian) df/dp for use with leasqr +%% INPUT VARIABLES +%% x=vec or matrix of indep var(used as arg to func) x=[x0 x1 ....] +%% f=func(x,p) vector initialsed by user before each call to dfdp +%% p= vec of current parameter values +%% dp= fractional increment of p for numerical derivatives +%% dp(j)>0 central differences calculated +%% dp(j)<0 one sided differences calculated +%% dp(j)=0 sets corresponding partials to zero; i.e. holds p(j) fixed +%% func=function (string or handle) to calculate the Jacobian for, +%% e.g. to calc Jacobian for function expsum prt=dfdp(x,f,p,dp,'expsum') +%% bounds=twocolumnmatrix of lower and upper bounds for parameters +%% If no 'bounds' options is specified to leasqr, it will call +%% dfdp without the 'bounds' argument. +%%OUTPUT VARIABLES +%% prt= Jacobian Matrix prt(i,j)=df(i)/dp(j) +%%================================ +%% +%% dfxpdp is more general and is meant to be used instead of dfdp in +%% optimization. + function prt = dfdp (x, f, p, dp, func, bounds)  %% function prt = dfdp (x, f, p, dp, func[, bounds])  %% numerical partial derivatives (Jacobian) df/dp for use with leasqr  %% INPUT VARIABLES  %% x=vec or matrix of indep var(used as arg to func) x=[x0 x1 ....]  %% f=func(x,p) vector initialsed by user before each call to dfdp  %% p= vec of current parameter values  %% dp= fractional increment of p for numerical derivatives  %% dp(j)>0 central differences calculated  %% dp(j)<0 one sided differences calculated  %% dp(j)=0 sets corresponding partials to zero; i.e. holds p(j) fixed  %% func=function (string or handle) to calculate the Jacobian for,  %% e.g. to calc Jacobian for function expsum prt=dfdp(x,f,p,dp,'expsum')  %% bounds=twocolumnmatrix of lower and upper bounds for parameters  %% If no 'bounds' options is specified to leasqr, it will call  %% dfdp without the 'bounds' argument.  %%OUTPUT VARIABLES  %% prt= Jacobian Matrix prt(i,j)=df(i)/dp(j)  %%================================  %%  %% dfxpdp is more general and is meant to be used instead of dfdp in  %% optimization.  %% This is just an interface. The original code has been moved to %% __dfdp__.m, which is used with two different interfaces by %% leasqr.m. Modified: trunk/octaveforge/main/optim/inst/dfpdp.m ===================================================================  trunk/octaveforge/main/optim/inst/dfpdp.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/dfpdp.m 20120330 15:14:48 UTC (rev 10116) @@ 1,47 +1,46 @@ %% Copyright (C) 2010, 2011 Olaf Till <olaf.till@...> %% %% 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 jac = dfpdp (p, func[, hook]) +%% +%% Returns Jacobian of func (p) with respect to p with finite +%% differencing. The optional argument hook is a structure which can +%% contain the following fields at the moment: +%% +%% hook.f: value of func(p) for p as given in the arguments +%% +%% hook.diffp: positive vector of fractional steps from given p in +%% finite differencing (actual steps may be smaller if bounds are +%% given). The default is .001 * ones (size (p)). +%% +%% hook.diff_onesided: logical vector, indexing elements of p for +%% which only onesided differences should be computed (faster); even +%% if not onesided, differences might not be exactly central if +%% bounds are given. The default is false (size (p)). +%% +%% hook.fixed: logical vector, indexing elements of p for which zero +%% should be returned instead of the guessed partial derivatives +%% (useful in optimization if some parameters are not optimized, but +%% are 'fixed'). +%% +%% hook.lbound, hook.ubound: vectors of lower and upper parameter +%% bounds (or Inf or +Inf, respectively) to be respected in finite +%% differencing. The consistency of bounds is not checked. + function ret = dfpdp (varargin)  %% function jac = dfpdp (p, func[, hook])  %%  %% Returns Jacobian of func (p) with respect to p with finite  %% differencing. The optional argument hook is a structure which can  %% contain the following fields at the moment:  %%  %% hook.f: value of func(p) for p as given in the arguments  %%  %% hook.diffp: positive vector of fractional steps from given p in  %% finite differencing (actual steps may be smaller if bounds are  %% given). The default is .001 * ones (size (p)).  %%  %% hook.diff_onesided: logical vector, indexing elements of p for  %% which only onesided differences should be computed (faster); even  %% if not onesided, differences might not be exactly central if  %% bounds are given. The default is false (size (p)).  %%  %% hook.fixed: logical vector, indexing elements of p for which zero  %% should be returned instead of the guessed partial derivatives  %% (useful in optimization if some parameters are not optimized, but  %% are 'fixed').  %%  %% hook.lbound, hook.ubound: vectors of lower and upper parameter  %% bounds (or Inf or +Inf, respectively) to be respected in finite  %% differencing. The consistency of bounds is not checked.   %% This is an interface to __dfdp__.m. if (ischar (varargin{2})) @@ 49,3 +48,5 @@ end ret = __dfdp__ (varargin{:}); + +end Modified: trunk/octaveforge/main/optim/inst/dfxpdp.m ===================================================================  trunk/octaveforge/main/optim/inst/dfxpdp.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/dfxpdp.m 20120330 15:14:48 UTC (rev 10116) @@ 1,47 +1,46 @@ %% Copyright (C) 2010, 2011 Olaf Till <olaf.till@...> %% %% 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 jac = dfxpdp (x, p, func[, hook]) +%% +%% Returns Jacobian of func (p, x) with respect to p with finite +%% differencing. The optional argument hook is a structure which can +%% contain the following fields at the moment: +%% +%% hook.f: value of func(p, x) for p and x as given in the arguments +%% +%% hook.diffp: positive vector of fractional steps from given p in +%% finite differencing (actual steps may be smaller if bounds are +%% given). The default is .001 * ones (size (p)); +%% +%% hook.diff_onesided: logical vector, indexing elements of p for +%% which only onesided differences should be computed (faster); even +%% if not onesided, differences might not be exactly central if +%% bounds are given. The default is false (size (p)). +%% +%% hook.fixed: logical vector, indexing elements of p for which zero +%% should be returned instead of the guessed partial derivatives +%% (useful in optimization if some parameters are not optimized, but +%% are 'fixed'). +%% +%% hook.lbound, hook.ubound: vectors of lower and upper parameter +%% bounds (or Inf or +Inf, respectively) to be respected in finite +%% differencing. The consistency of bounds is not checked. + function ret = dfxpdp (varargin)  %% function jac = dfxpdp (x, p, func[, hook])  %%  %% Returns Jacobian of func (p, x) with respect to p with finite  %% differencing. The optional argument hook is a structure which can  %% contain the following fields at the moment:  %%  %% hook.f: value of func(p, x) for p and x as given in the arguments  %%  %% hook.diffp: positive vector of fractional steps from given p in  %% finite differencing (actual steps may be smaller if bounds are  %% given). The default is .001 * ones (size (p));  %%  %% hook.diff_onesided: logical vector, indexing elements of p for  %% which only onesided differences should be computed (faster); even  %% if not onesided, differences might not be exactly central if  %% bounds are given. The default is false (size (p)).  %%  %% hook.fixed: logical vector, indexing elements of p for which zero  %% should be returned instead of the guessed partial derivatives  %% (useful in optimization if some parameters are not optimized, but  %% are 'fixed').  %%  %% hook.lbound, hook.ubound: vectors of lower and upper parameter  %% bounds (or Inf or +Inf, respectively) to be respected in finite  %% differencing. The consistency of bounds is not checked.   %% This is an interface to __dfdp__.m. if (ischar (varargin{3})) @@ 52,3 +51,5 @@ end ret = __dfdp__ (varargin{2:end}); + +end Modified: trunk/octaveforge/main/optim/inst/expfit.m ===================================================================  trunk/octaveforge/main/optim/inst/expfit.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/expfit.m 20120330 15:14:48 UTC (rev 10116) @@ 1,3 +1,19 @@ +## Copyright (C) 2000 Gert Van den Eynde <na.gvandeneynde@...> +## Copyright (C) 2002 Rolf Fabian <fabian@...> +## +## 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 [alpha,c,rms] = expfit( deg, x1, h, y ) ## ## Prony's method for nonlinear exponential fitting @@ 41,32 +57,13 @@ ## roots of a polynomial. I used 'roots.m', if there is ## something better please use that code. ## ## Copyright (C) 2000 Gert Van den Eynde ## SCKCEN (Nuclear Energy Research Centre) ## Boeretang 200 ## 2400 Mol ## Belgium ## na.gvandeneynde@... ## ## This code is under the GNU Public License (GPL) version 2 or later. ## I hope that it is useful, but it is WITHOUT ANY WARRANTY, without ## even the implied warranty of MERCHANTABILITY or FITNESS FOR A ## PARTICULAR PURPOSE. ## __________________________________________________________________ ## Modified for full compatibility with complex fitfunctions by ## Rolf Fabian <fabian@...> 2002Sep23 ## Brandenburg University of Technology Cottbus ## Dep. of Air Chemistry and Pollution Control ## ## Demo for a complex fitfunction: ## deg= 2; N= 20; x1= (1+i), x= linspace(x1,1+i/2,N).'; ## h = x(2)  x(1) ## y= (2+i)*exp( (12i)*x ) + (1+3i)*exp( (2+3i)*x ); ## A= 5e2; y+= A*(randn(N,1)+randn(N,1)*i); % add complex noise ## [alpha,c,rms]= expfit( deg, x1, h, y ) ## __________________________________________________________________  function [a,c,rms] = expfit(deg,x1,h,y) % Check input Modified: trunk/octaveforge/main/optim/inst/fmin.m ===================================================================  trunk/octaveforge/main/optim/inst/fmin.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/fmin.m 20120330 15:14:48 UTC (rev 10116) @@ 1,22 +1,21 @@ ## Copyright (C) 2001 Paul Kienzle ## ## 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/>;. +## Copyright (C) 2001 Paul Kienzle <pkienzle@...> +## +## 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/>;. function ret=fmin(varargin) ## alias for fminbnd + ret = fminbnd(varargin{:});  ret = fminbnd(varargin{:});  endfunction Modified: trunk/octaveforge/main/optim/inst/fmins.m ===================================================================  trunk/octaveforge/main/optim/inst/fmins.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/fmins.m 20120330 15:14:48 UTC (rev 10116) @@ 1,17 +1,17 @@ ## Copyright (C) 2003 Andy Adler ## ## 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/>;. +## Copyright (C) 2003 Andy Adler <adler@...> +## +## 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{x}] =} fmins(@var{f},@var{X0},@var{options},@var{grad},@var{P1},@var{P2}, ...) Modified: trunk/octaveforge/main/optim/inst/fminsearch.m ===================================================================  trunk/octaveforge/main/optim/inst/fminsearch.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/fminsearch.m 20120330 15:14:48 UTC (rev 10116) @@ 1,20 +1,20 @@ ## Copyright (C) 2006 Sylvain Pelissier <sylvain.pelissier@...> +## Copyright (C) 2006 Sylvain Pelissier <sylvain.pelissier@...> ## ## 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/>;. ## * texinfo * ## @deftypefn {Function File} {[@var{x}] =} fminsearch(@var{f},@var{X0},@var{options},@var{grad},@var{P1},@var{P2}, ...) +## @deftypefn {Function File} {[@var{x}] =} fminsearch(@var{f},@var{X0},@var{options},@var{grad},@var{P1},@var{P2}, @dots{}) ## ## Find the minimum of a funtion of several variables. ## By default the method used is the Nelder&Mead Simplex algorithm Modified: trunk/octaveforge/main/optim/inst/fminunc_compat.m ===================================================================  trunk/octaveforge/main/optim/inst/fminunc_compat.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/fminunc_compat.m 20120330 15:14:48 UTC (rev 10116) @@ 1,14 +1,17 @@ ## Copyright (C) 2002 Etienne Grossmann. All rights reserved. +## Copyright (C) 2002 Etienne Grossmann <etienne@...> ## ## 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/>;. ## [x,v,flag,out,df,d2f] = fminunc_compat (f,x,opt,...)  M*tlablike optimization ## Modified: trunk/octaveforge/main/optim/inst/gjp.m ===================================================================  trunk/octaveforge/main/optim/inst/gjp.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/gjp.m 20120330 15:14:48 UTC (rev 10116) @@ 1,38 +1,37 @@ %% Copyright (C) 2010, 2011 Olaf Till +%% Copyright (C) 2010, 2011 Olaf Till <olaf.till@...> %% %% 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 021101301USA +%% You should have received a copy of the GNU General Public License along with +%% this program; if not, see <http://www.gnu.org/licenses/>;. +%% m = gjp (m, k[, l]) +%% +%% m: matrix; k, l: row and columnindex of pivot, l defaults to k. +%% +%% GaussJordon pivot as defined in Bard, Y.: Nonlinear Parameter +%% Estimation, p. 296, Academic Press, New York and London 1974. In +%% the pivot column, this seems not quite the same as the usual +%% GaussJordan(Clasen) pivot. Bard gives Beaton, A. E., 'The use of +%% special matrix operators in statistical calculus' Research Bulletin +%% RB6451 (1964), Educational Testing Service, Princeton, New Jersey +%% as a reference, but this article is not easily accessible. Another +%% reference, whose definition of gjp differs from Bards by some +%% signs, is Clarke, R. B., 'Algorithm AS 178: The GaussJordan sweep +%% operator with detection of collinearity', Journal of the Royal +%% Statistical Society, Series C (Applied Statistics) (1982), 31(2), +%% 166168. + function m = gjp (m, k, l)  %% m = gjp (m, k[, l])  %%  %% m: matrix; k, l: row and columnindex of pivot, l defaults to k.  %%  %% GaussJordon pivot as defined in Bard, Y.: Nonlinear Parameter  %% Estimation, p. 296, Academic Press, New York and London 1974. In  %% the pivot column, this seems not quite the same as the usual  %% GaussJordan(Clasen) pivot. Bard gives Beaton, A. E., 'The use of  %% special matrix operators in statistical calculus' Research Bulletin  %% RB6451 (1964), Educational Testing Service, Princeton, New Jersey  %% as a reference, but this article is not easily accessible. Another  %% reference, whose definition of gjp differs from Bards by some  %% signs, is Clarke, R. B., 'Algorithm AS 178: The GaussJordan sweep  %% operator with detection of collinearity', Journal of the Royal  %% Statistical Society, Series C (Applied Statistics) (1982), 31(2),  %% 166168.  if (nargin < 3) l = k; end @@ 51,3 +50,4 @@ m([1:k1, k+1:end], l) * m(k, [1:l1, l+1:end]); m([1:k1, k+1:end], l) =  m([1:k1, k+1:end], l) / p; % pivot column m(k, l) = 1 / p; +end Modified: trunk/octaveforge/main/optim/inst/jacobs.m ===================================================================  trunk/octaveforge/main/optim/inst/jacobs.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/jacobs.m 20120330 15:14:48 UTC (rev 10116) @@ 1,17 +1,17 @@ ## Copyright (C) 2011 Fotios Kasolis <fotios.kasolis@...> ## ## 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} {Df =} jacobs (@var{x}, @var{f}) Modified: trunk/octaveforge/main/optim/inst/leasqr.m ===================================================================  trunk/octaveforge/main/optim/inst/leasqr.m 20120330 15:02:12 UTC (rev 10115) +++ trunk/octaveforge/main/optim/inst/leasqr.m 20120330 15:14:48 UTC (rev 10116) @@ 1,152 +1,156 @@ %% Copyright (C) 19921994 Richard Shrager %% Copyright (C) 19921994 Arthur Jutan %% Copyright (C) 19921994 Ray Muzic +%% Copyright (C) 19921994 Arthur Jutan <jutan@...> +%% Copyright (C) 19921994 Ray Muzic <rfm2@...> %% Copyright (C) 2010, 2011 Olaf Till <olaf.till@...> %% %% 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 [f,p,cvg,iter,corp,covp,covr,stdresid,Z,r2]= +%% leasqr(x,y,pin,F,{stol,niter,wt,dp,dFdp,options}) +%% +%% LevenbergMarquardt nonlinear regression of f(x,p) to y(x). +%% +%% Version 3.beta +%% Optional parameters are in braces {}. +%% x = vector or matrix of independent variables. +%% y = vector or matrix of observed values. +%% wt = statistical weights (same dimensions as y). These should be +%% set to be proportional to (sqrt of var(y))^1; (That is, the +%% covariance matrix of the data is assumed to be proportional to +%% diagonal with diagonal equal to (wt.^2)^1. The constant of +%% proportionality will be estimated.); default = ones( size (y)). +%% pin = vec of initial parameters to be adjusted by leasqr. +%% dp = fractional increment of p for numerical partial derivatives; +%% default = .001*ones(size(pin)) +%% dp(j) > 0 means central differences on jth parameter p(j). +%% dp(j) < 0 means onesided differences on jth parameter p(j). +%% dp(j) = 0 holds p(j) fixed i.e. leasqr wont change initial guess: pin(j) +%% F = name of function in quotes or function handle; the function +%% shall be of the form y=f(x,p), with y, x, p of the form y, x, pin +%% as described above. +%% dFdp = name of partial derivative function in quotes or function +%% handle; default is 'dfdp', a slow but general partial derivatives +%% function; the function shall be of the form +%% prt=dfdp(x,f,p,dp,F[,bounds]). For backwards compatibility, the +%% function will only be called with an extra 'bounds' argument if the +%% 'bounds' option is explicitely specified to leasqr (see dfdp.m). +%% stol = scalar tolerance on fractional improvement in scalar sum of +%% squares = sum((wt.*(yf))^2); default stol = .0001; +%% niter = scalar maximum number of iterations; default = 20; +%% options = structure, currently recognized fields are 'fract_prec', +%% 'max_fract_change', 'inequc', 'bounds', and 'equc'. For backwards +%% compatibility, 'options' can also be a matrix whose first and +%% second column contains the values of 'fract_prec' and +%% 'max_fract_change', respectively. +%% Field 'options.fract_prec': column vector (same length as 'pin') +%% of desired fractional precisions in parameter estimates. +%% Iterations are terminated if change in parameter vector (chg) +%% relative to current parameter estimate is less than their +%% corresponding elements in 'options.fract_prec' [ie. all (abs +%% (chg) < abs (options.fract_prec .* current_parm_est))] on two +%% consecutive iterations, default = zeros(). +%% Field 'options.max_fract_change': column vector (same length as +%% 'pin) of maximum fractional step changes in parameter vector. +%% Fractional change in elements of parameter vector is constrained to +%% be at most 'options.max_fract_change' between sucessive iterations. +%% [ie. abs(chg(i))=abs(min([chg(i) +%% options.max_fract_change(i)*current param estimate])).], default = +%% Inf*ones(). +%% Field 'options.inequc': cellarray containing up to four entries, +%% two entries for linear inequality constraints and/or one or two +%% entries for general inequality constraints. Initial parameters +%% must satisfy these constraints. Either linear or general +%% constraints may be the first entries, but the two entries for +%% linear constraints must be adjacent and, if two entries are given +%% for general constraints, they also must be adjacent. The two +%% entries for linear constraints are a matrix (say m) and a vector +%% (say v), specifying linear inequality constraints of the form +%% `m.' * parameters + v >= 0'. If the constraints are just bounds, +%% it is suggested to specify them in 'options.bounds' instead, +%% since then some sanity tests are performed, and since the +%% function 'dfdp.m' is guarantied not to violate constraints during +%% determination of the numeric gradient only for those constraints +%% specified as 'bounds' (possibly with violations due to a certain +%% inaccuracy, however, except if no constraints except bounds are +%% specified). The first entry for general constraints must be a +%% differentiable vector valued function (say h), specifying general +%% inequality constraints of the form `h (p[, idx]) >= 0'; p is the +%% column vector of optimized paraters and the optional argument idx +%% is a logical index. h has to return the values of all constraints +%% if idx is not given, and has to return only the indexed +%% constraints if idx is given (so computation of the other +%% constraints can be spared). If a second entry for general +%% constraints is given, it must be a function (say dh) which +%% returnes a matrix whos rows contain the gradients of the +%% constraint function h with respect to the optimized parameters. +%% It has the form jac_h = dh (vh, p, dp, h, idx[, bounds]); p is +%% the column vector of optimized parameters, and idx is a logical +%% index  only the rows indexed by idx must be returned (so +%% computation of the others can be spared). The other arguments of +%% dh are for the case that dh computes numerical gradients: vh is +%% the column vector of the current values of the constraint +%% function h, with idx already applied. h is a function h (p) to +%% compute the values of the constraints for parameters p, it will +%% return only the values indexed by idx. dp is a suggestion for +%% relative step width, having the same value as the argument 'dp' +%% of leasqr above. If bounds were specified to leasqr, they are +%% provided in the argument bounds of dh, to enable their +%% consideration in determination of numerical gradients. If dh is +%% not specified to leasqr, numerical gradients are computed in the +%% same way as with 'dfdp.m' (see above). If some constraints are +%% linear, they should be specified as linear constraints (or +%% bounds, if applicable) for reasons of performance, even if +%% general constraints are also specified. +%% Field 'options.bounds': twocolumnmatrix, one row for each +%% parameter in 'pin'. Each row contains a minimal and maximal value +%% for each parameter. Default: [Inf, Inf] in each row. If this +%% field is used with an existing userside function for 'dFdp' +%% (see above) the functions interface might have to be changed. +%% Field 'options.equc': equality constraints, specified the same +%% way as inequality constraints (see field 'options.inequc'). +%% Initial parameters must satisfy these constraints. +%% Note that there is possibly a certain inaccuracy in honoring +%% constraints, except if only bounds are specified. +%% _Warning_: If constraints (or bounds) are set, returned guesses +%% of corp, covp, and Z are generally invalid, even if no constraints +%% are active for the final parameters. If equality constraints are +%% specified, corp, covp, and Z are not guessed at all. +%% Field 'options.cpiv': Function for complementary pivot algorithm +%% for inequality constraints, default: cpiv_bard. No different +%% function is supplied. +%% +%% OUTPUT VARIABLES +%% f = column vector of values computed: f = F(x,p). +%% p = column vector trial or final parameters. i.e, the solution. +%% cvg = scalar: = 1 if convergence, = 0 otherwise. +%% iter = scalar number of iterations used. +%% corp = correlation matrix for parameters. +%% covp = covariance matrix of the parameters. +%% covr = diag(covariance matrix of the residuals). +%% stdresid = standardized residuals. +%% Z = matrix that defines confidence region (see comments in the source). +%% r2 = coefficient of multiple determination, intercept form. +%% +%% Not suitable for nonreal residuals. +%% +%% References: +%% Bard, Nonlinear Parameter Estimation, Academic Press, 1974. +%% Draper and Smith, Applied Regression Analysis, John Wiley and Sons, 1981. + function [f,p,cvg,iter,corp,covp,covr,stdresid,Z,r2]= ... leasqr(x,y,pin,F,stol,niter,wt,dp,dFdp,options)  %%function [f,p,cvg,iter,corp,covp,covr,stdresid,Z,r2]=  %% leasqr(x,y,pin,F,{stol,niter,wt,dp,dFdp,options})  %%  %% LevenbergMarquardt nonlinear regression of f(x,p) to y(x).  %%  %% Version 3.beta  %% Optional parameters are in braces {}.  %% x = vector or matrix of independent variables.  %% y = vector or matrix of observed values.  %% wt = statistical weights (same dimensions as y). These should be  %% set to be proportional to (sqrt of var(y))^1; (That is, the  %% covariance matrix of the data is assumed to be proportional to  %% diagonal with diagonal equal to (wt.^2)^1. The constant of  %% proportionality will be estimated.); default = ones( size (y)).  %% pin = vec of initial parameters to be adjusted by leasqr.  %% dp = fractional increment of p for numerical partial derivatives;  %% default = .001*ones(size(pin))  %% dp(j) > 0 means central differences on jth parameter p(j).  %% dp(j) < 0 means onesided differences on jth parameter p(j).  %% dp(j) = 0 holds p(j) fixed i.e. leasqr wont change initial guess: pin(j)  %% F = name of function in quotes or function handle; the function  %% shall be of the form y=f(x,p), with y, x, p of the form y, x, pin  %% as described above.  %% dFdp = name of partial derivative function in quotes or function  %% handle; default is 'dfdp', a slow but general partial derivatives  %% function; the function shall be of the form  %% prt=dfdp(x,f,p,dp,F[,bounds]). For backwards compatibility, the  %% function will only be called with an extra 'bounds' argument if the  %% 'bounds' option is explicitely specified to leasqr (see dfdp.m).  %% stol = scalar tolerance on fractional improvement in scalar sum of  %% squares = sum((wt.*(yf))^2); default stol = .0001;  %% niter = scalar maximum number of iterations; default = 20;  %% options = structure, currently recognized fields are 'fract_prec',  %% 'max_fract_change', 'inequc', 'bounds', and 'equc'. For backwards  %% compatibility, 'options' can also be a matrix whose first and  %% second column contains the values of 'fract_prec' and  %% 'max_fract_change', respectively.  %% Field 'options.fract_prec': column vector (same length as 'pin')  %% of desired fractional precisions in parameter estimates.  %% Iterations are terminated if change in parameter vector (chg)  %% relative to current parameter estimate is less than their  %% corresponding elements in 'options.fract_prec' [ie. all (abs  %% (chg) < abs (options.fract_prec .* current_parm_est))] on two  %% consecutive iterations, default = zeros().  %% Field 'options.max_fract_change': column vector (same length as  %% 'pin) of maximum fractional step changes in parameter vector.  %% Fractional change in elements of parameter vector is constrained to  %% be at most 'options.max_fract_change' between sucessive iterations.  %% [ie. abs(chg(i))=abs(min([chg(i)  %% options.max_fract_change(i)*current param estimate])).], default =  %% Inf*ones().  %% Field 'options.inequc': cellarray containing up to four entries,  %% two entries for linear inequality constraints and/or one or two  %% entries for general inequality constraints. Initial parameters  %% must satisfy these constraints. Either linear or general  %% constraints may be the first entries, but the two entries for  %% linear constraints must be adjacent and, if two entries are given  %% for general constraints, they also must be adjacent. The two  %% entries for linear constraints are a matrix (say m) and a vector  %% (say v), specifying linear inequality constraints of the form  %% `m.' * parameters + v >= 0'. If the constraints are just bounds,  %% it is suggested to specify them in 'options.bounds' instead,  %% since then some sanity tests are performed, and since the  %% function 'dfdp.m' is guarantied not to violate constraints during  %% determination of the numeric gradient only for those constraints  %% specified as 'bounds' (possibly with violations due to a certain  %% inaccuracy, however, except if no constraints except bounds are  %% specified). The first entry for general constraints must be a  %% differentiable vector valued function (say h), specifying general @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <jordigh@us...>  20120330 15:02:23

Revision: 10115 http://octave.svn.sourceforge.net/octave/?rev=10115&view=rev Author: jordigh Date: 20120330 15:02:12 +0000 (Fri, 30 Mar 2012) Log Message:  Add HDF5 linking flags Modified Paths:  trunk/octaveforge/main/fixed/src/Makefile Modified: trunk/octaveforge/main/fixed/src/Makefile ===================================================================  trunk/octaveforge/main/fixed/src/Makefile 20120330 14:27:16 UTC (rev 10114) +++ trunk/octaveforge/main/fixed/src/Makefile 20120330 15:02:12 UTC (rev 10115) @@ 1,5 +1,7 @@ sinclude Makeconf +HDF5_LIBS := $(shell grep "\#define OCTAVE_CONF_HDF5_LIBS" $(shell mkoctfile p OCTINCLUDEDIR)/octconf.h  sed "s/^.*LIBS //" ) + FIXEDVERTARGET = fixedversion.h FIXEDTARGET = fixed.oct @@ 74,7 +76,7 @@ $(FIXEDTARGET) : $(DEPENDS) $(FIXEDOBJECTS) @echo "Linking $@";  $(MKOCTFILE) $(ADD_FLAGS) $(MOFLAGS) $(FIXEDOBJECTS) $(EXTRALIBS) o $@ + $(MKOCTFILE) $(ADD_FLAGS) $(MOFLAGS) $(FIXEDOBJECTS) $(EXTRALIBS) $(HDF5_LIBS) o $@ $(FIXEDVERTARGET) : @echo "Creating $@"; $(RM) f $@; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120330 14:27:22

Revision: 10114 http://octave.svn.sourceforge.net/octave/?rev=10114&view=rev Author: carandraug Date: 20120330 14:27:16 +0000 (Fri, 30 Mar 2012) Log Message:  maint: change text file encoding to UTF8. No code change Modified Paths:  trunk/octaveforge/main/optim/inst/leasqr.m Modified: trunk/octaveforge/main/optim/inst/leasqr.m ===================================================================  trunk/octaveforge/main/optim/inst/leasqr.m 20120330 12:29:17 UTC (rev 10113) +++ trunk/octaveforge/main/optim/inst/leasqr.m 20120330 14:27:16 UTC (rev 10114) @@ 202,7 +202,7 @@ %% 8) Change to more efficent algorithm of Bard for selecting epsL. %% 9) Tighten up memory usage by making use of sparse matrices (if %% MATLAB version >= 4.0) in computation of covp, corp, stdresid.  %% Modified by Francesco Potort\xEC + %% Modified by Francesco Potortì %% for use in Octave %% Added linear inequality constraints with quadratic programming to %% this file and special case bounds to this file and to dfdp.m This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120330 12:29:23

Revision: 10113 http://octave.svn.sourceforge.net/octave/?rev=10113&view=rev Author: carandraug Date: 20120330 12:29:17 +0000 (Fri, 30 Mar 2012) Log Message:  optim: package is no longer automatically loaded Modified Paths:  trunk/octaveforge/main/optim/DESCRIPTION trunk/octaveforge/main/optim/NEWS Modified: trunk/octaveforge/main/optim/DESCRIPTION ===================================================================  trunk/octaveforge/main/optim/DESCRIPTION 20120330 12:27:14 UTC (rev 10112) +++ trunk/octaveforge/main/optim/DESCRIPTION 20120330 12:29:17 UTC (rev 10113) @@ 1,11 +1,11 @@ Name: Optim Version: 1.0.18 Date: 20111130 Author: Various Authors Maintainer: The Octave Community +Author: various authors +Maintainer: OctaveForge community <octavedev@...> Title: Optimization. Description: Nonlinear optimization toolkit. Depends: octave (>= 2.9.7), miscellaneous (>= 1.0.10), struct (>= 1.0.9) Autoload: yes +Autoload: no License: GPL version 2 or later and GFDL Url: http://octave.sf.net Modified: trunk/octaveforge/main/optim/NEWS ===================================================================  trunk/octaveforge/main/optim/NEWS 20120330 12:27:14 UTC (rev 10112) +++ trunk/octaveforge/main/optim/NEWS 20120330 12:29:17 UTC (rev 10113) @@ 17,3 +17,5 @@ deriv linprog ** The function `line_min' has a configurable setpesize and max evals + + ** Package is no longer automatically loaded. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120330 12:27:20

Revision: 10112 http://octave.svn.sourceforge.net/octave/?rev=10112&view=rev Author: carandraug Date: 20120330 12:27:14 +0000 (Fri, 30 Mar 2012) Log Message:  optim: update NEWS file Modified Paths:  trunk/octaveforge/main/optim/NEWS Modified: trunk/octaveforge/main/optim/NEWS ===================================================================  trunk/octaveforge/main/optim/NEWS 20120330 11:56:24 UTC (rev 10111) +++ trunk/octaveforge/main/optim/NEWS 20120330 12:27:14 UTC (rev 10112) @@ 1,9 +1,19 @@ Summary of important uservisible changes for optim 1.1.0:  + ** The following functions are new optim 1.1.0: + + powell + ** The following functions have been deprecated since they have been implemented in Octave core: fminunc_compat optimset_compat ** The package Makefile has been adapted for compatibility with Octave 3.6.0. + + ** Bugfixes on the functions: + + deriv linprog + + ** The function `line_min' has a configurable setpesize and max evals This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120330 11:56:35

Revision: 10111 http://octave.svn.sourceforge.net/octave/?rev=10111&view=rev Author: carandraug Date: 20120330 11:56:24 +0000 (Fri, 30 Mar 2012) Log Message:  optim: mention deprecated functions on NEWS and make warning appear only once per session Modified Paths:  trunk/octaveforge/main/optim/NEWS trunk/octaveforge/main/optim/inst/fminunc_compat.m trunk/octaveforge/main/optim/inst/optimset_compat.m Modified: trunk/octaveforge/main/optim/NEWS ===================================================================  trunk/octaveforge/main/optim/NEWS 20120330 11:10:16 UTC (rev 10110) +++ trunk/octaveforge/main/optim/NEWS 20120330 11:56:24 UTC (rev 10111) @@ 1,6 +1,9 @@ Summary of important uservisible changes for optim 1.0.18: +Summary of important uservisible changes for optim 1.1.0:   ** The package makefile has been adapted for compatibility with Octave 3.6.0. + ** The following functions have been deprecated since they have been + implemented in Octave core:  ** There is now a 'NEWS' file. + fminunc_compat optimset_compat + + ** The package Makefile has been adapted for compatibility with Octave 3.6.0. Modified: trunk/octaveforge/main/optim/inst/fminunc_compat.m ===================================================================  trunk/octaveforge/main/optim/inst/fminunc_compat.m 20120330 11:10:16 UTC (rev 10110) +++ trunk/octaveforge/main/optim/inst/fminunc_compat.m 20120330 11:56:24 UTC (rev 10111) @@ 42,9 +42,15 @@ ## the 'backend' option of minimize(). ## ## This function is a frontend to minimize(). + function [x,fval,flag,out,df,d2f] = fminunc_compat (fun,x0,opt,varargin)  warning ("'fminunc_compat' has been deprecated in favor of 'fminunc', which is now part of core Octave. This function will possibly be removed from future versions of the 'optim' package."); + persistent warned = false; + if (! warned) + warned = true; + warning ("Octave:deprecatedfunction", + "`fminunc_compat' has been deprecated, and will be removed in the future. Use `fminunc' from Octave core instead."); + endif if nargin < 3, opt = struct (); end if nargin > 3, Modified: trunk/octaveforge/main/optim/inst/optimset_compat.m ===================================================================  trunk/octaveforge/main/optim/inst/optimset_compat.m 20120330 11:10:16 UTC (rev 10110) +++ trunk/octaveforge/main/optim/inst/optimset_compat.m 20120330 11:56:24 UTC (rev 10111) @@ 41,7 +41,12 @@ ## Display , ["off","iter","notify","final"] ## : N/A  warning ("'optimset_compat' has been deprecated in favor of 'optimset', which is now part of core Octave. This function will possibly be removed from future versions of the 'optim' package."); + persistent warned = false; + if (! warned) + warned = true; + warning ("Octave:deprecatedfunction", + "`optimset_compat' has been deprecated, and will be removed in the future. Use `optimset' from Octave core instead."); + endif args = varargin; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120330 11:10:30

Revision: 10110 http://octave.svn.sourceforge.net/octave/?rev=10110&view=rev Author: carandraug Date: 20120330 11:10:16 +0000 (Fri, 30 Mar 2012) Log Message:  optiminterp: update license to GPLv3+ and added copyright notice to missing files Modified Paths:  trunk/octaveforge/main/optiminterp/COPYING trunk/octaveforge/main/optiminterp/DESCRIPTION trunk/octaveforge/main/optiminterp/INDEX trunk/octaveforge/main/optiminterp/inst/example_optiminterp.m trunk/octaveforge/main/optiminterp/inst/optiminterp1.m trunk/octaveforge/main/optiminterp/inst/optiminterp2.m trunk/octaveforge/main/optiminterp/inst/optiminterp3.m trunk/octaveforge/main/optiminterp/inst/optiminterp4.m trunk/octaveforge/main/optiminterp/inst/optiminterpn.m trunk/octaveforge/main/optiminterp/inst/test_optiminterp.m trunk/octaveforge/main/optiminterp/inst/test_optiminterp_err.m trunk/octaveforge/main/optiminterp/inst/test_optiminterp_mult.m trunk/octaveforge/main/optiminterp/src/example_optiminterp.F90 trunk/octaveforge/main/optiminterp/src/optimal_interpolation.F90 trunk/octaveforge/main/optiminterp/src/optiminterp.cc trunk/octaveforge/main/optiminterp/src/optiminterp_wrapper.F90 Modified: trunk/octaveforge/main/optiminterp/COPYING ===================================================================  trunk/octaveforge/main/optiminterp/COPYING 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/COPYING 20120330 11:10:16 UTC (rev 10110) @@ 1,300 +1,642 @@  GNU GENERAL PUBLIC LICENSE  Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007  Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org>; + Copyright (C) 2007 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 + 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 softwareto 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 Lesser General Public License instead.) You can apply it to + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a programto make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. 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. +them 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. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. 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. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. 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. + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it.  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. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions.  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. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on generalpurpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program nonfree. + The precise terms and conditions for copying, distribution and modification follow.  GNU GENERAL PUBLIC LICENSE  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + TERMS AND CONDITIONS  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". + 0. Definitions. 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. + "This License" refers to version 3 of the GNU General Public License.  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. + "Copyright" also means copyrightlike laws that apply to other kinds of +works, such as semiconductor masks. 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. + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations.  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: + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work.  a) You must cause the modified files to carry prominent notices  stating that you changed the files and the date of any change. + A "covered work" means either the unmodified Program or a work based +on the Program.  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. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well.  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.) + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. 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. + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. 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. + 1. Source Code. 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. + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any nonsource +form of a work.  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 "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language.  a) Accompany it with the complete corresponding machinereadable  source code, which must be distributed under the terms of Sections  1 and 2 above on a medium customarily used for software interchange; or, + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it.  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  machinereadable 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, + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or generalpurpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work.  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 Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. 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. + The Corresponding Source for a work in source code form is that +same work. 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. + 2. Basic Permissions.  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. + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law.  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. + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you.  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 + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From AntiCircumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; +keep intact all notices stating that this License and any +nonpermissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying NonSource Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machinereadable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peertopeer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or nonconsumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other nonpermissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or nonpermissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peertopeer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a crossclaim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of 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 + Each contributor grants you a nonexclusive, worldwide, royaltyfree +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the nonexercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 royaltyfree 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. +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying 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. + 13. Use with the GNU Affero General Public License. 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. + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + 14. Revised Versions 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 + The Free Software Foundation may publish revised and/or new versions of +the GNU 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. + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public 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. + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program.  NO WARRANTY + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version.  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. + 15. Disclaimer of Warranty.  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. + 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.  END OF TERMS AND CONDITIONS + 16. Limitation of Liability.  How to Apply These Terms to Your New Programs + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +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. + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + 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 +state 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 + 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 + 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, @@ 302,36 +644,31 @@ 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/>;. 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: + If the program does terminal interaction, 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'. + <program> Copyright (C) <year> <name of author> + This program 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 mouseclicks or menu itemswhatever suits your program. +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". 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: + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>;.  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 Lesser General Public License instead of this License. + The GNU 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 Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/whynotlgpl.html>;. Modified: trunk/octaveforge/main/optiminterp/DESCRIPTION ===================================================================  trunk/octaveforge/main/optiminterp/DESCRIPTION 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/DESCRIPTION 20120330 11:10:16 UTC (rev 10110) @@ 7,5 +7,5 @@ Description: An optimal interpolation toolbox for octave. This package provides functions to perform a ndimensional optimal interpolations of arbitrarily distributed data points. Depends: octave (>= 2.9.9) Autoload: yes License: GPL version 2 or later +License: GPLv3+ Url: http://octave.sf.net Modified: trunk/octaveforge/main/optiminterp/INDEX ===================================================================  trunk/octaveforge/main/optiminterp/INDEX 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/INDEX 20120330 11:10:16 UTC (rev 10110) @@ 1,6 +1,6 @@ optiminterp >> OptimInterp OptimInterp  optiminterp1 + optiminterp1 optiminterp2 optiminterp3 optiminterp4 Modified: trunk/octaveforge/main/optiminterp/inst/example_optiminterp.m ===================================================================  trunk/octaveforge/main/optiminterp/inst/example_optiminterp.m 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/inst/example_optiminterp.m 20120330 11:10:16 UTC (rev 10110) @@ 1,17 +1,17 @@ %% Copyright (C) 2008 Alexander Barth +%% Copyright (C) 2008 Alexander Barth <barth.alexander@...> %% %% 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/>;. % Example program of the optimal interpolation toolbox @@ 64,4 +64,4 @@ % Add the first guess back xa = fi + xb; \ No newline at end of file +xa = fi + xb; Modified: trunk/octaveforge/main/optiminterp/inst/optiminterp1.m ===================================================================  trunk/octaveforge/main/optiminterp/inst/optiminterp1.m 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/inst/optiminterp1.m 20120330 11:10:16 UTC (rev 10110) @@ 1,17 +1,17 @@ ## Copyright (C) 2006 Alexander Barth +## Copyright (C) 2006 Alexander Barth <barth.alexander@...> ## ## 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/>;. ## * texinfo * ## @deftypefn {Loadable Function} {[@var{fi},@var{vari}]} = optiminterp1(@var{x},@var{f},@var{var},@var{lenx},@var{m},@var{xi}) @@ 34,8 +34,8 @@ ## background is added back to the interpolated field. ## @end deftypefn +function [fi,vari] = optiminterp1(x,f,var,lenx,m,xi) + [fi,vari] = optiminterpn(x,f,var,lenx,m,xi); function [fi,vari] = optiminterp1(x,f,var,lenx,m,xi)  [fi,vari] = optiminterpn(x,f,var,lenx,m,xi); +endfunction Modified: trunk/octaveforge/main/optiminterp/inst/optiminterp2.m ===================================================================  trunk/octaveforge/main/optiminterp/inst/optiminterp2.m 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/inst/optiminterp2.m 20120330 11:10:16 UTC (rev 10110) @@ 1,17 +1,17 @@ ## Copyright (C) 2006 Alexander Barth +## Copyright (C) 2006 Alexander Barth <barth.alexander@...> ## ## 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/>;. ## * texinfo * ## @deftypefn {Loadable Function} {[@var{fi},@var{vari}] = } optiminterp2(@var{x},@var{y},@var{f},@var{var},@var{lenx},@var{leny},@var{m},@var{xi},@var{yi}) @@ 37,9 +37,8 @@ ## have a error variance of one. ## @end deftypefn ## Copyright (C) 2006, Alexander Barth ## Author: Alexander Barth <barth.alexander@...>  function [fi,vari] = optiminterp2(x,y,f,var,lenx,leny,m,xi,yi) [fi,vari] = optiminterpn(x,y,f,var,lenx,leny,m,xi,yi); + [fi,vari] = optiminterpn(x,y,f,var,lenx,leny,m,xi,yi); + +endfunction Modified: trunk/octaveforge/main/optiminterp/inst/optiminterp3.m ===================================================================  trunk/octaveforge/main/optiminterp/inst/optiminterp3.m 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/inst/optiminterp3.m 20120330 11:10:16 UTC (rev 10110) @@ 1,17 +1,17 @@ ## Copyright (C) 2006 Alexander Barth +## Copyright (C) 2006 Alexander Barth <barth.alexander@...> ## ## 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/>;. ## * texinfo * ## @deftypefn {Loadable Function} {[@var{fi},@var{vari}] = } optiminterp3(@var{x},@var{y},@var{z},@var{f},@var{var},@var{lenx},@var{leny},@var{lenz},@var{m},@var{xi},@var{yi},@var{zi}) @@ 39,9 +39,8 @@ ## have a error variance of one. ## @end deftypefn ## Copyright (C) 2006, Alexander Barth ## Author: Alexander Barth <barth.alexander@...>  function [fi,vari] = optiminterp3(x,y,z,f,var,lenx,leny,lenz,m,xi,yi,zi) [fi,vari] = optiminterpn(x,y,z,f,var,lenx,leny,lenz,m,xi,yi,zi); + [fi,vari] = optiminterpn(x,y,z,f,var,lenx,leny,lenz,m,xi,yi,zi); + +endfunction Modified: trunk/octaveforge/main/optiminterp/inst/optiminterp4.m ===================================================================  trunk/octaveforge/main/optiminterp/inst/optiminterp4.m 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/inst/optiminterp4.m 20120330 11:10:16 UTC (rev 10110) @@ 1,17 +1,18 @@ ## Copyright (C) 2007 Aida AlveraAzcárate +## Copyright (C) 2007 Aida AlveraAzcárate <aalvera@...> +## Copyright (C) 2007 Alexander Barth <barth.alexander@...> ## ## 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/>;. ## * texinfo * ## @deftypefn {Loadable Function} {[@var{fi},@var{vari}] = } optiminterp4(@var{x},@var{y},@var{z},@var{t},@var{f},@var{var},@var{lenx},@var{leny},@var{lenz},@var{lent},@var{m},@var{xi},@var{yi},@var{zi},@var{ti}) @@ 39,10 +40,8 @@ ## have a error variance of one. ## @end deftypefn ## Copyright (C) 2007 Aida AlveraAzcárate ## Author: Aida AlveraAzcárate <aalvera@...> ## Author: Alexander Barth <barth.alexander@...>  function [fi,vari] = optiminterp4(x,y,z,t,f,var,lenx,leny,lenz,lent,m,xi,yi,zi,ti) [fi,vari] = optiminterpn(x,y,z,t,f,var,lenx,leny,lenz,lent,m,xi,yi,zi,ti); + [fi,vari] = optiminterpn(x,y,z,t,f,var,lenx,leny,lenz,lent,m,xi,yi,zi,ti); + +endfunction Modified: trunk/octaveforge/main/optiminterp/inst/optiminterpn.m ===================================================================  trunk/octaveforge/main/optiminterp/inst/optiminterpn.m 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/inst/optiminterpn.m 20120330 11:10:16 UTC (rev 10110) @@ 1,30 +1,30 @@ ## Copyright (C) 2008 Alexander Barth +## Copyright (C) 2008 Alexander Barth <barth.alexander@...> ## ## 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/>;. ## * texinfo * ## @deftypefn {Loadable Function} {[@var{fi},@var{vari}] = } optiminterpn(@var{x},@var{y},@var{...},@var{f},@var{var},@var{lenx},@var{leny},@var{...},@var{m},@var{xi},@var{yi},@var{...}) +## @deftypefn {Loadable Function} {[@var{fi},@var{vari}] = } optiminterpn(@var{x},@var{y},@dots{},@var{f},@var{var},@var{lenx},@var{leny},@dots{},@var{m},@var{xi},@var{yi},@dots{}) ## Performs a local nDoptimal interpolation (objective analysis). ## ## Every elements in @var{f} corresponds to a data point (observation) ## at location @var{x},@var{y},@var{...} with the error variance @var{var}. +## at location @var{x},@var{y},@dots{} with the error variance @var{var}. ## ## @var{lenx},@var{leny},@var{...} are correlation length in xdirection +## @var{lenx},@var{leny},@dots{} are correlation length in xdirection ## ydirection,... respectively. ## @var{m} represents the number of influential points. ## ## @var{xi},@var{yi},@var{...} are the data points where the field is +## @var{xi},@var{yi},@dots{} are the data points where the field is ## interpolated. @var{fi} is the interpolated field and @var{vari} is ## its error variance. ## @@ 37,11 +37,6 @@ ## have a error variance of one. ## @end deftypefn ## Copyright (C) 2008, Alexander Barth ## Author: Alexander Barth <barth.alexander@...>  # {[@var{fi},@var{vari}] = } optiminterpn(@var{x},@var{y},@var{...},@var{f},@var{var},@var{lenx},@var{leny},@var{len...},@var{m},@var{xi},@var{yi},@var{...})  function [fi,vari] = optiminterpn(varargin) if nargin < 6  mod(nargin3,3) ~= 0 Modified: trunk/octaveforge/main/optiminterp/inst/test_optiminterp.m ===================================================================  trunk/octaveforge/main/optiminterp/inst/test_optiminterp.m 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/inst/test_optiminterp.m 20120330 11:10:16 UTC (rev 10110) @@ 1,3 +1,18 @@ +%% Copyright (C) 2006 Alexander Barth <barth.alexander@...> +%% +%% 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/>;. + % Tests 1D, 2D and 3D optimal interpolation. % All tests should pass; any error indicates that either % there is a bug in the optimal interpolation package or Modified: trunk/octaveforge/main/optiminterp/inst/test_optiminterp_err.m ===================================================================  trunk/octaveforge/main/optiminterp/inst/test_optiminterp_err.m 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/inst/test_optiminterp_err.m 20120330 11:10:16 UTC (rev 10110) @@ 1,3 +1,18 @@ +%% Copyright (C) 2006 Alexander Barth <barth.alexander@...> +%% +%% 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/>;. + % Tests 2D optimal interpolation and compares result % (analysis and error field) to global OI solution Modified: trunk/octaveforge/main/optiminterp/inst/test_optiminterp_mult.m ===================================================================  trunk/octaveforge/main/optiminterp/inst/test_optiminterp_mult.m 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/inst/test_optiminterp_mult.m 20120330 11:10:16 UTC (rev 10110) @@ 1,3 +1,18 @@ +%% Copyright (C) 2006 Alexander Barth <barth.alexander@...> +%% +%% 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/>;. + % Tests 1D, 2D and 3D optimal interpolation. % All tests should pass; any error indicates that either % there is a bug in the optimal interpolation package or Modified: trunk/octaveforge/main/optiminterp/src/example_optiminterp.F90 ===================================================================  trunk/octaveforge/main/optiminterp/src/example_optiminterp.F90 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/src/example_optiminterp.F90 20120330 11:10:16 UTC (rev 10110) @@ 1,22 +1,19 @@ ! ! Example for using the ndimentional optimal interpolation Fortran module ! Copyright (C) 2005 Alexander Barth <barth.alexander@...> ! ! 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/>;. ! +!! Copyright (C) 2005 Alexander Barth <barth.alexander@...> +!! +!! 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/>;. ! Author: Alexander Barth <barth.alexander@...> +!! Example for using the ndimentional optimal interpolation Fortran module program test_optiminterp use optimal_interpolation Modified: trunk/octaveforge/main/optiminterp/src/optimal_interpolation.F90 ===================================================================  trunk/octaveforge/main/optiminterp/src/optimal_interpolation.F90 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/src/optimal_interpolation.F90 20120330 11:10:16 UTC (rev 10110) @@ 1,30 +1,23 @@ +!! Copyright (C) 2005 Alexander Barth <barth.alexander@...> +!! Copyright (C) 2006 David Saunders (NASA Ames Research Center) +!! Copyright (C) 2008 Gian Franco Marras (CINECA) <g.marras@...> +!! +!! 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/>;. ! Fortran 90 module for ndimensional optimal interpolation. ! Copyright (C) 2005 Alexander Barth <barth.alexander@...> ! ! 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/>;. ! +!! Fortran 90 module for ndimensional optimal interpolation. +!! Dependencies: LAPACK (dsyev) ! Author: Alexander Barth <a.barth at ulg.ac.be> ! Dependencies: LAPACK (dsyev)  ! David Saunders (NASA Ames Research Center) ! optimizations and code cleanup  ! Gian Franco Marras (CINECA) <g.marras at cineca.it> ! fix OPENMP directive  #define DIAG_OBS_COVAR module optimal_interpolation ! working precision Modified: trunk/octaveforge/main/optiminterp/src/optiminterp.cc ===================================================================  trunk/octaveforge/main/optiminterp/src/optiminterp.cc 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/src/optiminterp.cc 20120330 11:10:16 UTC (rev 10110) @@ 1,25 +1,20 @@ /*  ndimensional optimal interpolation  Copyright (C) 2005 Alexander Barth <barth.alexander@...> +// Copyright (C) 2005 Alexander Barth <barth.alexander@...> +// +// 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/>;.  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. +// ndimensional optimal interpolation  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/>;.    Author: Alexander Barth <barth.alexander@...> */   #include <octave/oct.h> #include "f77fcn.h" Modified: trunk/octaveforge/main/optiminterp/src/optiminterp_wrapper.F90 ===================================================================  trunk/octaveforge/main/optiminterp/src/optiminterp_wrapper.F90 20120330 09:48:55 UTC (rev 10109) +++ trunk/octaveforge/main/optiminterp/src/optiminterp_wrapper.F90 20120330 11:10:16 UTC (rev 10110) @@ 1,22 +1,19 @@ ! ! ndimentional optimal interpolation ! Copyright (C) 2005 Alexander Barth <barth.alexander@...> ! ! 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/>;. ! +!! Copyright (C) 2005 Alexander Barth <barth.alexander@...> +!! +!! 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/>;. ! Author: Alexander Barth <barth.alexander@...> +!! ndimentional optimal interpolation subroutine optiminterpwrapper(n,nf,gn,on,nparam,ox,of,ovar, & param,m,gx,gf,gvar) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <cdf@us...>  20120330 09:49:02

Revision: 10109 http://octave.svn.sourceforge.net/octave/?rev=10109&view=rev Author: cdf Date: 20120330 09:48:55 +0000 (Fri, 30 Mar 2012) Log Message:  avoid compiler warning Modified Paths:  trunk/octaveforge/extra/nurbs/src/nrb_srf_basisfun__.cc trunk/octaveforge/extra/nurbs/src/nrb_srf_basisfun_der__.cc Modified: trunk/octaveforge/extra/nurbs/src/nrb_srf_basisfun__.cc ===================================================================  trunk/octaveforge/extra/nurbs/src/nrb_srf_basisfun__.cc 20120330 08:44:19 UTC (rev 10108) +++ trunk/octaveforge/extra/nurbs/src/nrb_srf_basisfun__.cc 20120330 09:48:55 UTC (rev 10109) @@ 34,10 +34,10 @@ const Cell knots = nrb.contents("knots")(0).cell_value(); const NDArray coefs = nrb.contents("coefs")(0).array_value();  octave_idx_type m = (nrb.contents("number")(0).vector_value())(0)  1; // m = size (nrb.coefs, 2) 1;  octave_idx_type n = (nrb.contents("number")(0).vector_value())(1)  1; // n = size (nrb.coefs, 3) 1;  octave_idx_type p = (nrb.contents("order")(0).vector_value())(0)  1; // p = nrb.order(1) 1;  octave_idx_type q = (nrb.contents("order")(0).vector_value())(1)  1; // q = nrb.order(2) 1; + octave_idx_type m = static_cast<octave_idx_type> ((nrb.contents("number")(0).vector_value())(0))  1; // m = size (nrb.coefs, 2) 1; + octave_idx_type n = static_cast<octave_idx_type> ((nrb.contents("number")(0).vector_value())(1))  1; // n = size (nrb.coefs, 3) 1; + octave_idx_type p = static_cast<octave_idx_type> ((nrb.contents("order")(0).vector_value())(0))  1; // p = nrb.order(1) 1; + octave_idx_type q = static_cast<octave_idx_type> ((nrb.contents("order")(0).vector_value())(1))  1; // q = nrb.order(2) 1; Array<idx_vector> idx(dim_vector (2, 1), idx_vector(':')); idx(0) = 0; @@ 95,15 +95,21 @@ for (octave_idx_type k(0); k < npt; k++) for (octave_idx_type ii(0); ii < p+1; ii++) for (octave_idx_type jj(0); jj < q+1; jj++)  denom(k) += NuIkuk(k, ii) * NvJkvk(k, jj) * w(Ik(k, ii), Jk(k, jj)); + denom(k) += NuIkuk(k, ii) * NvJkvk(k, jj) * + w(static_cast<octave_idx_type> (Ik(k, ii)), + static_cast<octave_idx_type> (Jk(k, jj))); for (octave_idx_type k(0); k < npt; k++) for (octave_idx_type ii(0); ii < p+1; ii++) for (octave_idx_type jj(0); jj < q+1; jj++) {  RIkJk(k, octave_idx_type(ii+(p+1)*jj)) = NuIkuk(k, ii)*NvJkvk(k, jj) * w(Ik(k, ii), Jk(k, jj))/denom(k);  indIkJk(k, octave_idx_type(ii+(p+1)*jj))= Ik(k, ii)+(m+1)*Jk(k, jj)+1; + + RIkJk(k, octave_idx_type(ii+(p+1)*jj)) = NuIkuk(k, ii) * NvJkvk(k, jj) * + w(static_cast<octave_idx_type> (Ik(k, ii)), static_cast<octave_idx_type> (Jk(k, jj))) + / denom(k); + + indIkJk(k, octave_idx_type(ii+(p+1)*jj))= Ik(k, ii) + (m+1) * Jk(k, jj) + 1; } // for k=1:npt Modified: trunk/octaveforge/extra/nurbs/src/nrb_srf_basisfun_der__.cc ===================================================================  trunk/octaveforge/extra/nurbs/src/nrb_srf_basisfun_der__.cc 20120330 08:44:19 UTC (rev 10108) +++ trunk/octaveforge/extra/nurbs/src/nrb_srf_basisfun_der__.cc 20120330 09:48:55 UTC (rev 10109) @@ 34,10 +34,10 @@ { const Cell knots = nrb.contents("knots")(0).cell_value(); const NDArray coefs = nrb.contents("coefs")(0).array_value();  octave_idx_type m = (nrb.contents("number")(0).vector_value())(0)  1; // m = size (nrb.coefs, 2) 1;  octave_idx_type n = (nrb.contents("number")(0).vector_value())(1)  1; // n = size (nrb.coefs, 3) 1;  octave_idx_type p = (nrb.contents("order")(0).vector_value())(0)  1; // p = nrb.order(1) 1;  octave_idx_type q = (nrb.contents("order")(0).vector_value())(1)  1; // q = nrb.order(2) 1; + octave_idx_type m = static_cast<octave_idx_type> ((nrb.contents("number")(0).vector_value())(0))  1; // m = size (nrb.coefs, 2) 1; + octave_idx_type n = static_cast<octave_idx_type> ((nrb.contents("number")(0).vector_value())(1))  1; // n = size (nrb.coefs, 3) 1; + octave_idx_type p = static_cast<octave_idx_type> ((nrb.contents("order")(0).vector_value())(0))  1; // p = nrb.order(1) 1; + octave_idx_type q = static_cast<octave_idx_type> ((nrb.contents("order")(0).vector_value())(1))  1; // q = nrb.order(2) 1; Array<idx_vector> idx(dim_vector (2, 1), idx_vector(':')); idx(0) = 0; @@ 111,14 +111,21 @@ for (octave_idx_type ii(0); ii < p+1; ii++) for (octave_idx_type jj(0); jj < q+1; jj++) {  Num(k, ii+jj*(p+1)) = NuIkuk(k, ii) * NvJkvk(k, jj) * w(Ik(k, ii), Jk(k, jj)); + Num(k, ii+jj*(p+1)) = NuIkuk(k, ii) * NvJkvk(k, jj) * + w(static_cast<octave_idx_type> (Ik(k, ii)), + static_cast<octave_idx_type> (Jk(k, jj))); Denom(k) += Num(k, ii+jj*(p+1));  Num_du(k, ii+jj*(p+1)) = NuIkukprime(k, 1, ii) * NvJkvk(k, jj) * w(Ik(k, ii), Jk(k, jj)); + Num_du(k, ii+jj*(p+1)) = NuIkukprime(k, 1, ii) * NvJkvk(k, jj) * + w(static_cast<octave_idx_type> (Ik(k, ii)), + static_cast<octave_idx_type> (Jk(k, jj))); Denom_du(k) += Num_du(k, ii+jj*(p+1));  Num_dv(k, ii+jj*(p+1)) = NuIkuk(k, ii) * NvJkvkprime(k, 1, jj) * w(Ik(k, ii), Jk(k, jj));  Denom_dv(k) += Num_dv(k, ii+jj*(p+1)); + Num_dv(k, ii+jj*(p+1)) = NuIkuk(k, ii) * NvJkvkprime(k, 1, jj) * + w(static_cast<octave_idx_type> (Ik(k, ii)), + static_cast<octave_idx_type> (Jk(k, jj))); + + Denom_dv(k) += Num_dv(k, ii + jj * (p+1)); } for (octave_idx_type k(0); k < npt; k++) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <schloegl@us...>  20120330 08:44:26

Revision: 10108 http://octave.svn.sourceforge.net/octave/?rev=10108&view=rev Author: schloegl Date: 20120330 08:44:19 +0000 (Fri, 30 Mar 2012) Log Message:  initial import of Martin Billinger's code Added Paths:  trunk/octaveforge/extra/tsa/src/kalman_maar.cpp trunk/octaveforge/extra/tsa/src/kalman_maar.h Added: trunk/octaveforge/extra/tsa/src/kalman_maar.cpp ===================================================================  trunk/octaveforge/extra/tsa/src/kalman_maar.cpp (rev 0) +++ trunk/octaveforge/extra/tsa/src/kalman_maar.cpp 20120330 08:44:19 UTC (rev 10108) @@ 0,0 +1,219 @@ +// Copyright by Martin Billinger + +// 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., 59 Temple +// Place  Suite 330, Boston, MA 021111307, USA. + +#include "mex.h" +#include "memory.h" + +#ifndef WIN32 +#include "blas.h" +#include "lapack.h" +#endif + +#include "kalman_maar.h" + +// input to the matlab function. for convenience elements +// can be accessed by name as well as array element. +union mexin +{ + struct { + const mxArray *y, *p, *UC, *Kalman, *mode; + }; + const mxArray *list[5]; +}; + +// output of the matlab function. for convenience elements +// can be accessed by name as well as array element. +union mexout +{ + struct { + mxArray *x, *e, *Kalman; + }; + mxArray *list[3]; +}; + +struct mxKalman +{ + mxArray *G, *H, *Kp, *Q1, *Q2, *errCov, *x, *yr; + struct Kalman pointers; +}; + +// true when persistent variables are initialized +static bool initialized = false; + +// holds persistent variables used by the MVAAR algorithm +static Kalman_Helper *kh = NULL; + +// parameters +int M = 0, L = 0, p = 0; + +void initialize( ptrdiff_t M, ptrdiff_t p ) +{ + mexPrintf( "Initializing Persistent variables.\n" ); + kh = new Kalman_Helper( M, p ); + initialized = true; +} + +void cleanup( ) +{ + mexPrintf( "Destroying Persistent variables.\n" ); + delete kh; + kh = NULL; + initialized = false; +} + +void mexFunction( + int nlhs, mxArray *plhs[], // output + int nrhs, const mxArray *prhs[] ) // input +{ + union mexin in; + union mexout out; + struct mxKalman inKalman, outKalman; + + // some pointers for various uses + double *tmp1, *tmp2, *tmp3; + + int n; + double UC; + double *y, *err; + double mode; + + if( nrhs < 3 ) + mexErrMsgTxt( "Not enough input arguments" ); + + if( nrhs > 5 ) + mexErrMsgTxt( "Too many input arguments" ); + + for( n=0; n<nrhs; n++ ) + in.list[n] = prhs[n]; + + if( nrhs < 5 ) + mode = 7; + else + mode = *mxGetPr( in.mode ); + + y = mxGetPr( in.y ); + + // if any parameters is changed the persistent variables have to be + // initialized anew to accomodate for eventually changed memory requirements + if( ( p!=(int)mxGetPr(in.p)[0] )  ( M!=mxGetN(in.y) ) ) + if( initialized ) + cleanup( ); + + if( !initialized ) + { + p = (int)mxGetPr(in.p)[0]; + M = mxGetN( in.y ); + L = M*M*p; + initialize( M, p ); + mexAtExit( cleanup ); + } + + UC = mxGetPr( in.UC )[0]; + + // create output variables + { // (in C variables can only be declared et the beginning of a block) + const char *fieldnames[8] = { "G", "H", "Kp", "Q1", "Q2", "errCov", "x", "yr" }; + plhs[0] = mxCreateDoubleMatrix( 1, L, mxREAL ); // x + plhs[1] = mxCreateDoubleMatrix( 1, M, mxREAL ); // err + plhs[2] = mxCreateStructMatrix( 1, 1, 8, fieldnames ); // Kalman + } + + for( n=0; n<3; n++ ) + out.list[n] = plhs[n]; + + err = mxGetPr( out.e ); + + if( nrhs == 3 ) // no filterstate argument given. initialize filter + { + printf( "Initialising Kalman Filter\n" ); + outKalman.G = mxCreateDoubleMatrix( L, M, mxREAL ); + outKalman.H = mxCreateDoubleMatrix( M, L, mxREAL ); + outKalman.Kp = eye( L, 1.0 ); + outKalman.Q1 = eye( L, UC ); + outKalman.Q2 = eye( M, 1.0 ); + outKalman.errCov = eye( M, 1.0 ); + outKalman.x = mxCreateDoubleMatrix(L,1,mxREAL); + outKalman.yr = mxCreateDoubleMatrix(1,M*p,mxREAL); + + // Kalman.yr = [y(:)' zeros(1,M*(p1))]; + // err = y; + /*tmp1 = mxGetPr( in.y ); + tmp2 = mxGetPr( outKalman.yr ); + tmp3 = mxGetPr( out.e ); + for( n=0; n<M; n++ ) + { + *(tmp2++) = *(tmp1); + *(tmp3++) = *(tmp1++); + }*/ + } + else + { + // extract filterstate from input data + inKalman.G = mxGetField( in.Kalman, 0, "G" ); + inKalman.H = mxGetField( in.Kalman, 0, "H" ); + inKalman.Kp = mxGetField( in.Kalman, 0, "Kp" ); + inKalman.Q1 = mxGetField( in.Kalman, 0, "Q1" ); + inKalman.Q2 = mxGetField( in.Kalman, 0, "Q2" ); + inKalman.errCov = mxGetField( in.Kalman, 0, "errCov" ); + inKalman.x = mxGetField( in.Kalman, 0, "x" ); + inKalman.yr = mxGetField( in.Kalman, 0, "yr" ); + + // set pointers + inKalman.pointers.G = mxGetPr( inKalman.G ); + inKalman.pointers.H = mxGetPr( inKalman.H ); + inKalman.pointers.Kp = mxGetPr( inKalman.Kp ); + inKalman.pointers.Q1 = mxGetPr( inKalman.Q1 ); + inKalman.pointers.Q2 = mxGetPr( inKalman.Q2 ); + inKalman.pointers.errCov = mxGetPr( inKalman.errCov ); + inKalman.pointers.x = mxGetPr( inKalman.x ); + inKalman.pointers.yr = mxGetPr( inKalman.yr ); + + // initialize filterstate output + outKalman.G = mxCreateDoubleMatrix( L, M, mxREAL ); + outKalman.H = mxCreateDoubleMatrix( M, L, mxREAL ); + outKalman.Kp = mxCreateDoubleMatrix(L, L, mxREAL ); + outKalman.Q1 = mxCreateDoubleMatrix(L, L, mxREAL ); + outKalman.Q2 = mxCreateDoubleMatrix(M, M, mxREAL ); + outKalman.errCov = mxCreateDoubleMatrix(M, M, mxREAL ); + outKalman.x = mxCreateDoubleMatrix( L, 1, mxREAL ); + outKalman.yr = mxCreateDoubleMatrix(1,M*p,mxREAL ); + + // set pointers + outKalman.pointers.G = mxGetPr( outKalman.G ); + outKalman.pointers.H = mxGetPr( outKalman.H ); + outKalman.pointers.Kp = mxGetPr( outKalman.Kp ); + outKalman.pointers.Q1 = mxGetPr( outKalman.Q1 ); + outKalman.pointers.Q2 = mxGetPr( outKalman.Q2 ); + outKalman.pointers.errCov = mxGetPr( outKalman.errCov ); + outKalman.pointers.x = mxGetPr( outKalman.x ); + outKalman.pointers.yr = mxGetPr( outKalman.yr ); + + // filtering step + kalman_maar( err, y, UC, M, L, p, + &inKalman.pointers, &outKalman.pointers, kh, mode ); + } + + // x = Kalman.x' + memcpy( mxGetPr( out.x ), mxGetPr( outKalman.x ), L*sizeof(double) ); + + mxSetField( out.Kalman, 0, "G", outKalman.G ); + mxSetField( out.Kalman, 0, "H", outKalman.H ); + mxSetField( out.Kalman, 0, "Kp", outKalman.Kp ); + mxSetField( out.Kalman, 0, "Q1", outKalman.Q1 ); + mxSetField( out.Kalman, 0, "Q2", outKalman.Q2 ); + mxSetField( out.Kalman, 0, "errCov", outKalman.errCov ); + mxSetField( out.Kalman, 0, "x", outKalman.x ); + mxSetField( out.Kalman, 0, "yr", outKalman.yr ); +} Added: trunk/octaveforge/extra/tsa/src/kalman_maar.h ===================================================================  trunk/octaveforge/extra/tsa/src/kalman_maar.h (rev 0) +++ trunk/octaveforge/extra/tsa/src/kalman_maar.h 20120330 08:44:19 UTC (rev 10108) @@ 0,0 +1,403 @@ +// Copyright by Martin Billinger + +// 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., 59 Temple +// Place  Suite 330, Boston, MA 021111307, USA. + +// struct Kalman +// holds all information to describe a +// kalman filter and it's current state +struct Kalman +{ + // Cstyle pointers to matrices and vectors that + // describe a kalman filter and it's current state + double *G, *H, *Kp, *Q1, *Q2, *errCov, *x, *yr; +}; + +// struct Kalman_Helper +// holds temporary variables that are +// used by the algorithm +struct Kalman_Helper +{ + Kalman_Helper( ptrdiff_t M, ptrdiff_t p ) + { + ptrdiff_t L = M*M*p; + ye = new double[M]; + ipiv = new ptrdiff_t[M]; + tmp = new double[M*M]; + KpH = new double[L*M]; + HKp = new double[M*L]; + HKpH = new double[M*M]; + K = new double[L*L]; + } + + ~Kalman_Helper( ) + { + delete[] ye; + delete[] ipiv; + delete[] tmp; + delete[] KpH; + delete[] HKp; + delete[] HKpH; + delete[] K; + } + + double *ye; + ptrdiff_t *ipiv; + double *tmp; + double *KpH; + double *HKp; + double *HKpH; + double *K; +}; + +// BLAS' and LAPACK's fortran functions need +// all their arguments to be passed by reference. +// Therefore we need constants that can be referenced. +double one = 1.0, zero = 0.0; +double minusone = 1.0; +ptrdiff_t inc = 1; +char *chn="N"; char *cht="T"; + +// Helper functions to create identity matrices +void deye( int N, double *i, double value ); +mxArray *eye( int N, double value ); + + +// Implementation of the mvaar algorithm +void kalman_maar( double *err, const double *y, + //double UC, int M, int L, int p, + double UC, ptrdiff_t M, ptrdiff_t L, ptrdiff_t p, + struct Kalman *inKalman, struct Kalman *outKalman, + struct Kalman_Helper *kh, int mode ) +{ + double traceK; + double *tmp1, *tmp2, *tmp3; + ptrdiff_t n,i,j, info, index; + + // % update Measurement Matrix + // Kalman.H = kron( eye(M), Kalman.yr ); + index = 0; + for( j=0; j<M; j++ ) { + for( i=0; i<M*p; i++ ) { + outKalman>H[index] = inKalman>yr[i]; + index += M; + } + index += 1; + } + + // % calculate prediction error + // ye = (Kalman.H*Kalman.x)'; + // err = y  ye + index = 0; + for( j=0; j<M; j++ ) { + kh>ye[j] = 0; + for( i=0; i<M*p; i++ ) + kh>ye[j] += inKalman>yr[i] * inKalman>x[index++]; + err[j] = y[j]  kh>ye[j]; + } + + + // % Adaptive Error covariance + // Kalman.errCov = (1UC)*Kalman.errCov + UC*(err'*err); + index = 0; + for( i=0; i<M; i++ ) + for( j=0; j<M; j++ ) { + outKalman>errCov[index] = (1UC)*inKalman>errCov[index] + UC * err[i] * err[j]; + index++; + } + + if( mode == 0 ) + { + // Kalman.Q2 = Kalman.Q2; % No update + memcpy( outKalman>Q2, inKalman>Q2, sizeof(double)*M*M ); + } + else + { + // % update Q2 using the prediction error + // % of the previous step (corresponds to BioSigs's eMode==4) + // Kalman.Q2 = Kalman.errCov; + memcpy( outKalman>Q2, inKalman>errCov, sizeof(double)*M*M ); + } + + // KpH = Kalman.Kp * Kalman.H'; + dgemm( chn, cht, &L, &M, &L, &one, inKalman>Kp, &L, + outKalman>H, &M, &zero, kh>KpH, &L ); + + // HKp = Kalman.H * Kalman.Kp; + dgemm( chn, chn, &M, &L, &L, &one, outKalman>H, &M, + inKalman>Kp, &L, &zero, kh>HKp, &M ); + + // HKpH = Kalman.H * KpH + dgemm( chn, chn, &M, &M, &L, &one, outKalman>H, &M, + kh>KpH, &L, &zero, kh>HKpH, &M ); + + + // % Kalman Gain + // Kalman.G = KpH * inv( HKpH + Kalman.Q2 ); + tmp1 = kh>HKpH; + tmp2 = outKalman>Q2; + for( n=0; n<M*M; n++ ) + *(tmp1++) += *(tmp2++); + memset( kh>tmp, 0, M*M*sizeof( double ) ); + deye( M, kh>tmp, 1.0 ); + dgesv( &M, &M, kh>HKpH, &M, kh>ipiv, + kh>tmp, &M, &info ); + dgemm( chn, chn, &L, &M, &M, &one, kh>KpH, &L, + kh>tmp, &M, &zero, outKalman>G, &L ); + + // % calculation of the aposteriori state + // % error covariance matrix + // K = Kalman.KpKalman.G*HKp; + tmp1 = kh>K; + tmp2 = inKalman>Kp; + for( n=0; n<L*L; n++ ) + *(tmp1++) = *(tmp2++); + dgemm( chn, chn, &L, &L, &M, &minusone, outKalman>G, + &L, kh>HKp, &M, &one, kh>K, &L ); + + + // % updating Q1 + if( mode == 0 ) + { + // Kalman.Q1 = Kalman.Q1; % no update + memcpy( outKalman>Q1, inKalman>Q1, sizeof(double)*L*L ); + } + else + { + // % corresponds to aMode==17 + // K = 0.5 * (K+K'); + // Kalman.Q1 = UC * Kalman.Kp; + + for( j=0; j<L; j++ ) + for( i=0; i<=j; i++ ) + { + size_t ij = i * L + j; + size_t ji = j * L + i; + kh>K[ij] = 0.5 * ( kh>K[ij] + kh>K[ji] ); + kh>K[ji] = kh>K[ij]; + } + + for( n=0; n<L*L; n++ ) + outKalman>Q1[n] = UC * inKalman>Kp[n]; + } + + // % apriori state error covariance matrix + // % for the next time step + // Kalman.Kp=K+Kalman.Q1; + tmp1 = outKalman>Kp; + tmp2 = kh>K; + tmp3 = outKalman>Q1; + for( n=0; n<L*L; n++ ) + *(tmp1++) = *(tmp2++) + *(tmp3++); + + // % current estimation of state x + // Kalman.x = Kalman.x + Kalman.G*err'; + tmp1 = outKalman>x; + tmp2 = inKalman>x; + for( n=0; n<L; n++ ) + *(tmp1++) = *(tmp2++); + dgemv( chn, &L, &M, &one, outKalman>G, &L, err, + &inc, &one, outKalman>x, &inc ); + + // % add new observation, drop oldest + // Kalman.yr = [y(:)' Kalman.yr(1:M*(p1))]; + tmp1 = outKalman>yr; + const double *tmpc = y; + for( n=0; n<M; n++ ) + *(tmp1++) = *(tmpc++); + tmp2 = inKalman>yr; + for( n=0; n<M*(p1); n++ ) + *(tmp1++) = *(tmp2++); +} + + +// Implementation of the mvaar algorithm, that uses only one state variable +void kalman_maar( double *err, const double *y, + //double UC, int M, int L, int p, + double UC, ptrdiff_t M, ptrdiff_t L, ptrdiff_t p, + struct Kalman *state, + struct Kalman_Helper *kh, int mode ) +{ + double traceK; + double *tmp1, *tmp2, *tmp3; + ptrdiff_t n,i,j, info, index; + + // % update Measurement Matrix + // Kalman.H = kron( eye(M), Kalman.yr ); + // this loop should be faster than calculating the kronecker tensor product. + index = 0; + for( j=0; j<M; j++ ) { + for( i=0; i<M*p; i++ ) { + state>H[index] = state>yr[i]; + index += M; + } + index += 1; + } + // % calculate prediction error + // ye = (Kalman.H*Kalman.x)'; + // err = y  ye + index = 0; + for( j=0; j<M; j++ ) { + kh>ye[j] = 0; + for( i=0; i<M*p; i++ ) + kh>ye[j] += state>yr[i] * state>x[index++]; + err[j] = y[j]  kh>ye[j]; + } + + // % update of Q2 using the prediction error + // of the previous step + // Kalman.Q2 = (1UC)*Kalman.Q2 + UC*err'*err; + index = 0; + for( i=0; i<M; i++ ) + for( j=0; j<M; j++ ) { + state>Q2[index] = (1UC)*state>Q2[index] + UC * err[i] * err[j]; + index++; + } + + // KpH = Kalman.Kp * Kalman.H'; + dgemm( chn, cht, &L, &M, &L, &one, state>Kp, &L, + state>H, &M, &zero, kh>KpH, &L ); + + // HKp = Kalman.H * Kalman.Kp; + dgemm( chn, chn, &M, &L, &L, &one, state>H, &M, + state>Kp, &L, &zero, kh>HKp, &M ); + + // HKpH = Kalman.H * KpH + dgemm( chn, chn, &M, &M, &L, &one, state>H, &M, + kh>KpH, &L, &zero, kh>HKpH, &M ); + + + // % Kalman Gain + // Kalman.G = KpH * inv( HKpH + Kalman.Q2 ); + tmp1 = kh>HKpH; + tmp2 = state>Q2; + for( n=0; n<M*M; n++ ) + *(tmp1++) += *(tmp2++); + memset( kh>tmp, 0, M*M*sizeof( double ) ); + deye( M, kh>tmp, 1.0 ); + dgesv( &M, &M, kh>HKpH, &M, kh>ipiv, + kh>tmp, &M, &info ); + dgemm( chn, chn, &L, &M, &M, &one, kh>KpH, &L, + kh>tmp, &M, &zero, state>G, &L ); + + // % calculation of the aposteriori state + // % error covariance matrix + // K = Kalman.KpKalman.G*HKp; + tmp1 = kh>K; + tmp2 = state>Kp; + for( n=0; n<L*L; n++ ) + *(tmp1++) = *(tmp2++); + dgemm( chn, chn, &L, &L, &M, &minusone, state>G, + &L, kh>HKp, &M, &one, kh>K, &L ); + + + // % updating Q1 + tmp1 = state>Q1; + if( mode == 0 ) + { + // no update + } + else if( mode == 1 ) + { + // Kalman.Q1=diag(diag(K)).*UC; + tmp2 = kh>K; + for( n=0; n<L*L; n++ ) + { + if( n%(L+1)==0 ) + { + *tmp1 = *tmp2 * UC; + tmp2 += L+1; + } + else + *tmp1 = 0; + tmp1++; + } + } + else if( mode == 2 ) + { + // %diagonal matrix containing UC + // upd = eye(L)/L*UC; + // Kalman.Q1=upd*trace(K); + tmp2 = kh>K; + traceK = *tmp2; + for( n=1; n<L; n++ ) + { + tmp2 += L+1; + traceK += *tmp2; + } + + for( n=0; n<L*L; n++ ) + { + if( n%(L+1)==0 ) + *tmp1 = traceK * UC / L; + else + *tmp1 = 0; + tmp1++; + } + + } + + + // % apriori state error covariance matrix + // % for the next time step + // Kalman.Kp=K+Kalman.Q1; + tmp1 = state>Kp; + tmp2 = kh>K; + tmp3 = state>Q1; + for( n=0; n<L*L; n++ ) + *(tmp1++) = *(tmp2++) + *(tmp3++); + + // % current estimation of state x + // Kalman.x = Kalman.x + Kalman.G*err'; + dgemv( chn, &L, &M, &one, state>G, &L, err, + &inc, &one, state>x, &inc ); + + // % add new observation, drop oldest + // Kalman.yr = [y(:)' Kalman.yr(1:M*(p1))]; + + tmp1 = state>yr + M*p1; + tmp2 = tmp1  M; + for( n=0; n<M*(p1); n++ ) + *(tmp1) = *(tmp2); + + tmp1 = state>yr; + const double *tmpc = y; + for( n=0; n<M; n++ ) + *(tmp1++) = *(tmpc++); +} + + + +// ============================ +// Implementation of helper functions +// ============================ + +mxArray *eye( int N, double value ) +{ + mxArray *I; + I = mxCreateDoubleMatrix( N, N, mxREAL ); + deye( N, mxGetPr( I ), value ); + return I; +} + +void deye( int N, double *i, double value ) +{ + int n; + double *p = i; + for( n=0; n<N; n++ ) + { + *p = value; + p = p + (N+1); + } +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120330 08:27:07

Revision: 10107 http://octave.svn.sourceforge.net/octave/?rev=10107&view=rev Author: paramaniac Date: 20120330 08:26:56 +0000 (Fri, 30 Mar 2012) Log Message:  quaternion: add missing ## * texinfo * Modified Paths:  trunk/octaveforge/main/quaternion/inst/qi.m trunk/octaveforge/main/quaternion/inst/qj.m trunk/octaveforge/main/quaternion/inst/qk.m Modified: trunk/octaveforge/main/quaternion/inst/qi.m ===================================================================  trunk/octaveforge/main/quaternion/inst/qi.m 20120330 01:03:40 UTC (rev 10106) +++ trunk/octaveforge/main/quaternion/inst/qi.m 20120330 08:26:56 UTC (rev 10107) @@ 13,6 +13,7 @@ ## 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} {} qi ## Create xcomponent of a quaternion's vector part. ## Modified: trunk/octaveforge/main/quaternion/inst/qj.m ===================================================================  trunk/octaveforge/main/quaternion/inst/qj.m 20120330 01:03:40 UTC (rev 10106) +++ trunk/octaveforge/main/quaternion/inst/qj.m 20120330 08:26:56 UTC (rev 10107) @@ 13,6 +13,7 @@ ## 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} {} qj ## Create ycomponent of a quaternion's vector part. ## Modified: trunk/octaveforge/main/quaternion/inst/qk.m ===================================================================  trunk/octaveforge/main/quaternion/inst/qk.m 20120330 01:03:40 UTC (rev 10106) +++ trunk/octaveforge/main/quaternion/inst/qk.m 20120330 08:26:56 UTC (rev 10107) @@ 13,6 +13,7 @@ ## 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} {} qk ## Create zcomponent of a quaternion's vector part. ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120330 01:03:46

Revision: 10106 http://octave.svn.sourceforge.net/octave/?rev=10106&view=rev Author: carandraug Date: 20120330 01:03:40 +0000 (Fri, 30 Mar 2012) Log Message:  quaternion: write license in DESCRIPTINO in an easy to parse automatically format Modified Paths:  trunk/octaveforge/main/quaternion/DESCRIPTION trunk/octaveforge/main/strings/NEWS Modified: trunk/octaveforge/main/quaternion/DESCRIPTION ===================================================================  trunk/octaveforge/main/quaternion/DESCRIPTION 20120330 01:02:51 UTC (rev 10105) +++ trunk/octaveforge/main/quaternion/DESCRIPTION 20120330 01:03:40 UTC (rev 10106) @@ 7,5 +7,5 @@ Description: Overloaded operators for quaternions Depends: octave (>= 3.6.0) Autoload: yes License: GPL version 3 or later +License: GPLv3+ Url: http://octave.sf.net Modified: trunk/octaveforge/main/strings/NEWS ===================================================================  trunk/octaveforge/main/strings/NEWS 20120330 01:02:51 UTC (rev 10105) +++ trunk/octaveforge/main/strings/NEWS 20120330 01:03:40 UTC (rev 10106) @@ 6,8 +6,8 @@ strtrim  ** Package is no longer automatically loaded. + ** Package is no longer automatically loaded.  ** The function `cstrcmp' has been completely rewritten. It should + ** The function `cstrcmp' has been completely rewritten. It should perform faster and will accept arguments exactly the same way as Octave's core `strcmp'. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120330 01:02:57

Revision: 10105 http://octave.svn.sourceforge.net/octave/?rev=10105&view=rev Author: carandraug Date: 20120330 01:02:51 +0000 (Fri, 30 Mar 2012) Log Message:  description: date of new release Modified Paths:  trunk/octaveforge/main/general/DESCRIPTION Modified: trunk/octaveforge/main/general/DESCRIPTION ===================================================================  trunk/octaveforge/main/general/DESCRIPTION 20120330 00:35:55 UTC (rev 10104) +++ trunk/octaveforge/main/general/DESCRIPTION 20120330 01:02:51 UTC (rev 10105) @@ 1,6 +1,6 @@ Name: general Version: 1.3.0 Date: 20100312 +Date: 20120330 Author: various authors Maintainer: OctaveForge community <octavedev@...> Title: General This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120330 00:36:02

Revision: 10104 http://octave.svn.sourceforge.net/octave/?rev=10104&view=rev Author: carandraug Date: 20120330 00:35:55 +0000 (Fri, 30 Mar 2012) Log Message:  general: new package release Modified Paths:  trunk/octaveforge/main/general/DESCRIPTION trunk/octaveforge/main/general/INDEX Modified: trunk/octaveforge/main/general/DESCRIPTION ===================================================================  trunk/octaveforge/main/general/DESCRIPTION 20120330 00:29:51 UTC (rev 10103) +++ trunk/octaveforge/main/general/DESCRIPTION 20120330 00:35:55 UTC (rev 10104) @@ 1,5 +1,5 @@ Name: general Version: 1.2.2 +Version: 1.3.0 Date: 20100312 Author: various authors Maintainer: OctaveForge community <octavedev@...> Modified: trunk/octaveforge/main/general/INDEX ===================================================================  trunk/octaveforge/main/general/INDEX 20120330 00:29:51 UTC (rev 10103) +++ trunk/octaveforge/main/general/INDEX 20120330 00:35:55 UTC (rev 10104) @@ 8,12 +8,12 @@ @dict/length @dict/struct Input check  @inputParser/inputParser @inputParser/addOptional @inputParser/addRequired @inputParser/addParamValue @inputParser/addSwitch @inputParser/createCopy + @inputParser/inputParser @inputParser/parse Parallel Computing pararrayfun @@ 26,8 +26,9 @@ mark_for_deletion packfields safeprod + SHA1 unpackfields unresamp2 unvech ztvals  SHA1 + __exit__ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120330 00:29:57

Revision: 10103 http://octave.svn.sourceforge.net/octave/?rev=10103&view=rev Author: carandraug Date: 20120330 00:29:51 +0000 (Fri, 30 Mar 2012) Log Message:  general: update NEWS and INDEX Modified Paths:  trunk/octaveforge/main/general/INDEX trunk/octaveforge/main/general/NEWS Modified: trunk/octaveforge/main/general/INDEX ===================================================================  trunk/octaveforge/main/general/INDEX 20120330 00:08:36 UTC (rev 10102) +++ trunk/octaveforge/main/general/INDEX 20120330 00:29:51 UTC (rev 10103) @@ 1,4 +1,20 @@ general_html >> General purpose functions +general >> General purpose functions +Dictionaries + @dict/dict + @dict/get + @dict/has + @dict/isempty + @dict/join + @dict/length + @dict/struct +Input check + @inputParser/inputParser + @inputParser/addOptional + @inputParser/addRequired + @inputParser/addParamValue + @inputParser/addSwitch + @inputParser/createCopy + @inputParser/parse Parallel Computing pararrayfun parcellfun @@ 15,16 +31,3 @@ unvech ztvals SHA1 Dictionaries  @dict/dict  @dict/display  @dict/end  @dict/get  @dict/has  @dict/isempty  @dict/join  @dict/length  @dict/struct  @dict/subsasgn  @dict/subsref  Modified: trunk/octaveforge/main/general/NEWS ===================================================================  trunk/octaveforge/main/general/NEWS 20120330 00:08:36 UTC (rev 10102) +++ trunk/octaveforge/main/general/NEWS 20120330 00:29:51 UTC (rev 10103) @@ 4,6 +4,17 @@ ** The following functions are new: majle + ** The class `inputParser' class has been implemented with many methods. It + attempts to be as compatible with Matlab as possible. However, since + classdef is not yet implemented the syntax differs slightly. Unlike the + Matlab implementation, this functions return the object. For example: + + obj.method (arguments) # matlab implementation + obj = obj.method (arguments) # octave implementation + + The octave implementatino expands on the Matlab one as it has one more type + of API, see `help @inputParser/addSwitch'. + ** The function `unvech' accepts a new argument scale to calculate the upper triangular part of the matrix thus returning nonsymmetric matrix. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120330 00:08:44

Revision: 10102 http://octave.svn.sourceforge.net/octave/?rev=10102&view=rev Author: carandraug Date: 20120330 00:08:36 +0000 (Fri, 30 Mar 2012) Log Message:  @inputParser/addSwitch: implemented addSwitch method Modified Paths:  trunk/octaveforge/main/general/inst/@inputParser/addOptional.m trunk/octaveforge/main/general/inst/@inputParser/addParamValue.m trunk/octaveforge/main/general/inst/@inputParser/addRequired.m trunk/octaveforge/main/general/inst/@inputParser/addSwitch.m trunk/octaveforge/main/general/inst/@inputParser/createCopy.m trunk/octaveforge/main/general/inst/@inputParser/inputParser.m trunk/octaveforge/main/general/inst/@inputParser/parse.m trunk/octaveforge/main/general/inst/@inputParser/subsref.m Modified: trunk/octaveforge/main/general/inst/@inputParser/addOptional.m ===================================================================  trunk/octaveforge/main/general/inst/@inputParser/addOptional.m 20120329 22:55:39 UTC (rev 10101) +++ trunk/octaveforge/main/general/inst/@inputParser/addOptional.m 20120330 00:08:36 UTC (rev 10102) @@ 34,7 +34,7 @@ ## @emph{Note}: if @command{ParamValue} arguments are also specified, all @command{Optional} ## arguments will have to be specified before. ## ## @seealso{inputParser, @@inputParser/addParamValue +## @seealso{inputParser, @@inputParser/addParamValue, @@inputParser/addSwitch, ## @@inputParser/addParamValue, @@inputParser/addRequired, @@inputParser/parse} ## @end deftypefn Modified: trunk/octaveforge/main/general/inst/@inputParser/addParamValue.m ===================================================================  trunk/octaveforge/main/general/inst/@inputParser/addParamValue.m 20120329 22:55:39 UTC (rev 10101) +++ trunk/octaveforge/main/general/inst/@inputParser/addParamValue.m 20120330 00:08:36 UTC (rev 10102) @@ 29,7 +29,7 @@ ## for the parameter with name @var{argname}. Alternatively, a function name ## can be used. ## ## @seealso{inputParser, @@inputParser/addOptional, +## @seealso{inputParser, @@inputParser/addOptional, @@inputParser/addSwitch, ## @@inputParser/addParamValue, @@inputParser/addRequired, @@inputParser/parse} ## @end deftypefn Modified: trunk/octaveforge/main/general/inst/@inputParser/addRequired.m ===================================================================  trunk/octaveforge/main/general/inst/@inputParser/addRequired.m 20120329 22:55:39 UTC (rev 10101) +++ trunk/octaveforge/main/general/inst/@inputParser/addRequired.m 20120330 00:08:36 UTC (rev 10102) @@ 37,7 +37,7 @@ ## it must be the first (see @command{@@inputParser}). ## ## @seealso{inputParser, @@inputParser/addOptional, @@inputParser/addParamValue ## @@inputParser/addParamValue, @@inputParser/parse} +## @@inputParser/addParamValue, @@inputParser/addSwitch, @@inputParser/parse} ## @end deftypefn function inPar = addRequired (inPar, name, val) Modified: trunk/octaveforge/main/general/inst/@inputParser/addSwitch.m ===================================================================  trunk/octaveforge/main/general/inst/@inputParser/addSwitch.m 20120329 22:55:39 UTC (rev 10101) +++ trunk/octaveforge/main/general/inst/@inputParser/addSwitch.m 20120330 00:08:36 UTC (rev 10102) @@ 1,4 +1,4 @@ ## Copyright (C) 2011 Carnë Draug <carandraug+dev@...> +## Copyright (C) 20112012 Carnë Draug <carandraug+dev@...> ## ## 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 @@ 14,11 +14,35 @@ ## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {@var{parser} =} addSwitch (@var{parser}, @var{argname}, @var{default}) ## @deftypefnx {Function File} {@var{parser} =} @var{parser}.addSwitch (@var{argname}, @var{default}) ## Not implemented yet +## @deftypefn {Function File} {@var{parser} =} addSwitch (@var{parser}, @var{argname}) +## @deftypefnx {Function File} {@var{parser} =} @var{parser}.addSwitch (@var{argname}) +## Add new switch type of argument to the object @var{parser} of inputParser class. +## +## This method belongs to the inputParser class and implements a switch +## arguments type of API. +## +## @var{argname} must be a string with the name of the new argument. Arguments +## of this type can be specified at the end, after @code{Required} and @code{Optional}, +## and mixed between the @code{ParamValue}. They default to false. If one of the +## arguments supplied is a string like @var{argname}, then after parsing the value +## of @var{parse}.Results.@...{argname} will be true. +## +## See @command{help @@inputParser} for examples. +## +## @seealso{inputParser, @@inputParser/addOptional, @@inputParser/addParamValue +## @@inputParser/addParamValue, @@inputParser/addRequired, @@inputParser/parse} ## @end deftypefn function inPar = addSwitch (inPar, name, def) +function inPar = addSwitch (inPar, name) + ## check @inputParser/subsref for the actual code + if (nargin == 2) + inPar = subsref (inPar, substruct( + '.' , 'addParamValue', + '()', {name} + )); + else + print_usage; + endif + endfunction Modified: trunk/octaveforge/main/general/inst/@inputParser/createCopy.m ===================================================================  trunk/octaveforge/main/general/inst/@inputParser/createCopy.m 20120329 22:55:39 UTC (rev 10101) +++ trunk/octaveforge/main/general/inst/@inputParser/createCopy.m 20120330 00:08:36 UTC (rev 10102) @@ 19,7 +19,7 @@ ## class. ## ## @seealso{inputParser, @@inputParser/addOptional, @@inputParser/addParamValue ## @@inputParser/addParamValue, @@inputParser/addRequired, +## @@inputParser/addParamValue, @@inputParser/addRequired, @@inputParser/addSwitch, ## @@inputParser/parse} ## @end deftypefn Modified: trunk/octaveforge/main/general/inst/@inputParser/inputParser.m ===================================================================  trunk/octaveforge/main/general/inst/@inputParser/inputParser.m 20120329 22:55:39 UTC (rev 10101) +++ trunk/octaveforge/main/general/inst/@inputParser/inputParser.m 20120330 00:08:36 UTC (rev 10102) @@ 1,4 +1,4 @@ ## Copyright (C) 2011 Carnë Draug <carandraug+dev@...> +## Copyright (C) 20112012 Carnë Draug <carandraug+dev@...> ## ## 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 @@ 24,7 +24,7 @@ ## @item mandatory (see @command{@@inputParser/addRequired}); ## @item optional (see @command{@@inputParser/addOptional}); ## @item named (see @command{@@inputParser/addParamValue}); ## @item switch (not implemented yet). +## @item switch (see @command{@@inputParser/addSwitch}). ## @end enumerate ## ## After defining the function API with this methods, the supplied arguments can @@ 53,7 +53,10 @@ ## @deftypefnx {Class property} parser.KeepUnmatched = @var{boolean} ## Set whether an error should be given for nondefined arguments. Defaults to ## false. If set to true, the extra arguments can be accessed through ## @code{Unmatched} after the @code{parse} method. +## @code{Unmatched} after the @code{parse} method. Note that since @command{Switch} +## and @command{ParamValue} arguments can be mixed, it is not possible to know +## the unmatched type. If argument is found unmatched it is assumed to be of the +## @command{ParamValue} type and it is expected to be followed by a value. ## ## @deftypefnx {Class property} parser.StructExpand = @var{boolean} ## Set whether a structure can be passed to the function instead of parameter @@ 77,13 +80,16 @@ ## ## create two ParamValue type of arguments ## val_type = @@(x) ischar(x) && any(strcmp(x, @{"linear", "quadratic"@}); ## p = p.addParamValue ("type", "linear", @@val_type); ## val_verb = @@(x) ischar(x) && any(strcmp(x, @{"silent", "verbose", "debug"@}); ## p = p.addParamValue ("verbosity", "silent", @@val_verb)'; +## val_verb = @@(x) ischar(x) && any(strcmp(x, @{"low", "medium", "high"@}); +## p = p.addParamValue ("tolerance", "low", @@val_verb); ## +## ## create a switch type of argument +## p = p.addSwitch ("verbose"); +## ## p = p.parse (pack, path, mat, varargin@{:@}); ## ## ## the rest of the function can access the input by accessing p.Results ## ## for example, to access the value of verbosity, use p.Results.verbosity +## ## for example, to access the value of tolerance, use p.Results.tolerance ## endfunction ## ## check ("mech"); # valid, will use defaults for other arguments @@ 93,6 +99,10 @@ ## ## check ("mech", "~/dev", [0 1 0 0], "type", "linear"); # valid ## +## ## the following is also valid. Note how the Switch type of argument can be +## ## mixed into or before the ParamValue (but still after Optional) +## check ("mech", "~/dev", [0 1 0 0], "verbose", "tolerance", "high"); +## ## ## the following returns an error since not all optional arguments, `path' and ## ## `mat', were given before the named argument `type'. ## check ("mech", "~/dev", "type", "linear"); @@ 107,7 +117,8 @@ ## ## @emph{Note 2}: if both @command{Optional} and @command{ParamValue} arguments ## are mixed in a function API, the user will have to specify @emph{all} ## @command{Optional} arguments before the @command{ParamValue} arguments. +## @command{Optional} arguments before the @command{ParamValue} and +## @command{Switch}arguments. ## ## @seealso{@@inputParser/addOptional, @@inputParser/addSwitch, ## @@inputParser/addParamValue, @@inputParser/addRequired, @@ 128,6 +139,7 @@ inPar.ParamValue = struct; inPar.Optional = struct; inPar.Required = struct; + inPar.Switch = struct; ## this will be filled when the methodd parse is used and will be a struct whose ## fieldnames are the argnames that return their value Modified: trunk/octaveforge/main/general/inst/@inputParser/parse.m ===================================================================  trunk/octaveforge/main/general/inst/@inputParser/parse.m 20120329 22:55:39 UTC (rev 10101) +++ trunk/octaveforge/main/general/inst/@inputParser/parse.m 20120330 00:08:36 UTC (rev 10102) @@ 23,7 +23,7 @@ ## accessor. See @command{help inputParser} for a more complete description. ## ## @seealso{inputParser, @@inputParser/addOptional, @@inputParser/addParamValue ## @@inputParser/addParamValue, @@inputParser/addRequired} +## @@inputParser/addParamValue, @@inputParser/addRequired, @@inputParser/addSwitch} ## @end deftypefn function inPar = parse (inPar, varargin) Modified: trunk/octaveforge/main/general/inst/@inputParser/subsref.m ===================================================================  trunk/octaveforge/main/general/inst/@inputParser/subsref.m 20120329 22:55:39 UTC (rev 10101) +++ trunk/octaveforge/main/general/inst/@inputParser/subsref.m 20120330 00:08:36 UTC (rev 10102) @@ 1,4 +1,4 @@ ## Copyright (C) 2011 Carnë Draug <carandraug+dev@...> +## Copyright (C) 20112012 Carnë Draug <carandraug+dev@...> ## ## 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 @@ 38,7 +38,7 @@ inPar = parse_args (inPar, idx); case 'Unmatched' case 'UsingDefaults'  case {'addOptional', 'addParamValue', 'addRequired'} + case {'addOptional', 'addParamValue', 'addRequired', 'addSwitch'} inPar = check_methods (inPar, idx); otherwise error ("invalid index for reference of class %s", class (inPar) ); @@ 109,39 +109,47 @@ inPar.Results.(name) = value; endfor  ## only ParamValue can be after Optional so their number must be even  if ( rem (numel (args), 2) )  error("%sodd number of Parameter/Values arguments", inPar.FunctionName);  endif  ## loop a maximum #times of the number of ParamValue, taking pairs of keys and ## values out 'args'. We no longer expect an order so we need the index in ## 'copy' to remove it from there. Once ran out of 'args', move their name ## into usingDefaults, place their default values into 'Results', and break  for i = 1 : numel (fieldnames (inPar.ParamValue)) + for i = 1 : (numel (fieldnames (inPar.ParamValue)) + numel (fieldnames (inPar.Switch))) if ( !numel (args) ) ## loops the number of times left in 'copy' since these are the last type for n = 1 : numel (inPar.copy) [name, inPar.copy] = pop (inPar.copy); inPar.UsingDefaults = push (inPar.UsingDefaults, name);  inPar.Results.(name) = inPar.ParamValue.(name).default; + if (isfield (inPar.ParamValue, name)) + inPar.Results.(name) = inPar.ParamValue.(name).default; + else + inPar.Results.(name) = inPar.Switch.(name).default; + endif endfor break endif  [key, args] = pop (args);  [value, args] = pop (args); + [key, args] = pop (args); if ( !ischar (key) )  error("%sParameter names must be strings", inPar.FunctionName); + error("%sParameter/Switch names must be strings", inPar.FunctionName); endif if (inPar.CaseSensitive) index = find( strcmp(inPar.copy, key)); else index = find( strcmpi(inPar.copy, key)); endif + ## we can't use isfield here to support case insensitive + if (any (strcmpi (fieldnames (inPar.Switch), key))) + value = true; + method = "Switch"; + else + ## then it must be a ParamValue, pop its value + [value, args] = pop (args); + method = "ParamValue"; + endif + ## index == 0 means no match so either return error or move them into 'Unmatched' if ( index != 0 ) [name, inPar.copy] = pop (inPar.copy, index);  if ( !feval (inPar.ParamValue.(name).validator, value) ) + if ( !feval (inPar.(method).(name).validator, value)) error("%sinvalid value for parameter '%s'", inPar.FunctionName, key); endif ## we use the name popped from 'copy' instead of the key from 'args' in case @@ 188,7 +196,7 @@ ## a validator is optional but that complicates handling all the parsing with ## few functions and conditions. If not specified @() true will always return ## true. Simply using true is not enough because if the argument is zero it  ## return false and it it's too large, takes up memory + ## return false and if it's too large, takes up memory switch method case {'addOptional', 'addParamValue'} if ( numel (args) == 1 ) @@ 208,6 +216,9 @@ print_usage(func); endif def = false; + case {'addSwitch'} + val = def_val; + def = false; otherwise error ("invalid index for reference of class %s", class (inPar) ); endswitch @@ 238,13 +249,14 @@ endif ## because the order arguments are specified are the order they are expected,  ## can't have ParamValue before Optional, and Optional before Required + ## can't have ParamValue/Switch before Optional, and Optional before Required n_optional = numel (fieldnames (inPar.Optional)); n_params = numel (fieldnames (inPar.ParamValue));  if ( strcmp (method, 'Required') && ( n_optional  n_params ) )  error ("Can't specify 'Required' arguments after Optional or ParamValue");  elseif ( strcmp (method, 'Optional') && n_params )  error ("Can't specify 'Required' arguments after Optional or ParamValue"); + n_switch = numel (fieldnames (inPar.Switch)); + if ( strcmp (method, 'Required') && ( n_optional  n_params  n_switch) ) + error ("Can't specify 'Required' arguments after Optional, ParamValue or Switch"); + elseif ( strcmp (method, 'Optional') && ( n_params  n_switch) ) + error ("Can't specify 'Optional' arguments after ParamValue or Switch"); endif ## even if CaseSensitive is turned on, we still shouldn't have two args with This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <cdf@us...>  20120329 22:55:45

Revision: 10101 http://octave.svn.sourceforge.net/octave/?rev=10101&view=rev Author: cdf Date: 20120329 22:55:39 +0000 (Thu, 29 Mar 2012) Log Message:  help improvement Modified Paths:  trunk/octaveforge/extra/secs1d/DESCRIPTION Modified: trunk/octaveforge/extra/secs1d/DESCRIPTION ===================================================================  trunk/octaveforge/extra/secs1d/DESCRIPTION 20120329 22:54:47 UTC (rev 10100) +++ trunk/octaveforge/extra/secs1d/DESCRIPTION 20120329 22:55:39 UTC (rev 10101) @@ 1,6 +1,6 @@ Name: SECS1D Version: 0.0.9 Date: 20120325 +Date: 20120330 Author: Carlo de Falco Maintainer: Carlo de Falco Title: SEmi Conductor Simulator in 1D This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <cdf@us...>  20120329 22:54:53

Revision: 10100 http://octave.svn.sourceforge.net/octave/?rev=10100&view=rev Author: cdf Date: 20120329 22:54:47 +0000 (Thu, 29 Mar 2012) Log Message:  help improvement Modified Paths:  trunk/octaveforge/extra/secs1d/inst/secs1d_dd_gummel_map.m trunk/octaveforge/extra/secs1d/inst/secs1d_dd_newton.m trunk/octaveforge/extra/secs1d/inst/secs1d_nlpoisson_newton.m Modified: trunk/octaveforge/extra/secs1d/inst/secs1d_dd_gummel_map.m ===================================================================  trunk/octaveforge/extra/secs1d/inst/secs1d_dd_gummel_map.m 20120329 20:57:24 UTC (rev 10099) +++ trunk/octaveforge/extra/secs1d/inst/secs1d_dd_gummel_map.m 20120329 22:54:47 UTC (rev 10100) @@ 16,6 +16,9 @@ %% You should have received a copy of the GNU General Public License %% along with SECS1D; If not, see <http://www.gnu.org/licenses/>;. +%% +%% Solve the scaled stationary bipolar DD equation system using Gummel algorithm. +%% %% [n, p, V, Fn, Fp, Jn, Jp, it, res] = secs1d_dd_gummel_map (x, D, Na, Nd, %% pin, nin, Vin, Fnin, %% Fpin, l2, er, u0n, @@ 25,9 +28,6 @@ %% Cn, Cp, an, ap, Ecritnin, Ecritpin, %% toll, maxit, ptoll, pmaxit) %% %% This function solves the scaled stationary bipolar DD %% equation system using Gummel algorithm %% %% input: %% x spatial grid %% D, Na, Nd doping profile Modified: trunk/octaveforge/extra/secs1d/inst/secs1d_dd_newton.m ===================================================================  trunk/octaveforge/extra/secs1d/inst/secs1d_dd_newton.m 20120329 20:57:24 UTC (rev 10099) +++ trunk/octaveforge/extra/secs1d/inst/secs1d_dd_newton.m 20120329 22:54:47 UTC (rev 10100) @@ 16,13 +16,13 @@ %% You should have received a copy of the GNU General Public License %% along with SECS1D; If not, see <http://www.gnu.org/licenses/>;. +%% Solve the scaled stationary bipolar DD equation system using Newton's method. +%% %% [n, p, V, Fn, Fp, Jn, Jp, it, res] = secs1d_dd_newton (x, D, Vin, nin, %% pin, l2, er, un, %% up, theta, tn, tp, %% Cn, Cp, toll, maxit) %% %% Solve the scaled stationary bipolar DD equation system using Newton's method %% %% input: %% x spatial grid %% D doping profile Modified: trunk/octaveforge/extra/secs1d/inst/secs1d_nlpoisson_newton.m ===================================================================  trunk/octaveforge/extra/secs1d/inst/secs1d_nlpoisson_newton.m 20120329 20:57:24 UTC (rev 10099) +++ trunk/octaveforge/extra/secs1d/inst/secs1d_nlpoisson_newton.m 20120329 22:54:47 UTC (rev 10100) @@ 16,6 +16,8 @@ %% You should have received a copy of the GNU General Public License %% along with SECS1D; If not, see <http://www.gnu.org/licenses/>;. +%% Solve the nonlinear Poisson problem using Newton's algorithm. +%% %% [V, n, p, res, niter] = secs1d_nlpoisson_newton (x, sinodes, Vin, nin, pin, %% Fnin, Fpin, D, l2, er, toll, maxit) %% This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 