Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use the conversion functions from MatrixUtils 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@780309 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Luc Maisonobe 2009-05-30 18:38:23 +00:00
parent aea0ab1242
commit 4cc4579d39
1 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/java/org/apache/commons/math/ode/NordsieckTransformer.java
View File

@ -21,12 +21,11 @@ import java.io.Serializable;
import java.math.BigInteger;
import org.apache.commons.math.fraction.BigFraction;
import org.apache.commons.math.linear.DefaultFieldMatrixPreservingVisitor;
import org.apache.commons.math.linear.FieldMatrix;
import org.apache.commons.math.linear.FieldMatrixImpl;
import org.apache.commons.math.linear.InvalidMatrixException;
import org.apache.commons.math.linear.MatrixUtils;
import org.apache.commons.math.linear.RealMatrix;
import org.apache.commons.math.linear.RealMatrixImpl;
import org.apache.commons.math.linear.decomposition.FieldDecompositionSolver;
import org.apache.commons.math.linear.decomposition.FieldLUDecompositionImpl;
@ -116,17 +115,12 @@ public class NordsieckTransformer implements Serializable {
// from Nordsieck to multistep
final FieldMatrix<BigFraction> bigNtoM = buildNordsieckToMultistep(p, q, r, s);
Convertor convertor = new Convertor();
bigNtoM.walkInOptimizedOrder(convertor);
nordsieckToMultistep = convertor.getConvertedMatrix();
nordsieckToMultistep = MatrixUtils.bigFractionMatrixToRealMatrix(bigNtoM);
// from multistep to Nordsieck
final FieldDecompositionSolver<BigFraction> solver =
new FieldLUDecompositionImpl<BigFraction>(bigNtoM).getSolver();
final FieldMatrix<BigFraction> bigMtoN = solver.getInverse();
convertor = new Convertor();
bigMtoN.walkInOptimizedOrder(convertor);
multistepToNordsieck = convertor.getConvertedMatrix();
multistepToNordsieck = MatrixUtils.bigFractionMatrixToRealMatrix(solver.getInverse());
}
@ -185,39 +179,6 @@ public class NordsieckTransformer implements Serializable {
}
/** Convertor for {@link FieldMatrix}/{@link BigFraction}. */
private static class Convertor extends DefaultFieldMatrixPreservingVisitor<BigFraction> {
/** Converted array. */
private double[][] data;
/** Simple constructor. */
public Convertor() {
super(BigFraction.ZERO);
}
/** {@inheritDoc} */
@Override
public void start(int rows, int columns,
int startRow, int endRow, int startColumn, int endColumn) {
data = new double[rows][columns];
}
/** {@inheritDoc} */
@Override
public void visit(int row, int column, BigFraction value) {
data[row][column] = value.doubleValue();
}
/** Get the converted matrix.
* @return converted matrix
*/
RealMatrix getConvertedMatrix() {
return new RealMatrixImpl(data, false);
}
}
/**
* Transform a scalar state history from multistep form to Nordsieck form.
* <p>