Put copyright notices in NOTICE.txt, clean up LICENSE.txt (mostly s/used/translated)

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@799105 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Phil Steitz 2009-07-29 22:35:15 +00:00
parent d15cb255c2
commit a021d46d5c
2 changed files with 39 additions and 32 deletions

View File

@ -202,7 +202,6 @@
limitations under the License.
APACHE COMMONS MATH DERIVATIVE WORKS:
The Apache commons-math library includes a number of subcomponents
@ -210,10 +209,11 @@ whose implementation is derived from original sources written
in C or Fortran. License terms of the original sources
are reproduced below.
===============================================================================
For the lmder, lmpar and qrsolv Fortran routine from minpack and used in
class LevenbergMarquardtOptimizer class in package
org.apache.commons.math.optimization.general
(http://www.netlib.org/minpack/disclaimer):
org.apache.commons.math.optimization.general
Original source copyright and license statement:
Minpack Copyright Notice (1999) University of Chicago. All rights reserved
@ -266,12 +266,12 @@ SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE
POSSIBILITY OF SUCH LOSS OR DAMAGES.
===============================================================================
Copyright and license statement for the odex Fortran routine developed by
E. Hairer and G. Wanner and translated in GraggBulirschStoerIntegrator class
in package org.apache.commons.math.ode.nonstiff:
For the odex Fortran routine developed by E. Hairer and G. Wanner
and used in GraggBulirschStoerIntegrator class in package
org.apache.commons.math.ode.nonstiff
(http://www.unige.ch/~hairer/prog/licence.txt):
Copyright (c) 2004, Ernst Hairer
@ -297,12 +297,11 @@ 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.
===============================================================================
For the original lapack fortran routines used in EigenDecompositionImpl
class in package org.apache.commons.math.linear
(http://www.netlib.org/lapack/LICENSE):
Copyright and license statement for the original lapack fortran routines
translated in EigenDecompositionImpl class in package
org.apache.commons.math.linear:
Copyright (c) 1992-2008 The University of Tennessee. All rights reserved.
@ -339,11 +338,11 @@ 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.
===============================================================================
For the original Mersenne twister C routines used in
MersenneTwister class in package org.apache.commons.math.random
(http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c):
Copyright and license statement for the original Mersenne twister C
routines translated in MersenneTwister class in package
org.apache.commons.math.random:
Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
All rights reserved.

View File

@ -4,37 +4,45 @@ Copyright 2001-2009 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
===============================================================================
The LinearConstraint, LinearObjectiveFunction, LinearOptimizer,
RelationShip, SimplexSolver and SimplexTableau classes in package
org.apache.commons.math.optimization.linear includes software developed by
Benjamin McCann (http://www.benmccann.com) and distributed with with
org.apache.commons.math.optimization.linear include software developed by
Benjamin McCann (http://www.benmccann.com) and distributed with
the following copyright: Copyright 2009 Google Inc.
===============================================================================
This product includes software developed by the
University of Chicago, as Operator of Argonne National
Laboratory.
The LevenbergMarquardtOptimizer class in package
org.apache.commons.math.optimization.general includes software
translated from the lmder, lmpar and qrsolv Fortran routines
from the Minpack package and
distributed under the following disclaimer:
http://www.netlib.org/minpack/disclaimer
from the Minpack package
Minpack Copyright Notice (1999) University of Chicago. All rights reserved
===============================================================================
The GraggBulirschStoerIntegrator class in package
org.apache.commons.math.ode.nonstiff includes software translated
from the odex Fortran routine developed by E. Hairer and G. Wanner
and distributed under the following
license:
http://www.unige.ch/~hairer/prog/licence.txt
from the odex Fortran routine developed by E. Hairer and G. Wanner.
Original source copyright:
Copyright (c) 2004, Ernst Hairer
===============================================================================
The EigenDecompositionImpl class in package
org.apache.commons.math.linear includes software translated
from some LAPACK Fortran routines and distributed under the
following license:
http://www.netlib.org/lapack/LICENSE
from some LAPACK Fortran routines. Original source copyright:
Copyright (c) 1992-2008 The University of Tennessee. All rights reserved.
===============================================================================
The MersenneTwister class in package org.apache.commons.math.random
includes software translated from the 2002-01-26 version of
the Mersenne-Twister generator written in C by Makoto Matsumoto and Takuji
Nishimura which is distributed une a BSD license :
http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
Nishimura. Original source copyright:
Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
All rights reserved
===============================================================================
The complete text of these licenses and disclaimers as available at
time of code inclusion are in the LICENSE.txt file.
The complete text of licenses and disclaimers associated with the the original
sources enumerated above at the time of code translation are in the LICENSE.txt
file.