Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Computation of Transfer Bootstrap Extra Information #70

Open
wants to merge 31 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
d4feb52
updated submodule
lutteropp May 13, 2019
7618f86
added extra tbe output
lutteropp Jun 12, 2019
92e14cb
fixed compile errors
lutteropp Jun 12, 2019
4b5d3be
updated submodule
lutteropp Jun 12, 2019
7991296
implemented basic tbe extra table and tbe extra array output
lutteropp Jun 12, 2019
641c26e
adapted to this weird cutoff value from booster
lutteropp Jun 12, 2019
64a5810
uncommented some code
lutteropp Jun 12, 2019
674a310
fixed dynamic casts
lutteropp Jun 12, 2019
160f2d2
added dirty TBE extra tree output
lutteropp Jun 12, 2019
c48a749
fixed extra table output and tbe computation call
lutteropp Jun 12, 2019
7ff2000
fixed tbe extra tree output
lutteropp Jun 12, 2019
b87c136
changed extra taxa table
lutteropp Jun 12, 2019
56b988b
updated submodule
lutteropp Jun 17, 2019
a974b0a
updated submodule and fixed tbe extra outputs
lutteropp Jun 17, 2019
f9ba4f9
made tbe extra table output more like in booster
lutteropp Jun 17, 2019
537e7bb
tbe extra table output now also prints support values
lutteropp Jun 18, 2019
7ae199f
updated submodule
lutteropp Jun 18, 2019
cfce896
updated submodule
lutteropp Jun 18, 2019
318c1d2
updated submoudle
lutteropp Jun 21, 2019
2f5ad4b
updated submodule, added OpenMP support
lutteropp Jul 1, 2019
15c6fad
updated submodule
lutteropp Jul 1, 2019
0243b31
added setting number of OpenMP threads with --threads option
lutteropp Jul 4, 2019
b5d64dd
added missing initialization of extra_info
lutteropp Jul 8, 2019
fb57023
updated submodule
lutteropp Jul 8, 2019
6b4e181
slightly faster table output
lutteropp Jul 8, 2019
35d2af9
updated submodule
lutteropp Jul 8, 2019
b3ed825
removed unneccessary rebuilds of tip_label_list in output of tbe extr…
lutteropp Jul 9, 2019
757e9be
faster output of zeros in tbe extra table
lutteropp Jul 9, 2019
b5411e1
updated README
lutteropp Jul 26, 2019
980842f
added number of threads
lutteropp Jul 26, 2019
d104506
Update README.md
lutteropp Sep 5, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed dynamic casts
  • Loading branch information
lutteropp committed Jun 12, 2019
commit 674a3105551303e43d6d1ef55023f88f80b71eab
4 changes: 2 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
@@ -1816,12 +1816,12 @@ void print_final_output(const RaxmlInstance& instance, const Checkpoint& checkp)
if (opts.tbe_extra_array) {
auto extra_array_file = opts.tbe_extra_array_file();
TBEExtraArrayStream tbeExtraArray(extra_array_file);
tbeExtraArray << dynamic_cast<TransferBootstrapTree&>(it.second);
tbeExtraArray << *dynamic_cast<const TransferBootstrapTree*>(it.second.get());
}
if (opts.tbe_extra_tree) {
auto extra_tree_file = opts.tbe_extra_tree_file();
TBEExtraTreeStream tbeExtraTree(extra_tree_file);
tbeExtraTree << dynamic_cast<const TransferBootstrapTree&>(*it.second);
tbeExtraTree << *dynamic_cast<const TransferBootstrapTree*>(it.second.get());
}
}
}