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

estimateAlpha #460

Merged
merged 62 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
2015c7d
draft
Oct 13, 2023
f521438
Merge branch 'master' into issue_417
antagomir Oct 17, 2023
d4cc84d
Merge branch 'master' of https://github.com/microbiome/mia into issue…
Oct 18, 2023
25704fe
draft
Oct 18, 2023
78f0ed8
Merge branch 'issue_417' of https://github.com/microbiome/mia into is…
Oct 18, 2023
ebd1f5c
restructured
Oct 19, 2023
6e9cb84
Merge branch 'master' of https://github.com/microbiome/mia into issue…
Oct 19, 2023
e97e96c
BPPARAM could be passed as ...
Oct 19, 2023
623304b
supressed examples warnings + fixed ...
Oct 19, 2023
675d040
supressed warning at example + vignette
Oct 19, 2023
ba406b9
fixes
Oct 20, 2023
f5891fc
more fixes
Oct 20, 2023
a5d22a1
fixes
Oct 23, 2023
30c7513
seed removed
Oct 23, 2023
296f3fa
fix
Oct 23, 2023
858b8c9
fix
Oct 23, 2023
b029835
Merge branch 'master' into issue_417
TuomasBorman Oct 27, 2023
bc98884
Merge branch 'master' of https://github.com/microbiome/mia into issue…
Oct 31, 2023
6dd43ce
up
Oct 31, 2023
9f85586
Merge branch 'issue_417' of https://github.com/microbiome/mia into is…
Oct 31, 2023
36f97c6
up
Nov 1, 2023
96f08bd
up
TuomasBorman Nov 28, 2023
c415887
up
TuomasBorman Nov 28, 2023
6837743
Merge branch 'master' into issue_417
TuomasBorman Nov 30, 2023
ffc6279
Merge branch 'master' into issue_417
antagomir Mar 7, 2024
eaa39b2
Merge branch 'devel' into issue_417
antagomir Apr 2, 2024
5bd62e3
Delete R/mia.BiocCheck/00BiocCheck.log
TuomasBorman Apr 10, 2024
f187737
Merge branch 'devel' into issue_417
TuomasBorman Apr 18, 2024
2488aa7
Fix indentation
TuomasBorman Apr 18, 2024
b22e9e4
Add comments
TuomasBorman Apr 18, 2024
079478b
sync
TuomasBorman Apr 18, 2024
d1c9c69
rename estimateAlpha to addAlpha and deprecate estimate* functions
thpral Apr 22, 2024
3cf7b6b
merge devel
thpral Apr 22, 2024
f508964
fix + rm test at 10-test
Apr 23, 2024
7eaf135
fixes related to test-8subsample
Apr 23, 2024
86ee7dc
fixed warnings
Apr 23, 2024
df08a49
@doctype --> @aliases
Apr 23, 2024
43313f9
tmp commits
Apr 25, 2024
4fa36b8
resolve conflict+merge
Apr 25, 2024
977ad66
Sync with devel
TuomasBorman Jul 3, 2024
604bbbe
Sync
TuomasBorman Jul 3, 2024
1eefada
up
TuomasBorman Jul 3, 2024
654035e
up
TuomasBorman Jul 3, 2024
2720120
Update estimateDiversity.R
TuomasBorman Jul 3, 2024
99cd046
up
TuomasBorman Jul 3, 2024
6f86449
Merge branch 'issue_417' of github.com:microbiome/mia into issue_417
TuomasBorman Jul 3, 2024
92c2dea
up
TuomasBorman Jul 3, 2024
44acc06
up
TuomasBorman Jul 3, 2024
3a05148
up
TuomasBorman Jul 3, 2024
cbc7bb3
Bugfix
TuomasBorman Jul 3, 2024
5a1cb12
Simplify
TuomasBorman Jul 3, 2024
bff4fff
up
TuomasBorman Jul 3, 2024
52a63d6
up
TuomasBorman Jul 3, 2024
edfe93b
up
TuomasBorman Jul 4, 2024
7d1b2c5
Final fixes
TuomasBorman Jul 4, 2024
e74e7d8
up
TuomasBorman Jul 4, 2024
6c4c345
update docs
TuomasBorman Jul 4, 2024
41b8979
up
TuomasBorman Jul 4, 2024
85995a0
update docs
TuomasBorman Jul 4, 2024
953f8d2
up
TuomasBorman Jul 4, 2024
51c7b74
up
TuomasBorman Jul 4, 2024
2f5ce9e
up
TuomasBorman Jul 5, 2024
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 DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: mia
Type: Package
Version: 1.13.25
Version: 1.13.26
Authors@R:
c(person(given = "Felix G.M.", family = "Ernst", role = c("aut"),
email = "[email protected]",
Expand Down
3 changes: 3 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
export(IdTaxaToDataFrame)
export(TAXONOMY_RANKS)
export(ZTransform)
export(addAlpha)
export(addCluster)
export(addContaminantQC)
export(addDPCoA)
Expand Down Expand Up @@ -138,6 +139,7 @@ export(unsplitByRanks)
export(unsplitOn)
exportMethods("relabundance<-")
exportMethods(ZTransform)
exportMethods(addAlpha)
exportMethods(addCCA)
exportMethods(addCluster)
exportMethods(addContaminantQC)
Expand Down Expand Up @@ -270,6 +272,7 @@ importFrom(DelayedArray,colSums)
importFrom(DelayedArray,getAutoBPPARAM)
importFrom(DelayedArray,rowSums)
importFrom(DelayedArray,setAutoBPPARAM)
importFrom(DelayedMatrixStats,colMeans2)
importFrom(DelayedMatrixStats,colSums2)
importFrom(DelayedMatrixStats,rowMaxs)
importFrom(DelayedMatrixStats,rowMeans2)
Expand Down
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,4 @@ calculateCCA to getCCA
convertToPhyloseq
+ add rowTree agglomeration and RefSeq agglomeration in agglomerateByPrevalence
+ Fix tree merging in unsplit and mergeSEs functions
+ Added addAlpha; a wrapper for calculating all alpha diversity indices
632 changes: 632 additions & 0 deletions R/addAlpha.R

Large diffs are not rendered by default.

84 changes: 83 additions & 1 deletion R/deprecate.R
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ setMethod("left_join", signature = c(x = "ANY"),
)

#' @rdname deprecate
#' @export
#' @export
setGeneric("right_join", signature = c("x"),
function(x, ...)
standardGeneric("right_join"))
Expand Down Expand Up @@ -1018,3 +1018,85 @@ makeTreeSEFromPhyloseq <- function(x) {
" Use 'convertFromPhyloseq' instead."))
convertFromPhyloseq(...)
}

#' @rdname deprecate
#' @export
setGeneric(
"estimateEvenness", signature = c("x"), function(x, ...)
standardGeneric("estimateEvenness"))

#' @rdname deprecate
#' @export
setMethod(
"estimateEvenness", signature = c(x = "ANY"), function(x, ...){
.Deprecated(msg = paste0(
"'estimateEvenness' is deprecated. Use 'addAlpha' instead."))
.estimate_evenness(x, ...)
}
)

#' @rdname deprecate
#' @export
setGeneric(
"estimateRichness", signature = c("x"),
function(x, ...) standardGeneric("estimateRichness"))

#' @rdname deprecate
#' @export
setMethod(
"estimateRichness", signature = c(x="ANY"),
function(x, ...){
.Deprecated(msg = paste0(
"'estimateRichness' is deprecated. Use 'addAlpha' instead."))
.estimate_richness(x, ...)
}
)

#' @rdname deprecate
#' @export
setGeneric(
"estimateDiversity", signature = c("x"),
function(x, ...) standardGeneric("estimateDiversity"))

#' @rdname deprecate
#' @export
setMethod(
"estimateDiversity", signature = c(x = "ANY"), function(x, ...){
.Deprecated(msg = paste0(
"'estimateDiversity' is deprecated. Use 'addAlpha' instead."))
.estimate_diversity(x, ...)
}
)

#' @rdname deprecate
#' @export
setGeneric(
"estimateFaith", signature = c("x"), function(x, ...)
standardGeneric("estimateFaith"))

#' @rdname deprecate
#' @export
setMethod(
"estimateFaith", signature = c(x="ANY"),
function(x, ...){
.Deprecated(msg = paste0(
"'estimateFaith' is deprecated. Use 'addAlpha' instead."))
.estimate_faith(x, ...)
}
)

#' @rdname deprecate
#' @export
setGeneric(
"estimateDominance", signature = c("x"),
function(x, ...) standardGeneric("estimateDominance"))

#' @rdname deprecate
#' @export
setMethod(
"estimateDominance", signature = c(x="ANY"),
function(x, ...){
.Deprecated(msg = paste0(
"'estimateDominance' is deprecated. Use 'addAlpha' instead."))
.estimate_dominance(x, ...)
})
Loading
Loading