Skip to content

Commit

Permalink
Version 4.10.7
Browse files Browse the repository at this point in the history
  • Loading branch information
smirarab committed Jul 12, 2016
1 parent c7a6a80 commit 5971808
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- version 4.10.7:
- Small bug fix: with `-a` scoring using `-q` didn't work
- Small bug fix: with `-a` scoring using `-q` didn't work. Also, output both gene tree labels and the species tree labels.
- Bug fix: effective N and quartet scores were not correctly printed out with -t X options if gene trees had polytomies. posterior values were correctly computed.
- Warning for low `EN` values.
- Some spell checking on prompts

- version 4.10.6:
Expand Down
4 changes: 4 additions & 0 deletions main/phylonet/coalescent/CommandLine.java
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,10 @@ public static void main(String[] args) throws Exception{
bestTree.add(tr);
}

if (!GlobalMaps.taxonNameMap.getSpeciesIdMapper().isSingleIndividual()) {
System.err.println("Scored tree with gene names:\n"+tr.toNewickWD());
}

GlobalMaps.taxonNameMap.getSpeciesIdMapper().gtToSt((MutableTree) tr);

if (options.getBranchannotation() != 12) {
Expand Down
3 changes: 3 additions & 0 deletions main/phylonet/coalescent/SpeciesMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,7 @@ public void gtToSt(MutableTree st) {
}
}

public boolean isSingleIndividual() {
return taxonIdToSpeciesId.length == speciesIdtoTaxonId.size();
}
}
9 changes: 9 additions & 0 deletions main/phylonet/coalescent/WQInference.java
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,15 @@ public double scoreBranches(Tree st) {
nd.mainfreq = s.qs;
nd.effn = s.effn;


if (nd.effn < 20) {
if (!GlobalMaps.taxonNameMap.getSpeciesIdMapper().isSingleSP(cluster.getBitSet()))
System.err.println("You may want to ignore posterior probabilities and other statistics related to the following "
+ "branch branch because the effective number of genes impacting it is only "+ nd.effn +
". h:\n\t" +
GlobalMaps.taxonNameMap.getSpeciesIdMapper().getSTClusterForGeneCluster(cluster));
}

Quadrapartition[] threequads = new Quadrapartition [] {quad, null,null};

quad = weightCalculator2.new Quadrapartition
Expand Down

0 comments on commit 5971808

Please sign in to comment.