Skip to content

Commit

Permalink
update libpll (fix asc. bias with tip-inner) + typos
Browse files Browse the repository at this point in the history
  • Loading branch information
amkozlov committed Nov 27, 2019
1 parent 8295985 commit 7a0715a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/optimize/pll_optimize.c
Expand Up @@ -947,7 +947,7 @@ static int recomp_iterative (pll_newton_tree_params_t * params,
* reproducible if several branches are optimized in parallel.
*
* @param[in,out] partition the PLL partition structure
* @param[in,out] tree the PLL unrotted tree structure
* @param[in,out] tree the PLL unrooted tree structure
* @param params_indices the indices of the parameter sets
* @param branch_length_min lower bound for branch lengths
* @param branch_length_max upper bound for branch lengths
Expand Down Expand Up @@ -1102,7 +1102,7 @@ PLL_EXPORT double pllmod_opt_optimize_branch_lengths_local (
* Check `pllmod_opt_optimize_branch_lengths_local` documentation.
*
* @param[in,out] partition the PLL partition structure
* @param[in,out] tree the PLL unrotted tree structure
* @param[in,out] tree the PLL unrooted tree structure
* @param params_indices the indices of the parameter sets
* @param branch_length_min lower bound for branch lengths
* @param branch_length_max upper bound for branch lengths
Expand Down Expand Up @@ -1895,7 +1895,7 @@ PLL_EXPORT double pllmod_opt_optimize_branch_lengths_local_multi (
assert(new_loglikelihood - loglikelihood > new_loglikelihood * BETTER_LL_TRESHOLD);
else if (opt_method == PLLMOD_OPT_BLO_NEWTON_FALLBACK)
{
// reset branch lenghts
// reset branch lengths
params.opt_method = PLLMOD_OPT_BLO_NEWTON_SAFE;
iters = (unsigned int) max_iters;
}
Expand Down
2 changes: 1 addition & 1 deletion src/tree/pll_tree.h
Expand Up @@ -416,7 +416,7 @@ PLL_EXPORT unsigned int pllmod_utree_rf_distance(pll_unode_t * t1,
PLL_EXPORT int pllmod_utree_consistency_check(pll_utree_t * t1,
pll_utree_t * t2);

/* if 2 different trees are parsed from newick node ids migh have been set
/* if 2 different trees are parsed from newick node ids might have been set
in a different order, so this function sets node ids in t2 such that
node ids and tip labels agree in both trees */
PLL_EXPORT int pllmod_utree_consistency_set(pll_utree_t * t1,
Expand Down

0 comments on commit 7a0715a

Please sign in to comment.