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

Remove merge-added ======'s so this compiles

This commit is contained in:
Christopher Hartl 2011-08-15 16:53:05 -04:00
parent cf3e826a69
commit 5aa61fefec
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1418,7 +1418,6 @@ public class MathUtils {
return 1.0-(new ChiSquare(contingencyTable.length*contingencyTable[0].length,null)).cdf(chi); return 1.0-(new ChiSquare(contingencyTable.length*contingencyTable[0].length,null)).cdf(chi);
} }
=======
public static double marginalizedFisherExact(double[] spectrum1, double[] spectrum2, int ns1, int ns2) { public static double marginalizedFisherExact(double[] spectrum1, double[] spectrum2, int ns1, int ns2) {
int N = ns1 + ns2; int N = ns1 + ns2;
int[] rowSums = { ns1, ns2 }; int[] rowSums = { ns1, ns2 };