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

MRE-quest #106

Draft
wants to merge 32 commits into
base: master
Choose a base branch
from
Draft
Changes from 2 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1f82c43
importFrom imports
ms609 Sep 23, 2021
0407515
v1.0.1
ms609 Sep 23, 2021
9948639
RandomTreeScore() on small trees
ms609 Sep 23, 2021
0343454
Merge branch 'master' into v1.0.1
ms609 Sep 23, 2021
1e6f0d9
Merge branch 'master' into v1.0.1
ms609 Sep 23, 2021
e9e733c
Skip
ms609 Sep 23, 2021
7db7c14
Skip SPR errors
ms609 Sep 23, 2021
bfa2c71
dputs
ms609 Sep 23, 2021
9ea805d
Only tests
ms609 Sep 23, 2021
2162305
Squashed commit of the following:
ms609 Sep 23, 2021
aaab6a5
Rcout << "\n\n Running all_spr()";
ms609 Sep 23, 2021
d47b5cb
clone pre_edge_nod
ms609 Sep 23, 2021
0a77222
Merge branch 'v1.0.1-bughunt' of https://github.com/ms609/TreeSearch …
ms609 Sep 23, 2021
6f2622e
Delete other tests
ms609 Sep 23, 2021
10c422b
Squashed commit of the following:
ms609 Sep 23, 2021
8fa22de
dput errors
ms609 Sep 23, 2021
3868ff1
Revert "Delete other tests"
ms609 Sep 23, 2021
1da0dbc
Delete only some tests
ms609 Sep 23, 2021
06097bf
Revert "Delete only some tests"
ms609 Sep 23, 2021
ea12be2
With Grace
ms609 Sep 23, 2021
75f910b
Only by grace?
ms609 Sep 23, 2021
d4d352f
Only by grace?
ms609 Sep 23, 2021
295ca30
MRE
ms609 Sep 24, 2021
fdae4c4
return
ms609 Sep 24, 2021
1110185
Merge branch 'master' into v1.0.1-bughunt
ms609 Sep 24, 2021
d7be9ca
Minimize example
ms609 Sep 24, 2021
39da59b
as.phylo(1, 3)$edge
ms609 Sep 24, 2021
6a4485e
const ints
ms609 Sep 24, 2021
33ad0df
Only ASan
ms609 Sep 24, 2021
ea0ffaa
Restore rest of test
ms609 Sep 24, 2021
6442ced
importFrom TreeTools
ms609 Sep 24, 2021
5864f23
balance )s
ms609 Sep 24, 2021
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
2 changes: 1 addition & 1 deletion src/rearrange.cpp
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@ typedef int_fast16_t int16;
const int16 UNDEFINED = -1;

// Assumptions:
// * Tree is bifurcating and rooted on a tip; root node is labelled with n_tip + 1
// [[Rcpp::export]]
IntegerMatrix nni(const IntegerMatrix edge,
const IntegerVector randomEdge,
@@ -325,6 +324,7 @@ inline void fuse_and_add (const IntegerMatrix& tree_bits, List& ret,
// [[Rcpp::export]]
List all_spr (const IntegerMatrix edge,
const IntegerVector break_order) {
Rcout << "\n\n Running all_spr()";
const int16
n_edge = edge.nrow(),
n_internal = n_edge / 2,