Skip to content

Commit 390274b

Browse files
ldgauthierdroazen
authored andcommitted
Fixed GatherTranches -- gathered tranches should be closer to target truth sensitivity in the lower range (~90%) now (#4313)
1 parent cfa9b3d commit 390274b

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/main/java/org/broadinstitute/hellbender/tools/walkers/vqsr/GatherTranches.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected Object doWork() {
6363
}
6464

6565
//use a data structure to hold the tranches from each scatter shard in a format that's easy to merge
66-
final Map<Double, List<VQSLODTranche>> scatteredTranches = new HashMap<>();
66+
final TreeMap<Double, List<VQSLODTranche>> scatteredTranches = new TreeMap<>();
6767
for (final File trancheFile : inputReports) {
6868
try {
6969
for (final VQSLODTranche currentTranche : VQSLODTranche.readTranches(trancheFile)) {

src/main/java/org/broadinstitute/hellbender/tools/walkers/vqsr/VQSLODTranche.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@ public static List<VQSLODTranche> readTranches(final File f) throws IOException{
130130
return tranches;
131131
}
132132

133-
public static List<TruthSensitivityTranche> mergeAndConvertTranches(final Map<Double, List<VQSLODTranche>> scatteredTranches, final List<Double> tsLevels, final VariantRecalibratorArgumentCollection.Mode mode) {
133+
public static List<TruthSensitivityTranche> mergeAndConvertTranches(final TreeMap<Double, List<VQSLODTranche>> scatteredTranches, final List<Double> tsLevels, final VariantRecalibratorArgumentCollection.Mode mode) {
134134
List<VQSLODTranche> mergedTranches = new ArrayList<>();
135135
List<TruthSensitivityTranche> gatheredTranches = new ArrayList<>();
136136

137137
//make a list of merged tranches of the same length
138-
for (final Double VQSLODlevel : scatteredTranches.keySet()) {
138+
for (final Double VQSLODlevel : scatteredTranches.descendingKeySet()) {
139139
mergedTranches.add(mergeAndConvertTranches(scatteredTranches.get(VQSLODlevel),mode));
140140
}
141141

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:84435fbcadecb6904210371229fb373dd76092ccb91cec3255a189df48b423f7
3-
size 568
2+
oid sha256:e2c27cfe8f79a1cc8f796a889884472d5fca489e25ee4cb36ac811a771edad81
3+
size 569

0 commit comments

Comments
 (0)