commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pste...@apache.org
Subject svn commit: r799105 - in /commons/proper/math/trunk: LICENSE.txt NOTICE.txt
Date Wed, 29 Jul 2009 22:35:16 GMT
Author: psteitz
Date: Wed Jul 29 22:35:15 2009
New Revision: 799105

URL: http://svn.apache.org/viewvc?rev=799105&view=rev
Log:
Put copyright notices in NOTICE.txt, clean up LICENSE.txt (mostly s/used/translated)

Modified:
    commons/proper/math/trunk/LICENSE.txt
    commons/proper/math/trunk/NOTICE.txt

Modified: commons/proper/math/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/LICENSE.txt?rev=799105&r1=799104&r2=799105&view=diff
==============================================================================
--- commons/proper/math/trunk/LICENSE.txt (original)
+++ commons/proper/math/trunk/LICENSE.txt Wed Jul 29 22:35:15 2009
@@ -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 @@
 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 @@
 (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 @@
 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 @@
 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.                          

Modified: commons/proper/math/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/NOTICE.txt?rev=799105&r1=799104&r2=799105&view=diff
==============================================================================
--- commons/proper/math/trunk/NOTICE.txt (original)
+++ commons/proper/math/trunk/NOTICE.txt Wed Jul 29 22:35:15 2009
@@ -4,37 +4,45 @@
 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
-
-The complete text of these licenses and disclaimers as available at
-time of code inclusion are in the LICENSE.txt file.
+Nishimura. Original source copyright:
+Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+All rights reserved
+===============================================================================
+
+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.



Mime
View raw message