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

refactor getBaselineDivergence/getStepwiseDivergence #91

Merged
merged 42 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
5d75d75
up
TuomasBorman Aug 14, 2024
35923e6
up
TuomasBorman Aug 14, 2024
d2294b2
up
TuomasBorman Aug 19, 2024
b1dc565
up
TuomasBorman Aug 29, 2024
106518a
Merge branch 'bioc_mods' of github.com:microbiome/miaTime into bioc_mods
Daenarys8 Sep 16, 2024
86f13c4
update fxn
Daenarys8 Sep 16, 2024
c5c3317
update tests
Daenarys8 Sep 18, 2024
509c83a
update tests
Daenarys8 Sep 18, 2024
0bade29
update
Daenarys8 Sep 19, 2024
d608897
Merge github.com:microbiome/miaTime into bioc_mods
Daenarys8 Oct 3, 2024
b79a259
update
Daenarys8 Oct 4, 2024
4746382
update 2
Daenarys8 Oct 4, 2024
7325dc1
update 2
Daenarys8 Oct 4, 2024
ee47b7e
update 3
Daenarys8 Oct 4, 2024
ecc7083
update
Daenarys8 Oct 7, 2024
f6a2c69
update
Daenarys8 Oct 7, 2024
25da7e6
fix bug
Daenarys8 Oct 10, 2024
27f2cf1
support na in previous time
Daenarys8 Oct 10, 2024
90714f9
fix dynamic variable bug in .add_previous_sanple
Daenarys8 Oct 10, 2024
85f1f14
update
Daenarys8 Oct 15, 2024
8130661
update
Daenarys8 Oct 15, 2024
87436bb
update
Daenarys8 Oct 17, 2024
f8495d6
update
Daenarys8 Oct 17, 2024
d8a9c90
update
Daenarys8 Oct 17, 2024
da800b5
up
TuomasBorman Oct 19, 2024
2b61416
up
TuomasBorman Oct 20, 2024
e6e16ba
up
TuomasBorman Oct 20, 2024
aa5470c
up
TuomasBorman Oct 20, 2024
a9dd3f8
up
TuomasBorman Oct 20, 2024
60565c5
up
TuomasBorman Oct 20, 2024
7441005
up
TuomasBorman Oct 20, 2024
752157f
up
TuomasBorman Oct 20, 2024
8a2842e
up
TuomasBorman Oct 20, 2024
bca0d8a
up
TuomasBorman Oct 28, 2024
a571dba
up
TuomasBorman Oct 29, 2024
c13ef8c
up
TuomasBorman Oct 29, 2024
f1483b9
up
TuomasBorman Oct 29, 2024
f7b862d
up
TuomasBorman Oct 29, 2024
5c6466e
up
TuomasBorman Oct 29, 2024
99acbff
up
TuomasBorman Oct 29, 2024
79854f1
up
TuomasBorman Nov 4, 2024
ff5772c
up
TuomasBorman Nov 4, 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
29 changes: 15 additions & 14 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: miaTime
Type: Package
Title: Microbiome Time Series Analysis
Version: 0.1.22
Version: 0.1.23
Authors@R:
c(person(given = "Leo", family = "Lahti", role = c("aut"),
email = "[email protected]",
Expand All @@ -22,28 +22,29 @@ Description:
biocViews: Microbiome, Software, Sequencing, Coverage
License: Artistic-2.0 | file LICENSE
Depends:
R (>= 4.0)
R (>= 4.0),
mia
Imports:
dplyr,
methods,
mia,
methods,
S4Vectors,
SummarizedExperiment,
SingleCellExperiment,
vegan,
scater
SummarizedExperiment,
TreeSummarizedExperiment
Suggests:
TreeSummarizedExperiment,
tidySingleCellExperiment,
tidySummarizedExperiment,
BiocStyle,
devtools,
ggplot2,
miaViz,
knitr,
lubridate,
miaViz,
rmarkdown,
knitr,
devtools,
BiocStyle,
scater,
testthat,
tidySingleCellExperiment,
tidySummarizedExperiment,
TreeSummarizedExperiment,
vegan,
zoo
Remotes:
github::microbiome/mia
Expand Down
23 changes: 9 additions & 14 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
# Generated by roxygen2: do not edit by hand

export(addBaselineDivergence)
export(addStepwiseDivergence)
export(getBaselineDivergence)
export(getStepwiseDivergence)
export(getTimeDivergence)
exportMethods(getTimeDivergence)
importFrom(S4Vectors,DataFrame)
importFrom(SingleCellExperiment,altExp)
importFrom(SummarizedExperiment,"colData<-")
importFrom(SummarizedExperiment,assay)
importFrom(SummarizedExperiment,colData)
importFrom(dplyr,"%>%")
importFrom(dplyr,filter)
exportMethods(addBaselineDivergence)
exportMethods(addStepwiseDivergence)
exportMethods(getBaselineDivergence)
exportMethods(getStepwiseDivergence)
importFrom(dplyr,arrange)
importFrom(dplyr,group_by)
importFrom(dplyr,lag)
importFrom(dplyr,mutate)
importFrom(dplyr,select)
importFrom(methods,is)
importFrom(mia,estimateDivergence)
importFrom(mia,mergeSEs)
importFrom(vegan,vegdist)
importFrom(dplyr,ungroup)
3 changes: 2 additions & 1 deletion R/data.R
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ NULL
NULL

#' @title SilvermanAGutData
#' @description The SilvermanAGutData dataset contains 16S rRNA gene based high-throughput
#' @description
#' The SilvermanAGutData dataset contains 16S rRNA gene based high-throughput
#' profiling of 4 in vitro artificial gut models. The sampling was done hourly
#' and daily to capture sub-daily dynamics of microbial community originating
#' from human feces. The data consists of 413 taxa from 639 samples.
Expand Down
Loading
Loading