Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (4)
Enable reading number of bootstraps from phyml runs
· 8880102e
Andreas Tille
authored
Feb 01, 2017
8880102e
Close bug and upload
· ae372fca
Andreas Tille
authored
Feb 01, 2017
ae372fca
Merge branch 'master' into debian/jessie-backports
· ecdea44d
Andreas Tille
authored
Feb 06, 2017
ecdea44d
Rebuild for jessie-backports
· f8a5720b
Andreas Tille
authored
Feb 06, 2017
f8a5720b
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
f8a5720b
seaview (1:4.6.1.2-2~bpo8+1) jessie-backports; urgency=medium
* Rebuild for jessie-backports.
-- Andreas Tille <tille@debian.org> Mon, 06 Feb 2017 09:44:39 +0100
seaview (1:4.6.1.2-2) unstable; urgency=medium
* Enable reading number of bootstraps from phyml runs
Closes: #853835
-- Andreas Tille <tille@debian.org> Wed, 01 Feb 2017 12:54:56 +0100
seaview (1:4.6.1.2-1~bpo8+1) jessie-backports; urgency=medium
* Rebuild for jessie-backports to become compatible with backported phyml
...
...
debian/patches/evaluate_phyml_bootstrap_number.patch
0 → 100644
View file @
f8a5720b
Description: Enable reading number of bootstraps from phyml runs
Author: Manolo Gouy <manolo.gouy@univ-lyon1.fr>
Patch extracted from Upstream version 4.6.1.3
Last-Update: Wed, 01 Feb 2017 08:51:09 +0100
--- a/trees.cxx
+++ b/trees.cxx
@@ -1201,6 +1201,24 @@
void run_phyml_callback(Fl_Widget *ob, v
display_tree = put_names_back_in_tree(display_tree, truenames);
//process bootstrap trees
char *bootstrap_trees = NULL;
+ if (replicates > 0) {
+ sprintf(input, "%s.phy_phyml_boot_stats.txt", base_fname);
+ in = fopen(input, "r");
+ if (!in) {
+ sprintf(input, "%s.phy_phyml_boot_stats", base_fname);
+ in = fopen(input, "r");
+ }
+ if (in) { // compute the true # of bootstrap replicates because parallelized phyML can compute a few more
+ char line[150];
+ while ((p = fgets(line, sizeof(line), in))) {
+ while (*p == ' ') p++;
+ if (*p == '#') {
+ sscanf(p+1, "%d", &replicates);
+ }
+ }
+ fclose(in);
+ }
+ }
if (replicates > 0 && b_keep_trees->value()) {
sprintf(input, "%s.phy_phyml_boot_trees.txt", base_fname);
in = fopen(input, "r");
debian/patches/series
0 → 100644
View file @
f8a5720b
evaluate_phyml_bootstrap_number.patch