diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/concordance/NWayVenn.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/concordance/NWayVenn.java index 0b7c101cf..a3001c8da 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/concordance/NWayVenn.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/concordance/NWayVenn.java @@ -22,13 +22,12 @@ import java.util.Map.Entry; public class NWayVenn implements ConcordanceType { // TODO -- change this to use Ryan's generic map object when it's ready - private HashMap writers = new HashMap(); + private HashMap writers = new HashMap(); + private PrintWriter union_writer = null; private String prefix; private int N; - private PrintWriter union_writer = null; - public NWayVenn() {} public void initialize(String prefix, HashMap args) { @@ -59,7 +58,7 @@ public class NWayVenn implements ConcordanceType { try { for ( Entry file : files.entrySet() ) - writers.put(stringToHash(file.getKey()), new PrintWriter(prefix + "." + N + "wayVenn" + file.getValue() + ".calls")); + writers.put(file.getKey(), new PrintWriter(prefix + "." + N + "wayVenn" + file.getValue() + ".calls")); union_writer = new PrintWriter(prefix + "." + N + "wayVenn.union.calls"); } catch (FileNotFoundException e) { throw new StingException(String.format("Could not open file(s) for writing")); @@ -87,7 +86,7 @@ public class NWayVenn implements ConcordanceType { StringBuilder hashString = new StringBuilder(); for (int i = 0; i < N; i++) hashString.append(calls[i] != null ? "1" : "0"); - printVariant(writers.get(stringToHash(hashString.toString())), calls); + printVariant(writers.get(hashString.toString()), calls); } private static void printVariant(PrintWriter writer, Variation[] variants) { @@ -104,13 +103,4 @@ public class NWayVenn implements ConcordanceType { for ( PrintWriter writer : writers.values() ) writer.close(); } - - private int stringToHash(String s) { - int hash = 0; - for (int i = 0; i < s.length(); i++) { - if ( s.charAt(i) == '1' ) - hash += Math.pow(2, i); - } - return hash; - } } \ No newline at end of file