Merge branch 'master' into release-candidates
diff --git a/LICENSE.txt b/LICENSE.txt
index 13c1d36..d97b49a 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,3 @@
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -202,6 +201,28 @@
limitations under the License.
+Apache Commons Math includes the following code provided to the ASF under the
+Apache License 2.0:
+
+ - The inverse error function implementation in the Erf class is based on CUDA
+ code developed by Mike Giles, Oxford-Man Institute of Quantitative Finance,
+ and published in GPU Computing Gems, volume 2, 2010 (grant received on
+ March 23th 2013)
+ - The LinearConstraint, LinearObjectiveFunction, LinearOptimizer,
+ RelationShip, SimplexSolver and SimplexTableau classes in package
+ org.apache.commons.math3.optimization.linear include software developed by
+ Benjamin McCann (http://www.benmccann.com) and distributed with
+ the following copyright: Copyright 2009 Google Inc. (grant received on
+ March 16th 2009)
+ - The class "org.apache.commons.math3.exception.util.LocalizedFormatsTest" which
+ is an adapted version of "OrekitMessagesTest" test class for the Orekit library
+ - The "org.apache.commons.math3.analysis.interpolation.HermiteInterpolator"
+ has been imported from the Orekit space flight dynamics library.
+
+===============================================================================
+
+
+
APACHE COMMONS MATH DERIVATIVE WORKS:
The Apache commons-math library includes a number of subcomponents
@@ -335,18 +356,6 @@
===============================================================================
-The class "org.apache.commons.math3.exception.util.LocalizedFormatsTest" is
-an adapted version of "OrekitMessagesTest" test class for the Orekit library
-The "org.apache.commons.math3.analysis.interpolation.HermiteInterpolator"
-has been imported from the Orekit space flight dynamics library.
-
-The Orekit library is described at:
- https://www.orekit.org/forge/projects/orekit
-The original files are distributed under the terms of the Apache 2 license
-which is: Copyright 2010 CS Communication & Systèmes
-
-===============================================================================
-
The initial code for shuffling an array (originally in class
"org.apache.commons.math3.random.RandomDataGenerator", now replaced by
a method in class "org.apache.commons.math3.util.MathArrays") was
diff --git a/NOTICE.txt b/NOTICE.txt
index 9b28a60..494fd0f 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -4,25 +4,6 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-===============================================================================
-
-The inverse error function implementation in the Erf class is based on CUDA
-code developed by Mike Giles, Oxford-Man Institute of Quantitative Finance,
-and published in GPU Computing Gems, volume 2, 2010.
-===============================================================================
-
-The LinearConstraint, LinearObjectiveFunction, LinearOptimizer,
-RelationShip, SimplexSolver and SimplexTableau classes in package
-org.apache.commons.math3.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 for Orekit by
CS Systèmes d'Information (http://www.c-s.fr/)
Copyright 2010-2012 CS Systèmes d'Information
-===============================================================================
-
-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.
diff --git a/doc/release/release.howto.txt b/doc/release/release.howto.txt
index cabea89..f593910 100644
--- a/doc/release/release.howto.txt
+++ b/doc/release/release.howto.txt
@@ -299,8 +299,8 @@
$ cd /tmp
$ svn checkout https://dist.apache.org/repos/dist/dev/commons/math
$ cd math
- $ cp ~/.m2/repository/org/apache/commons/commons-math3/3.4*-bin.* binaries
- $ cp ~/.m2/repository/org/apache/commons/commons-math3/3.4*-src.* source
+ $ cp ~/.m2/repository/org/apache/commons/commons-math3/3.4/*-bin.* binaries
+ $ cp ~/.m2/repository/org/apache/commons/commons-math3/3.4/*-src.* source
$ cp <path-to-the-RC-workspace>/RELEASE-NOTES.txt .
$ svn add RELEASE-NOTES.txt binaries/* source/*
$ svn commit -m "Creating distribution files for 3.4 RC1"
@@ -314,7 +314,7 @@
$ mvn site
$ cd target
- $ tar cvf site.tar.gz site
+ $ tar czf site.tar.gz site
$ scp site.tar.gz __Your_apache_login__@people.apache.org:~/
$ ssh __Your_apache_login__@people.apache.org
you@minotaur:~$ tar xzf site.tar.gz
@@ -333,23 +333,25 @@
MATH_3_4_RC1 (signature can be checked from git using 'git tag -v')
Tag URL:
- https://git-wip-us.apache.org/repos/asf?p=commons-math.git;a=snapshot;h=cf4a9d70c9ac24dd7196995390171150e4e56451;sf=tgz
+ <https://git-wip-us.apache.org/repos/asf?p=commons-math.git;a=commit;h=cf4a9d70c9ac24dd7196995390171150e4e56451>
Commit ID the tag points at:
cf4a9d70c9ac24dd7196995390171150e4e56451
Site:
- http://people.apache.org/~__Your_apache_login__/commons-math-3.4-RC1-site
+ <http://people.apache.org/~__Your_apache_login__/commons-math-3.4-RC1-site>
Distribution files:
https://dist.apache.org/repos/dist/dev/commons/math/
Distribution files hashes (SHA1):
- e02c981d49c1f12b1fc237e69cb551a5620e57b4 binaries/commons-math3-3.4-bin.tar.gz
- 11965eb97033d4d6ef0aeb902f1450641f40d3c5 binaries/commons-math3-3.4-bin.zip
- ce3efda70ac8f850f15154b38438bc337adc027a source/commons-math3-3.4-src.tar.gz
- d343c885a9d6eea611403f7f92ff580911363681 source/commons-math3-3.4-src.zip
-
+ e02c981d49c1f12b1fc237e69cb551a5620e57b4 commons-math3-3.4-bin.tar.gz
+ 11965eb97033d4d6ef0aeb902f1450641f40d3c5 commons-math3-3.4-bin.zip
+ ce3efda70ac8f850f15154b38438bc337adc027a commons-math3-3.4-src.tar.gz
+ d343c885a9d6eea611403f7f92ff580911363681 commons-math3-3.4-src.zip
+
+KEYS file to check signatures:
+ http://www.apache.org/dist/commons/KEYS
Maven artifacts:
https://repository.apache.org/content/repositories/orgapachecommons-051/org/apache/commons/commons-math3/3.4/
diff --git a/src/main/java/org/apache/commons/math3/analysis/interpolation/TricubicInterpolatingFunction.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/TricubicInterpolatingFunction.java
index b527996..eaea339 100644
--- a/src/main/java/org/apache/commons/math3/analysis/interpolation/TricubicInterpolatingFunction.java
+++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/TricubicInterpolatingFunction.java
@@ -33,10 +33,8 @@
* <em>Int. J. Numer. Meth. Eng</em> 2005; <b>63</b>:455-471
* </quote>
*
- * @since 2.2
- * @deprecated in 3.4.
+ * @since 3.4.
*/
-@Deprecated
public class TricubicInterpolatingFunction
implements TrivariateFunction {
/**
