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

Fix 309 #310

Merged
merged 17 commits into from
Feb 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: netZooR
Type: Package
Title: Unified methods for the inference and analysis of gene regulatory networks
Version: 1.5.4
Date: 2023-09-25
Version: 1.5.6
Date: 2024-02-02
Authors@R: c(person("Marouen", "Ben Guebila",
email = "benguebila@hsph.harvard.edu", role = c("aut","cre"), comment = c(ORCID = "0000-0001-5934-966X")),
person("Tian", "Wang",
Expand Down
13 changes: 11 additions & 2 deletions R/PUMA.R
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,11 @@
expr <- expr[order(rownames(expr)),]
}else if(mode=='union'){
gene.names=unique(union(rownames(expr),unique(motif[,2])))
tf.names =unique(union(unique(ppi[,1]),unique(motif[,1])))
if(is.null(ppi)){
tf.names = unique(motif[,1])

Check warning on line 93 in R/PUMA.R

View check run for this annotation

Codecov / codecov/patch

R/PUMA.R#L92-L93

Added lines #L92 - L93 were not covered by tests
}else{
tf.names =unique(union(unique(ppi[,1]),unique(motif[,1])))

Check warning on line 95 in R/PUMA.R

View check run for this annotation

Codecov / codecov/patch

R/PUMA.R#L95

Added line #L95 was not covered by tests
}
num.TFs <- length(tf.names)
num.genes <- length(gene.names)
# gene expression matrix
Expand Down Expand Up @@ -117,7 +121,11 @@
regulatoryNetwork[Idx]=motif[,3]
}else if(mode=='intersection'){
gene.names=unique(intersect(rownames(expr),unique(motif[,2])))
tf.names =unique(intersect(unique(ppi[,1]),unique(motif[,1])))
if(is.null(ppi)){
tf.names =unique(motif[,1])

Check warning on line 125 in R/PUMA.R

View check run for this annotation

Codecov / codecov/patch

R/PUMA.R#L124-L125

Added lines #L124 - L125 were not covered by tests
}else{
tf.names =unique(intersect(unique(ppi[,1]),unique(motif[,1])))

Check warning on line 127 in R/PUMA.R

View check run for this annotation

Codecov / codecov/patch

R/PUMA.R#L127

Added line #L127 was not covered by tests
}
num.TFs <- length(tf.names)
num.genes <- length(gene.names)
# gene expression matrix
Expand Down Expand Up @@ -241,6 +249,7 @@

if(!is.null(mir_file)){
mirIndex = match(mir_file,tf.names)
mirIndex <- mirIndex[!is.na(mirIndex)]

Check warning on line 252 in R/PUMA.R

View check run for this annotation

Codecov / codecov/patch

R/PUMA.R#L252

Added line #L252 was not covered by tests
tfCoopNetwork[mirIndex,] = 0
tfCoopNetwork[,mirIndex] = 0
seqs = seq(1, num.TFs*num.TFs, num.TFs+1)
Expand Down
82 changes: 0 additions & 82 deletions man/TIGER.Rd

This file was deleted.

4 changes: 2 additions & 2 deletions man/cobra.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 0 additions & 19 deletions man/prior.pp.Rd

This file was deleted.

Loading