mirror of
https://github.com/apache/commons-math.git
synced 2025-03-03 23:19:05 +00:00
Merge branch 'feature-MATH-1015' into develop
Completes issue MATH-1015 (see JIRA).
This commit is contained in:
commit
fb1c112788
@ -54,6 +54,9 @@ If the output is not quite correct, check for invisible trailing spaces!
|
||||
</release>
|
||||
|
||||
<release version="4.0" date="XXXX-XX-XX" description="">
|
||||
<action dev="erans" type="add" issue="MATH-1015" due-to="Thomas Neidhart">
|
||||
Gauss-Laguerre quadrature.
|
||||
</action>
|
||||
<action dev="erans" type="add" issue="MATH-1350" due-to="Rob Tompkins">
|
||||
Improved code coverage (unit tests).
|
||||
</action>
|
||||
@ -141,35 +144,35 @@ If the output is not quite correct, check for invisible trailing spaces!
|
||||
"MathRuntimeException" is now the base class for all commons-math
|
||||
exceptions (except for "NullArgumentException" which extends
|
||||
"NullPointerException").
|
||||
</action>
|
||||
</action>
|
||||
<action dev="tn" type="remove" issue="MATH-1205">
|
||||
Removed methods "test(...)" from "AbstractUnivariateStatistic".
|
||||
The already existing methods "MathArrays#verifyValues(...)" shall
|
||||
be used instead.
|
||||
</action>
|
||||
</action>
|
||||
<action dev="tn" type="update" issue="MATH-1205">
|
||||
The abstract class "AbstractStorelessUnivariateStatistic" does not
|
||||
extend anymore from "AbstractUnivariateStatistic".
|
||||
</action>
|
||||
</action>
|
||||
<action dev="tn" type="update" issue="MATH-1205">
|
||||
Default implementation of
|
||||
"AbstractStorelessUnivariateStatistic#equals(Object)"
|
||||
will only return true if both instances have the same type. Previously
|
||||
different statistics were considered to be equal if their current state
|
||||
happened to be equal.
|
||||
</action>
|
||||
</action>
|
||||
<action dev="tn" type="update" issue="MATH-1205">
|
||||
Default implementations of "AbstractStorelessUnivariateStatistic#evaluate(...)"
|
||||
do not alter the internal state anymore. Instead a temporary copy of
|
||||
the statistic is created for evaluation purposes.
|
||||
</action>
|
||||
</action>
|
||||
<action dev="tn" type="fix" issue="MATH-1205">
|
||||
Methods "evaluate(...)" of class "Variance" changed the internal state
|
||||
although it was stated differently in the javadoc.
|
||||
</action>
|
||||
<action dev="luc" type="fix" issue="MATH-1191">
|
||||
Fixed ignored method parameters in QRDecomposition protected methods.
|
||||
</action>
|
||||
</action>
|
||||
<action dev="luc" type="fix" issue="MATH-1212">
|
||||
Changed javadoc as the RandomDataGenerator class does not implement
|
||||
an interface anymore (the previous interface has been deprecated in
|
||||
|
@ -35,6 +35,27 @@ public class GaussIntegratorFactory {
|
||||
private final BaseRuleFactory<BigDecimal> legendreHighPrecision = new LegendreHighPrecisionRuleFactory();
|
||||
/** Generator of Gauss-Hermite integrators. */
|
||||
private final BaseRuleFactory<Double> hermite = new HermiteRuleFactory();
|
||||
/** Generator of Gauss-Laguerre integrators. */
|
||||
private final BaseRuleFactory<Double> laguerre = new LaguerreRuleFactory();
|
||||
|
||||
/**
|
||||
* Creates a Gauss-Laguerre integrator of the given order.
|
||||
* The call to the
|
||||
* {@link GaussIntegrator#integrate(org.apache.commons.math4.analysis.UnivariateFunction)
|
||||
* integrate} method will perform an integration on the interval
|
||||
* \([0, +\infty)\): the computed value is the improper integral of
|
||||
* \(e^{-x} f(x)\)
|
||||
* where \(f(x)\) is the function passed to the
|
||||
* {@link SymmetricGaussIntegrator#integrate(org.apache.commons.math4.analysis.UnivariateFunction)
|
||||
* integrate} method.
|
||||
*
|
||||
* @param numberOfPoints Order of the integration rule.
|
||||
* @return a Gauss-Legendre integrator.
|
||||
* @since 4.0
|
||||
*/
|
||||
public GaussIntegrator laguerre(int numberOfPoints) {
|
||||
return new GaussIntegrator(getRule(laguerre, numberOfPoints));
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a Gauss-Legendre integrator of the given order.
|
||||
|
@ -0,0 +1,84 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.commons.math4.analysis.integration.gauss;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import org.apache.commons.math4.analysis.polynomials.PolynomialFunction;
|
||||
import org.apache.commons.math4.analysis.polynomials.PolynomialsUtils;
|
||||
import org.apache.commons.math4.exception.DimensionMismatchException;
|
||||
import org.apache.commons.math4.linear.EigenDecomposition;
|
||||
import org.apache.commons.math4.linear.MatrixUtils;
|
||||
import org.apache.commons.math4.linear.RealMatrix;
|
||||
import org.apache.commons.math4.util.Pair;
|
||||
|
||||
/**
|
||||
* Factory that creates Gauss-type quadrature rule using Laguerre polynomials.
|
||||
*
|
||||
* @see <a href="http://en.wikipedia.org/wiki/Gauss%E2%80%93Laguerre_quadrature">Gauss-Laguerre quadrature (Wikipedia)</a>
|
||||
* @since 4.0
|
||||
*/
|
||||
public class LaguerreRuleFactory extends BaseRuleFactory<Double> {
|
||||
/** {@inheritDoc} */
|
||||
@Override
|
||||
protected Pair<Double[], Double[]> computeRule(int numberOfPoints)
|
||||
throws DimensionMismatchException {
|
||||
|
||||
final RealMatrix companionMatrix = companionMatrix(numberOfPoints);
|
||||
final EigenDecomposition eigen = new EigenDecomposition(companionMatrix);
|
||||
final double[] roots = eigen.getRealEigenvalues();
|
||||
Arrays.sort(roots);
|
||||
|
||||
final Double[] points = new Double[numberOfPoints];
|
||||
final Double[] weights = new Double[numberOfPoints];
|
||||
|
||||
final int n1 = numberOfPoints + 1;
|
||||
final long n1Squared = n1 * (long) n1;
|
||||
final PolynomialFunction laguerreN1 = PolynomialsUtils.createLaguerrePolynomial(n1);
|
||||
for (int i = 0; i < numberOfPoints; i++) {
|
||||
final double xi = roots[i];
|
||||
points[i] = xi;
|
||||
|
||||
final double val = laguerreN1.value(xi);
|
||||
weights[i] = xi / n1Squared / (val * val);
|
||||
}
|
||||
|
||||
return new Pair<Double[], Double[]>(points, weights);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param degree Matrix dimension.
|
||||
* @return a square matrix.
|
||||
*/
|
||||
private RealMatrix companionMatrix(final int degree) {
|
||||
final RealMatrix c = MatrixUtils.createRealMatrix(degree, degree);
|
||||
|
||||
for (int i = 0; i < degree; i++) {
|
||||
c.setEntry(i, i, 2 * i + 1);
|
||||
if (i + 1 < degree) {
|
||||
// subdiagonal
|
||||
c.setEntry(i+1, i, -(i + 1));
|
||||
}
|
||||
if (i - 1 >= 0) {
|
||||
// superdiagonal
|
||||
c.setEntry(i-1, i, -i);
|
||||
}
|
||||
}
|
||||
|
||||
return c;
|
||||
}
|
||||
}
|
@ -0,0 +1,50 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.commons.math4.analysis.integration.gauss;
|
||||
|
||||
import org.apache.commons.math4.analysis.UnivariateFunction;
|
||||
import org.apache.commons.math4.special.Gamma;
|
||||
import org.apache.commons.math4.util.FastMath;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* Test of the {@link LaguerreRuleFactory}.
|
||||
*/
|
||||
public class LaguerreTest {
|
||||
private static final GaussIntegratorFactory factory = new GaussIntegratorFactory();
|
||||
|
||||
@Test
|
||||
public void testGamma() {
|
||||
final double tol = 1e-13;
|
||||
|
||||
for (int i = 2; i < 10; i += 1) {
|
||||
final double t = i;
|
||||
|
||||
final UnivariateFunction f = new UnivariateFunction() {
|
||||
@Override
|
||||
public double value(double x) {
|
||||
return FastMath.pow(x, t - 1);
|
||||
}
|
||||
};
|
||||
|
||||
final GaussIntegrator integrator = factory.laguerre(7);
|
||||
final double s = integrator.integrate(f);
|
||||
Assert.assertEquals(1d, Gamma.gamma(t) / s, tol);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user