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

Solve merge conflict

This commit is contained in:
Guillermo del Angel 2012-02-17 10:56:03 -05:00
parent 2f08846d82 cd352f502d
commit 3e031a540f
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/IndelGenotypeLikelihoodsCalculationModel.java
View File

@ -150,14 +150,12 @@ public class IndelGenotypeLikelihoodsCalculationModel extends GenotypeLikelihood
// case 1: current insertion is prefix of indel in hash map // case 1: current insertion is prefix of indel in hash map
consensusIndelStrings.put(s, cnt + 1); consensusIndelStrings.put(s, cnt + 1);
foundKey = true; foundKey = true;
break;
} else if (indelString.startsWith(s)) { } else if (indelString.startsWith(s)) {
// case 2: indel stored in hash table is prefix of current insertion // case 2: indel stored in hash table is prefix of current insertion
// In this case, new bases are new key. // In this case, new bases are new key.
consensusIndelStrings.remove(s); consensusIndelStrings.remove(s);
consensusIndelStrings.put(indelString, cnt + 1); consensusIndelStrings.put(indelString, cnt + 1);
foundKey = true; foundKey = true;
break;
} }
} }
if (!foundKey) if (!foundKey)
@ -172,7 +170,6 @@ public class IndelGenotypeLikelihoodsCalculationModel extends GenotypeLikelihood
// case 1: current insertion is suffix of indel in hash map // case 1: current insertion is suffix of indel in hash map
consensusIndelStrings.put(s, cnt + 1); consensusIndelStrings.put(s, cnt + 1);
foundKey = true; foundKey = true;
break;
} else if (indelString.endsWith(s)) { } else if (indelString.endsWith(s)) {
// case 2: indel stored in hash table is suffix of current insertion // case 2: indel stored in hash table is suffix of current insertion
// In this case, new bases are new key. // In this case, new bases are new key.
@ -180,7 +177,6 @@ public class IndelGenotypeLikelihoodsCalculationModel extends GenotypeLikelihood
consensusIndelStrings.remove(s); consensusIndelStrings.remove(s);
consensusIndelStrings.put(indelString, cnt + 1); consensusIndelStrings.put(indelString, cnt + 1);
foundKey = true; foundKey = true;
break;
} }
} }
if (!foundKey) if (!foundKey)