zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generalizing to avoid JDK 1.7 incompatibilities

This commit is contained in:
Eric Banks 2012-03-12 22:50:59 -04:00
parent 359090c4b7
commit 2314787767
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/java/src/org/broadinstitute/sting/utils/MathUtils.java
View File

@ -128,11 +128,11 @@ public class MathUtils {
return big + MathUtils.jacobianLogTable[ind]; return big + MathUtils.jacobianLogTable[ind];
} }
public static double sum(Collection<Number> numbers) { public static double sum(Collection<? extends Number> numbers) {
return sum(numbers, false); return sum(numbers, false);
} }
public static double sum(Collection<Number> numbers, boolean ignoreNan) { public static double sum(Collection<? extends Number> numbers, boolean ignoreNan) {
double sum = 0; double sum = 0;
for (Number n : numbers) { for (Number n : numbers) {
if (!ignoreNan || !Double.isNaN(n.doubleValue())) { if (!ignoreNan || !Double.isNaN(n.doubleValue())) {
@ -152,8 +152,8 @@ public class MathUtils {
return size; return size;
} }
public static double average(Collection<Integer> x) { public static double average(Collection<? extends Number> x) {
return (double) sum(x) / x.size(); return sum(x) / x.size();
} }
public static double average(Collection<Number> numbers, boolean ignoreNan) { public static double average(Collection<Number> numbers, boolean ignoreNan) {
@ -1100,13 +1100,6 @@ public class MathUtils {
return getQScoreOrderStatistic(reads, offsets, (int) Math.floor(reads.size() / 2.)); return getQScoreOrderStatistic(reads, offsets, (int) Math.floor(reads.size() / 2.));
} }
public static long sum(Collection<Integer> x) {
long sum = 0;
for (int v : x)
sum += v;
return sum;
}
/** /**
* A utility class that computes on the fly average and standard deviation for a stream of numbers. * A utility class that computes on the fly average and standard deviation for a stream of numbers.
* The number of observations does not have to be known in advance, and can be also very big (so that * The number of observations does not have to be known in advance, and can be also very big (so that