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.

Sign up for GitHub

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

Jump to bottom

examples >5sec not tested for CRAN submission #6

Merged
merged 1 commit into from
Jan 8, 2016
Merged

examples >5sec not tested for CRAN submission #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: phylolm
Version: 2.4
Date: 2016-01-03
Date: 2016-01-08
Title: Phylogenetic Linear Regression
Authors@R: c(person("Lam Si Tung", "Ho", role=c("aut", "cre"), email="lamho86@gmail.com"),
person("Cecile", "Ane", role="aut"),
Expand All @@ -12,5 +12,5 @@ Description: Provides functions for fitting phylogenetic linear models and phylo
License: GPL (>= 2) | file LICENSE
URL: https://cran.r-project.org/package=phylolm
Encoding: UTF-8
Packaged: 2016-01-03
Packaged: 2016-01-08
NeedsCompilation: yes
4 changes: 2 additions & 2 deletions man/phylolm-package.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ Other tools include functions to test the adequacy of a population tree.}
Package: \tab phylolm\cr
Type: \tab Package\cr
Version: \tab 2.4\cr
Date: \tab 2016-01-03\cr
Date: \tab 2016-01-08\cr
License: \tab GPL (>= 2)\cr
}
}
\author{Lam Si Tung Ho, Cecile Ane, Robert Lachlan, Kelsey Tarpinia, Rachel Feldman

Maintainer: Lam Si Tung Ho <lamho86@gmail.com>
}
}
3 changes: 2 additions & 1 deletion man/stepwise.test.tree.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Systematic Biology, \bold{64}(5):809-823.
\examples{
data(quartetCF)
data(guidetree)
resF <- stepwise.test.tree(quartetCF,guidetree,startT="fulltree")
\donttest{resF <- stepwise.test.tree(quartetCF,guidetree,startT="fulltree") # takes ~ 1 min
resF[1:9]
}
}
3 changes: 2 additions & 1 deletion man/test.one.species.tree.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Systematic Biology, \bold{64}(5):809-823.
\examples{
data(quartetCF)
data(guidetree)
prelim <- test.tree.preparation(quartetCF,guidetree)
\donttest{prelim <- test.tree.preparation(quartetCF,guidetree) # takes 5-10 seconds

# test of panmixia: all edges collapsed, none resolved.
panmixia <- test.one.species.tree(quartetCF,guidetree,prelim,edge.keep=NULL)
Expand Down Expand Up @@ -88,3 +88,4 @@ sum(apply(q01,1,function(x){"Cnt_1" \%in\% x | "Vind_1" \%in\% x}))
sum(apply(q01,1,function(x){"Cnt_1" \%in\% x & "Vind_1" \%in\% x}))
# 212 outlier 4-taxon sets have both Cnt_1 and Vind_1
}
}