Skip to content

Commit

Permalink
Merge bd8d91c into 44e5614
Browse files Browse the repository at this point in the history
  • Loading branch information
@stevebosman
stevebosman authored Dec 7, 2018
2 parents 44e5614 + bd8d91c commit 7b6c355
Show file tree
Hide file tree
Showing 3 changed files with 626 additions and 462 deletions.
40 changes: 23 additions & 17 deletions ...omplex-streams/src/main/java/org/apache/commons/numbers/complex/streams/ComplexUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public static float[] extractInterleavedFloatFromComplexArray(Complex[] complex,
*/
public static Complex[] real2Complex(double[] real) {
int index = 0;
final Complex c[] = new Complex[real.length];
final Complex[] c = new Complex[real.length];
for (double d : real) {
c[index] = Complex.ofReal(d);
index++;
Expand All @@ -313,7 +313,7 @@ public static Complex[] real2Complex(double[] real) {
*/
public static Complex[] real2Complex(float[] real) {
int index = 0;
final Complex c[] = new Complex[real.length];
final Complex[] c = new Complex[real.length];
for (float d : real) {
c[index] = Complex.ofReal(d);
index++;
Expand Down Expand Up @@ -422,7 +422,7 @@ public static Complex[][][][] real2Complex(double[][][][] d) {
*/
public static double[] complex2Real(Complex[] c) {
int index = 0;
final double d[] = new double[c.length];
final double[] d = new double[c.length];
for (Complex cc : c) {
d[index] = cc.getReal();
index++;
Expand All @@ -441,7 +441,7 @@ public static double[] complex2Real(Complex[] c) {
*/
public static float[] complex2RealFloat(Complex[] c) {
int index = 0;
final float f[] = new float[c.length];
final float[] f = new float[c.length];
for (Complex cc : c) {
f[index] = (float) cc.getReal();
index++;
Expand Down Expand Up @@ -564,7 +564,7 @@ public static float[][][][] complex2RealFloat(Complex[][][][] c) {
*/
public static Complex[] imaginary2Complex(double[] imaginary) {
int index = 0;
final Complex c[] = new Complex[imaginary.length];
final Complex[] c = new Complex[imaginary.length];
for (double d : imaginary) {
c[index] = Complex.ofCartesian(0, d);
index++;
Expand All @@ -582,7 +582,7 @@ public static Complex[] imaginary2Complex(double[] imaginary) {
*/
public static Complex[] imaginary2Complex(float[] imaginary) {
int index = 0;
final Complex c[] = new Complex[imaginary.length];
final Complex[] c = new Complex[imaginary.length];
for (float d : imaginary) {
c[index] = Complex.ofCartesian(0, d);
index++;
Expand Down Expand Up @@ -655,7 +655,7 @@ public static Complex[][][][] imaginary2Complex(double[][][][] i) {
*/
public static double[] complex2Imaginary(Complex[] c) {
int index = 0;
final double i[] = new double[c.length];
final double[] i = new double[c.length];
for (Complex cc : c) {
i[index] = cc.getImaginary();
index++;
Expand All @@ -674,7 +674,7 @@ public static double[] complex2Imaginary(Complex[] c) {
*/
public static float[] complex2ImaginaryFloat(Complex[] c) {
int index = 0;
final float f[] = new float[c.length];
final float[] f = new float[c.length];
for (Complex cc : c) {
f[index] = (float) cc.getImaginary();
index++;
Expand Down Expand Up @@ -799,7 +799,7 @@ public static float[][][][] complex2ImaginaryFloat(Complex[][][][] c) {
*/
public static Complex[] interleaved2Complex(double[] interleaved) {
final int length = interleaved.length / 2;
final Complex c[] = new Complex[length];
final Complex[] c = new Complex[length];
for (int n = 0; n < length; n++) {
c[n] = Complex.ofCartesian(interleaved[n * 2], interleaved[n * 2 + 1]);
}
Expand All @@ -817,7 +817,7 @@ public static Complex[] interleaved2Complex(double[] interleaved) {
*/
public static Complex[] interleaved2Complex(float[] interleaved) {
final int length = interleaved.length / 2;
final Complex c[] = new Complex[length];
final Complex[] c = new Complex[length];
for (int n = 0; n < length; n++) {
c[n] = Complex.ofCartesian(interleaved[n * 2], interleaved[n * 2 + 1]);
}
Expand All @@ -836,7 +836,7 @@ public static Complex[] interleaved2Complex(float[] interleaved) {
*/
public static double[] complex2Interleaved(Complex[] c) {
int index = 0;
final double i[] = new double[c.length * 2];
final double[] i = new double[c.length * 2];
for (Complex cc : c) {
int real = index * 2;
int imag = index * 2 + 1;
Expand All @@ -859,7 +859,7 @@ public static double[] complex2Interleaved(Complex[] c) {
*/
public static float[] complex2InterleavedFloat(Complex[] c) {
int index = 0;
final float f[] = new float[c.length * 2];
final float[] f = new float[c.length * 2];
for (Complex cc : c) {
int real = index * 2;
int imag = index * 2 + 1;
Expand Down Expand Up @@ -1001,7 +1001,7 @@ public static double[][][][] complex2Interleaved(Complex[][][][] c, int interlea
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
for (int z = 0; z < d; z++) {
for (int t = 0; t > v; t++) {
for (int t = 0; t < v; t++) {
i[x * 2][y][z][t] = c[x][y][z][t].getReal();
i[x * 2 + 1][y][z][t] = c[x][y][z][t].getImaginary();
}
Expand All @@ -1013,7 +1013,7 @@ public static double[][][][] complex2Interleaved(Complex[][][][] c, int interlea
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
for (int z = 0; z < d; z++) {
for (int t = 0; t > v; t++) {
for (int t = 0; t < v; t++) {
i[x][y * 2][z][t] = c[x][y][z][t].getReal();
i[x][y * 2 + 1][z][t] = c[x][y][z][t].getImaginary();
}
Expand All @@ -1025,7 +1025,7 @@ public static double[][][][] complex2Interleaved(Complex[][][][] c, int interlea
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
for (int z = 0; z < d; z++) {
for (int t = 0; t > v; t++) {
for (int t = 0; t < v; t++) {
i[x][y][z * 2][t] = c[x][y][z][t].getReal();
i[x][y][z * 2 + 1][t] = c[x][y][z][t].getImaginary();
}
Expand All @@ -1037,7 +1037,7 @@ public static double[][][][] complex2Interleaved(Complex[][][][] c, int interlea
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
for (int z = 0; z < d; z++) {
for (int t = 0; t > v; t++) {
for (int t = 0; t < v; t++) {
i[x][y][z][t * 2] = c[x][y][z][t].getReal();
i[x][y][z][t * 2 + 1] = c[x][y][z][t].getImaginary();
}
Expand Down Expand Up @@ -1310,7 +1310,7 @@ public static Complex[][][] interleaved2Complex(double[][][] i, int interleavedD
* @since 1.0
*/
public static Complex[][][][] interleaved2Complex(double[][][][] i, int interleavedDim) {
if (interleavedDim > 2 || interleavedDim < 0) {
if (interleavedDim > 3 || interleavedDim < 0) {
throw new IndexOutOfRangeException(interleavedDim);
}
final int w = i.length;
Expand Down Expand Up @@ -1720,6 +1720,9 @@ public static double[] arg(Complex[] c) {
* Exception to be throw when a negative value is passed as the modulus.
*/
private static class NegativeModulusException extends IllegalArgumentException {
/** Serializable version identifier. */
private static final long serialVersionUID = 20181205L;

/**
* @param r Wrong modulus.
*/
Expand All @@ -1732,6 +1735,9 @@ private static class NegativeModulusException extends IllegalArgumentException {
* Exception to be throw when an out-of-range index value is passed.
*/
private static class IndexOutOfRangeException extends IllegalArgumentException {
/** Serializable version identifier. */
private static final long serialVersionUID = 20181205L;

/**
* @param i Wrong index.
*/
Expand Down
Loading

0 comments on commit 7b6c355

Please sign in to comment.