Repository: commons-math Updated Branches: refs/heads/master 4a8bde2f7 -> 07ffb3297
Added missing Scipy license, moved attribution out of NOTICE file. Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/07ffb329 Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/07ffb329 Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/07ffb329 Branch: refs/heads/master Commit: 07ffb3297cafd305ca88e5f64f85e496a603e7c7 Parents: 4a8bde2 Author: Luc Maisonobe <l...@apache.org> Authored: Fri Dec 19 14:26:18 2014 +0100 Committer: Luc Maisonobe <l...@apache.org> Committed: Fri Dec 19 14:26:18 2014 +0100 ---------------------------------------------------------------------- LICENSE.txt | 41 +++++++++++++++++++++++++++++++++++++++++ NOTICE.txt | 7 ------- 2 files changed, 41 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/07ffb329/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index d62494a..cc1104d 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -446,3 +446,44 @@ http://www.netlib.org/specfun/rjbesl by R.J. Cody at Argonne National Laboratory (USA). There is no license or copyright statement included with the original Fortran sources. =============================================================================== + + +The BracketFinder (package org.apache.commons.math3.optimization.univariate) +and PowellOptimizer (package org.apache.commons.math3.optimization.general) +classes are based on the Python code in module "optimize.py" (version 0.5) +developed by Travis E. Oliphant for the SciPy library (http://www.scipy.org/) +Copyright © 2003-2009 SciPy Developers. + +SciPy license +Copyright © 2001, 2002 Enthought, Inc. +All rights reserved. + +Copyright © 2003-2013 SciPy Developers. +All rights reserved. + +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. + + * Neither the name of Enthought nor the names of the SciPy Developers may + be used to endorse or promote products derived from this software without + specific prior written permission. + +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 REGENTS 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. +=============================================================================== + http://git-wip-us.apache.org/repos/asf/commons-math/blob/07ffb329/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt index 3e7e5c8..69c52fa 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -11,13 +11,6 @@ code developed by Mike Giles, Oxford-Man Institute of Quantitative Finance, and published in GPU Computing Gems, volume 2, 2010. =============================================================================== -The BracketFinder (package org.apache.commons.math3.optimization.univariate) -and PowellOptimizer (package org.apache.commons.math3.optimization.general) -classes are based on the Python code in module "optimize.py" (version 0.5) -developed by Travis E. Oliphant for the SciPy library (http://www.scipy.org/) -Copyright © 2003-2009 SciPy Developers. -=============================================================================== - The LinearConstraint, LinearObjectiveFunction, LinearOptimizer, RelationShip, SimplexSolver and SimplexTableau classes in package org.apache.commons.math3.optimization.linear include software developed by
