diff --git a/license.txt b/license.txt index f7946c208a638d256d5f65a0448dc9e16d1ceb9f..64f84a2d671869c19398249724b6fedf783b6586 100644 --- a/license.txt +++ b/license.txt @@ -89,6 +89,40 @@ Copyright: 2007 Muthiah Annamalai <muthiah.annamalai@uta.edu> 2013 Dynare Team License: GPL-3+ +Files: matlab/lmmcp/catstruct.m +Copyright: 2005 Jos van der Geest <jos@jasen.nl> + 2013 Christophe Gouel +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +Files: matlab/lmmcp/lmmcp.m +Copyright: 2005 Christian Kanzow and Stefania Petra + 2013 Christophe Gouel + 2014 Dynare Team +License: permissive + Unlimited permission is granted to everyone to use, copy, modify or + distribute this software. + Files: doc/dynare.texi doc/*.tex doc/*.svg doc/*.dia doc/*.pdf doc/*.bib Copyright: 1996-2014 Dynare Team License: GFDL-NIV-1.3+ diff --git a/matlab/lmmcp/catstruct.m b/matlab/lmmcp/catstruct.m index e29d36469528262d70faa77445cedb18ffae78c4..515575e18cb7b051174138503db53417881aed01 100644 --- a/matlab/lmmcp/catstruct.m +++ b/matlab/lmmcp/catstruct.m @@ -43,10 +43,33 @@ function A = catstruct(varargin) % for Matlab R13 and up % version 3.0 (mar 2013) -% (c) Jos van der Geest -% email: jos@jasen.nl +% Originally downloaded from MATLAB central: +% http://www.mathworks.com/matlabcentral/fileexchange/7842-catstruct -% (C) 2013 Christophe Gouel +% Copyright (C) 2005 Jos van der Geest <jos@jasen.nl> +% Copyright (C) 2013 Christophe Gouel +% +% Redistribution and use in source and binary forms, with or without +% modification, are permitted provided that the following conditions are +% met: +% +% * Redistributions of source code must retain the above copyright +% notice, this list of conditions and the following disclaimer. +% * Redistributions in binary form must reproduce the above copyright +% notice, this list of conditions and the following disclaimer in +% the documentation and/or other materials provided with the distribution +% +% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +% AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +% IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +% ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +% LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +% CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +% SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +% INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +% CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +% ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +% POSSIBILITY OF SUCH DAMAGE. % History % Created in 2005 diff --git a/matlab/lmmcp/lmmcp.m b/matlab/lmmcp/lmmcp.m index f6c0864b0a95e006efa594607c9720306f79e9ac..2d6189fd0491554745cbd3db3ce280f964ed714e 100644 --- a/matlab/lmmcp/lmmcp.m +++ b/matlab/lmmcp/lmmcp.m @@ -76,7 +76,7 @@ function [x,FVAL,EXITFLAG,OUTPUT,JACOB] = lmmcp(FUN,x,lb,ub,options,varargin) % downloaded from: % http://www.mathematik.uni-wuerzburg.de/~kanzow/software/LMMCP.zip % -% copyright: Christian Kanzow and Stefania Petra +% Written by Christian Kanzow and Stefania Petra % Institute of Applied Mathematics and Statistics % University of Wuerzburg % Am Hubland @@ -85,6 +85,17 @@ function [x,FVAL,EXITFLAG,OUTPUT,JACOB] = lmmcp(FUN,x,lb,ub,options,varargin) % % e-mail: kanzow@mathematik.uni-wuerzburg.de % petra@mathematik.uni-wuerzburg.de +% +% Christian Kanzow sent a private message to Dynare Team on July 8, 2014, +% confirming the free software status of lmmcp and granting unlimited +% permission to use, copy, modifiy or redistribute the file. + +% Copyright (C) 2005 Christian Kanzow and Stefania Petra +% Copyright (C) 2013 Christophe Gouel +% Copyright (C) 2014 Dynare Team +% +% Unlimited permission is granted to everyone to use, copy, modify or +% distribute this software. %% Initialization defaultopt = struct(...