Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
ed58d85
Create R-CI.yml
ned-procogia Oct 26, 2021
8ec05bd
Update R-CI.yml
ned-procogia Oct 26, 2021
9dd2608
Update R-CI.yml
ned-procogia Oct 26, 2021
1ef1c64
ned edits
Nov 17, 2021
ee68e67
Delete .github/workflows directory
ned-procogia Nov 17, 2021
a08aea6
Merge branch 'dev' into main
ned-procogia Nov 18, 2021
fca869e
Update NEWS.md
ned-procogia Nov 18, 2021
08f8f66
Update DESCRIPTION
ned-procogia Nov 18, 2021
0729159
align with BiocCheck()
Nov 18, 2021
97bc524
i wonder what this does
Nov 18, 2021
dfc9fbd
update tests to check for sparse matrix
Nov 19, 2021
b9db053
added unit tests for ned changes
Nov 19, 2021
c7fa488
Update DESCRIPTION
ned-procogia Nov 22, 2021
2233d55
handle large matrices
ned-procogia Nov 22, 2021
d6a4104
data loading and import fixes
Nov 24, 2021
bc60223
Merge branch 'main' into description-update
ned-procogia Nov 24, 2021
f55c6ad
Merge pull request #8 from ned-procogia/description-update
ned-procogia Nov 24, 2021
914f7ed
something something
Nov 24, 2021
dec8063
cleanup
Nov 24, 2021
9ca7003
Merge pull request #9 from ned-procogia/description-update
ned-procogia Nov 24, 2021
d237b94
Add files via upload
ned-procogia Nov 24, 2021
8f45dfb
more little fixes
Nov 24, 2021
d36ba9b
bugfixes to pass tests
Nov 24, 2021
4a5ec05
that is a whoopsie
Nov 24, 2021
4be42b7
Update NBthDEOptPara.cpp
ned-procogia Dec 7, 2021
446d7d9
rcpp ec2 optimizations
ned-procogia Dec 21, 2021
e7bd090
Update NBthDEOptPara.cpp
ned-procogia Dec 22, 2021
c2e5b0a
Update NBthDEOptPara.cpp
ned-procogia Dec 23, 2021
2731d9c
Update NBthDEOptPara.cpp
ned-procogia Dec 23, 2021
5b42006
Update NBthDE.R
ned-procogia Dec 23, 2021
2a9e5d2
Merge pull request #11 from ned-procogia/ned-procogia-optimization-pr…
ned-procogia Jan 12, 2022
773e550
Merge branch 'main' into ned-procogia-ec2-optimization
ned-procogia Jan 12, 2022
db2f617
Merge pull request #10 from ned-procogia/ned-procogia-ec2-optimization
ned-procogia Jan 12, 2022
cc502db
including optimized code
ned-procogia Jan 12, 2022
ae5f106
try to make code a bit clearer
ned-procogia Jan 13, 2022
828e512
added NBthDE model description
ned-procogia Jan 13, 2022
6a50892
Update NBthDEOptPara.cpp
ned-procogia Jan 17, 2022
87b5a38
function argument fixes
ned-procogia Jan 18, 2022
9fb24eb
bug fix parallel mclapply
ned-procogia Jan 18, 2022
5e38d98
Update NBthDE.R
ned-procogia Jan 18, 2022
a13f71d
response to NOrtega's comment
ned-procogia Jan 19, 2022
1262168
clarified news
ned-procogia Jan 19, 2022
4c28266
add new line at bottom
ned-procogia Jan 19, 2022
00d7854
remove space
ned-procogia Jan 20, 2022
ef30b9e
reformat code
Jan 20, 2022
8e85d20
Revert "reformat code"
Jan 20, 2022
faecfa4
one space tab
Jan 21, 2022
f2029dc
re-indent tests
Jan 21, 2022
57f63ff
Delete NBthDE_model_description.pdf
ned-procogia Jan 21, 2022
deda92a
change = to <-
ned-procogia Jan 21, 2022
ac0141f
Update NBthDE.R
ned-procogia Jan 21, 2022
385f996
Update ScoreTest.R
ned-procogia Jan 21, 2022
7603be1
Update test-fitNBthDE.R
ned-procogia Jan 21, 2022
710f794
Update NBthDE.R
ned-procogia Jan 21, 2022
bb242fb
Update NBthDEOptPara.cpp
ned-procogia Jan 21, 2022
2961e5f
added tests
ned-procogia Jan 21, 2022
3756cf1
Update test-fitNBthDE.R
ned-procogia Jan 21, 2022
390bf0e
Update NBthDEOptPara.cpp
ned-procogia Jan 21, 2022
4716041
Update test-fitNBthDE.R
ned-procogia Jan 21, 2022
3f840b6
Update DESCRIPTION
ned-procogia Jan 22, 2022
c23d738
Add files via upload
ned-procogia Jan 22, 2022
8fd3b52
Update test-fitNBthDE.R
ned-procogia Jan 22, 2022
de8cc52
Update data.R
ned-procogia Jan 22, 2022
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
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Package: GeoDiff
Type: Package
Title: Count model based differential expression and normalization on GeoMx RNA data
Version: 1.1.2
Version: 1.1.3
Authors@R: c(person("Nicole", "Ortogero", email = "nortogero@nanostring.com", role = c("cre")),
person("Lei", "Yang", email = "lyang@nanostring.com", role = c("aut")),
person("Zhi", "Yang", email = "zyang@nanostring.com", role = c("aut")))
person("Zhi", "Yang", email = "zyang@nanostring.com", role = c("aut")),
person("Ned", "Booker", email = "ned@procogia.com", role = c("aut")))
Description: A series of statistical models using count generating distributions
for background modelling, feature and sample QC, normalization and differential
expression analysis on GeoMx RNA data. The application of these methods are
Expand All @@ -15,6 +16,7 @@ Imports:
plyr,
lme4,
Rcpp (>= 1.0.4.6),
Rfast,
withr,
methods,
graphics,
Expand Down
61 changes: 38 additions & 23 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,32 +1,47 @@
useDynLib(GeoDiff, .registration=TRUE)
importFrom(Rcpp, evalCpp)


import(Biobase)
import(testthat)
importFrom(NanoStringNCTools, esBy)
importFrom(Matrix, bdiag)
importFrom(lme4, lFormula)
importFrom(robust, covRob)
importFrom(graphics, boxplot)
importFrom(graphics, abline)
importFrom(withr, local_tempdir)
importFrom(withr, local_dir)
importFrom(GeomxTools, featureType)

importClassesFrom(GeomxTools,NanoStringGeoMxSet)
importFrom(Biobase,AnnotatedDataFrame)
importFrom(Biobase,annotation)
importFrom(Biobase,assayDataElement)
importFrom(Biobase,experimentData)
importFrom(Biobase,exprs)
importFrom(Biobase,fData)
importFrom(Biobase,featureNames)
importFrom(Biobase,fvarLabels)
importFrom(Biobase,notes)
importFrom(Biobase,pData)
importFrom(Biobase,phenoData)
importFrom(Biobase,protocolData)
importFrom(Biobase,sampleNames)
importFrom(Biobase,varLabels)
importFrom(GeomxTools,featureType)
importFrom(Matrix,bdiag)
importFrom(Rcpp,sourceCpp)
importFrom(Rfast,colsums)
importFrom(Rfast,rowsums)
importFrom(graphics,abline)
importFrom(graphics,boxplot)
importFrom(lme4,lFormula)
importFrom(robust,covRob)
importFrom(Matrix,Matrix)
import(Matrix)

exportMethods(aggreprobe)
exportMethods(fitPoisBG)
exportMethods(diagPoisBG)
exportMethods(QuanRange)
exportMethods(BGScoreTest)
exportMethods(fitNBth)
exportMethods(fitPoisthNorm)
exportMethods(fitNBthDE)
exportMethods(coefNBth)
exportMethods(contrastNBth)
exportMethods(DENBth)
exportMethods(fitNBthmDE)
export(BGScoreTest)
export(DENBth)
export(QuanRange)
export(aggreprobe)
export(coefNBth)
export(contrastNBth)
export(diagPoisBG)
export(fitNBth)
export(fitNBthDE)
export(fitNBthmDE)
export(fitPoisBG)
export(fitPoisthNorm)

importFrom("stats", "cor", "cov", "dnbinom", "dpois", "mad", "median",
"model.matrix", "na.omit", "optim", "p.adjust", "pnorm",
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,6 @@ Revisions

* transfer maintainership

# GeoDiff 1.1.3

* implement code optimizations (mostly RFast and matrix methods) to speed up execution (NBth.R, NBthDE.R, PoisBG.R, PoisthNorm.R, ScoreTest.R). Added error handling, improved matrix methods, accelerated code for NBthDEOptPara.cpp Rcpp code.
Loading