[Octave-cvsupdate] octave-forge/main/optim adsmax.m,1.3,1.4 cdiff.m,1.6,1.7 d2_min.m,1.8,1.9 expdemo.m,1.1,1.2 fzero.m,1.4,1.5 lp_test.m,1.3,1.4 mdsmax.m,1.3,1.4 nelder_mead_min.m,1.10,1.11 nmsmax.m,1.2,1.3 test_d2_min_1.m,1.2,1.3 test_d2_min_2.m,1.2,1.3 test_d2_min_3.m,1.3,1.4 test_nelder_mead_min_1.m,1.1,1.2 test_nelder_mead_min_2.m,1.1,1.2 test_wpolyfit.m,1.4,1.5 wpolyfitdemo.m,1.2,1.3

[Paul K. <pki...@us...>]

Update of /cvsroot/octave/octave-forge/main/optim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28526/main/optim

Modified Files:
	adsmax.m cdiff.m d2_min.m expdemo.m fzero.m lp_test.m mdsmax.m 
	nelder_mead_min.m nmsmax.m test_d2_min_1.m test_d2_min_2.m 
	test_d2_min_3.m test_nelder_mead_min_1.m 
	test_nelder_mead_min_2.m test_wpolyfit.m wpolyfitdemo.m 
Log Message:
Author/Copyright consistency


Index: fzero.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/fzero.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fzero.m	11 Sep 2004 14:40:23 -0000	1.4
+++ fzero.m	25 May 2005 03:43:41 -0000	1.5
@@ -1,4 +1,4 @@
-## Copyright (C) 2004 £ukasz Bodzon, <lll...@o2...>
+## Copyright (C) 2004 £ukasz Bodzon <lll...@o2...>
 ##
 ## 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

Index: adsmax.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/adsmax.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- adsmax.m	18 May 2004 11:54:21 -0000	1.3
+++ adsmax.m	25 May 2005 03:43:41 -0000	1.4
@@ -25,7 +25,8 @@
 %        ADSMAX(fun, x0, STOPIT, SAVIT, P, P1, P2,...) allows additional
 %        arguments to be passed to fun, via feval(fun,x,P1,P2,...).
 
-% From Matrix Toolbox (C) 2002 N.J.Higham
+% From Matrix Toolbox 
+% Copyright (C) 2002 N.J.Higham
 % www.maths.man.ac.uk/~higham/mctoolbox
 % distributed under the terms of the GNU General Public License
 %

Index: test_nelder_mead_min_1.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/test_nelder_mead_min_1.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test_nelder_mead_min_1.m	13 Mar 2002 21:50:53 -0000	1.1
+++ test_nelder_mead_min_1.m	25 May 2005 03:43:41 -0000	1.2
@@ -16,6 +16,8 @@
 ## quadratic function.
 ##
 
+## Author:  Etienne Grossmann <et...@cs...>
+
 ok = 1;
 cnt = 1;
 
@@ -52,8 +54,6 @@
 ##
 ## Returns the cputime since last call to 'mytic'.
 
-## Author:        Etienne Grossmann  <et...@is...>
-## Last modified: October 2000
 function dt = mytic()
    static last_mytic = 0 ;
    [t,u,s] = cputime() ;

Index: nelder_mead_min.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/nelder_mead_min.m,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- nelder_mead_min.m	5 May 2003 08:00:10 -0000	1.10
+++ nelder_mead_min.m	25 May 2005 03:43:41 -0000	1.11
@@ -82,8 +82,7 @@
 ## verbose, v     Be more or less verbose (quiet=0)                      <0>
 function [x,v,nev] = nelder_mead_min (f, args, varargin)
 
-## Author : Etienne Grossmann <et...@is...>
-## This software is distributed under the terms of the GPL
+## Author : Etienne Grossmann <et...@cs...>
 
 
 verbose = 0;

Index: test_d2_min_1.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/test_d2_min_1.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test_d2_min_1.m	28 Mar 2002 20:08:12 -0000	1.2
+++ test_d2_min_1.m	25 May 2005 03:43:41 -0000	1.3
@@ -18,6 +18,7 @@
 ##
 ## If a variables "verbose" is set, then some comments are output.
 
+## Author:  Etienne Grossmann <et...@cs...>
 
 1 ;
 
@@ -70,8 +71,6 @@
 ##
 ## Returns the cputime since last call to 'mytic'.
 
-## Author:        Etienne Grossmann  <et...@is...>
-## Last modified: October 2000
 function dt = mytic()
    static last_mytic = 0 ;
    [t,u,s] = cputime() ;
@@ -83,8 +82,6 @@
 ##
 ## s == mean(x(:).^2) , but ignores NaN's
 
-## Author:        Etienne Grossmann  <et...@is...>
-## Last modified: October 2000
 
 function s = msq(x)
 try

Index: expdemo.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/expdemo.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expdemo.m	29 Jan 2002 16:53:24 -0000	1.1
+++ expdemo.m	25 May 2005 03:43:41 -0000	1.2
@@ -1,3 +1,7 @@
+## An example of expfit in action
+
+## Author: Paul Kienzle
+## This program is public domain
 x0 = 1.5; step = 0.05; xend = 5;
 a = [1.3, 2]'
 c = [2, -0.5]'

Index: test_wpolyfit.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/test_wpolyfit.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test_wpolyfit.m	31 May 2004 02:48:54 -0000	1.4
+++ test_wpolyfit.m	25 May 2005 03:43:41 -0000	1.5
@@ -1,3 +1,11 @@
+## Tests for wpolyfit.
+##
+## Test cases are taken from the NIST Statistical Reference Datasets
+##    http://www.itl.nist.gov/div898/strd/
+
+## Author: Paul Kienzle
+## This program is public domain
+
 1;
 
 function do_test(n,x,y,p,dp,varargin)

Index: wpolyfitdemo.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/wpolyfitdemo.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- wpolyfitdemo.m	30 May 2002 17:27:48 -0000	1.2
+++ wpolyfitdemo.m	25 May 2005 03:43:41 -0000	1.3
@@ -6,6 +6,9 @@
 ## To force a variety of weights, poisson statistics are used to 
 ## estimate the variance on the individual points, but gaussian 
 ## statistics are used to generate new values within that variance.
+
+## Author: Paul Kienzle
+## This program is public domain.
 function wpolyfitdemo(pin)
   if (nargin == 0) pin = [3 -1 2]'; endif
   x = [-3:0.1:3];

Index: mdsmax.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/mdsmax.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mdsmax.m	18 May 2004 11:55:07 -0000	1.3
+++ mdsmax.m	25 May 2005 03:43:41 -0000	1.4
@@ -29,7 +29,8 @@
 % is an n-vector.  It is based on the algorithm statement in [2, sec.3],
 % modified so as to halve the storage (with a slight loss in readability).
 
-% From Matrix Toolbox (C) 2002 N.J.Higham
+% From Matrix Toolbox 
+% Copyright (C) 2002 N.J.Higham
 % www.maths.man.ac.uk/~higham/mctoolbox
 % distributed under the terms of the GNU General Public License
 %

Index: d2_min.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/d2_min.m,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- d2_min.m	5 May 2003 08:00:10 -0000	1.8
+++ d2_min.m	25 May 2005 03:43:41 -0000	1.9
@@ -81,7 +81,7 @@
 
 function [xbest,vbest,nev,hbest,args] = d2_min (f,d2f,args,ctl,code)
 
-## Author : Etienne Grossmann <et...@is...>
+## Author : Etienne Grossmann <et...@cs...>
 ##
 
 maxout = inf;
@@ -389,4 +389,4 @@
     printf ("d2_min : Whoa!! xbest does not eval to vbest\n");
     printf ("       : %8.3e - %8.3e = %8.3e != 0\n",err,vbest,err-vbest);
   end
-end
\ No newline at end of file
+end

Index: cdiff.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/cdiff.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cdiff.m	21 Jan 2003 15:20:32 -0000	1.6
+++ cdiff.m	25 May 2005 03:43:41 -0000	1.7
@@ -1,3 +1,15 @@
+## Copyright (C) 2002 Etienne Grossmann.  All rights reserved.
+##
+## 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 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.
+
 ## c = cdiff (func,wrt,N,dfunc,stack,dx) - Code for num. differentiation
 ##   = "function df = dfunc (var1,..,dvar,..,varN) .. endfunction
 ## 

Index: test_nelder_mead_min_2.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/test_nelder_mead_min_2.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test_nelder_mead_min_2.m	28 Mar 2002 15:52:13 -0000	1.1
+++ test_nelder_mead_min_2.m	25 May 2005 03:43:41 -0000	1.2
@@ -15,6 +15,8 @@
 ## Checks wether the function 'nelder_mead_min' accepts options properly
 ##
 
+## Author: Etienne Grossmann <et...@cs...>
+
 ok = 1;
 cnt = 1;
 

Index: test_d2_min_2.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/test_d2_min_2.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test_d2_min_2.m	28 Mar 2002 20:08:12 -0000	1.2
+++ test_d2_min_2.m	25 May 2005 03:43:41 -0000	1.3
@@ -10,18 +10,6 @@
 ## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 ## for more details.
 
-## Copyright (C) 2002 Etienne Grossmann.  All rights reserved.
-##
-## 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 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.
-
 ## Test whether d2_min() functions correctly, with two args
 ##
 ## Gives a simple quadratic programming problem (function ff below).
@@ -30,7 +18,7 @@
 ##
 ## If a variables "verbose" is set, then some comments are output.
 
-## Author:        Etienne Grossmann  <et...@is...>
+## Author:        Etienne Grossmann <et...@cs...>
 
 1 ;
 
@@ -71,8 +59,6 @@
 ##
 ## Returns the cputime since last call to 'mytic'.
 
-## Author:        Etienne Grossmann  <et...@is...>
-## Last modified: October 2000
 function dt = mytic()
    static last_mytic = 0 ;
    [t,u,s] = cputime() ;
@@ -84,8 +70,6 @@
 ##
 ## s == mean(x(:).^2) , but ignores NaN's
 
-## Author:        Etienne Grossmann  <et...@is...>
-## Last modified: October 2000
 
 function s = msq(x)
 try
@@ -127,4 +111,4 @@
 
 if verbose && ok
     printf ( "All tests ok\n");
-end
\ No newline at end of file
+end

Index: lp_test.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/lp_test.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lp_test.m	20 Oct 2003 17:31:31 -0000	1.3
+++ lp_test.m	25 May 2005 03:43:41 -0000	1.4
@@ -1,3 +1,15 @@
+## Copyright (C) 2000 Ben Sapp.  All rights reserved.
+##
+## This 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 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.
+
 page_screen_output = 0;
 A1 = [-1 1 2 1 2 ; -1 2 3 1 1 ; -1 1 1 2 1 ];
 B1 = [7;6;4];

Index: test_d2_min_3.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/test_d2_min_3.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- test_d2_min_3.m	21 Jan 2003 15:20:32 -0000	1.3
+++ test_d2_min_3.m	25 May 2005 03:43:41 -0000	1.4
@@ -18,7 +18,7 @@
 ##
 ## If a variables "verbose" is set, then some comments are output.
 
-## Author:        Etienne Grossmann  <et...@is...>
+## Author:        Etienne Grossmann <et...@cs...>
 
 
 1 ;
@@ -61,8 +61,6 @@
 ##
 ## Returns the cputime since last call to 'mytic'.
 
-## Author:        Etienne Grossmann  <et...@is...>
-## Last modified: October 2000
 function dt = mytic()
    static last_mytic = 0 ;
    [t,u,s] = cputime() ;

Index: nmsmax.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/nmsmax.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nmsmax.m	18 Jun 2003 15:30:34 -0000	1.2
+++ nmsmax.m	25 May 2005 03:43:41 -0000	1.3
@@ -28,7 +28,8 @@
 %        NMSMAX(fun, x0, STOPIT, SAVIT, P1, P2,...) allows additional
 %        arguments to be passed to fun, via feval(fun,x,P1,P2,...).
 
-% From Matrix Toolbox (C) 2002 N.J.Higham
+% From Matrix Toolbox 
+% Copyright (C) 2002 N.J.Higham
 % www.maths.man.ac.uk/~higham/mctoolbox
 % distributed under the terms of the GNU General Public License
 %