Skip to content

Commit

Permalink
Fix 309 (#310)
Browse files Browse the repository at this point in the history
* update documentation

* remove monster tests

* reduce monstr test

* update documentation

* remove diffedge example

* reduce monster tests

* remove spider example

* update monster examples

* remove lioness tests

* remove pada tests

* add citation

* fix 309
  • Loading branch information
marouenbg committed Feb 3, 2024
1 parent c0ca530 commit 9ffe82a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 107 deletions.
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 @@ puma <- function(motif,expr=NULL,ppi=NULL,alpha=0.1,mir_file,hamming=0.001,
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])
}else{
tf.names =unique(union(unique(ppi[,1]),unique(motif[,1])))
}
num.TFs <- length(tf.names)
num.genes <- length(gene.names)
# gene expression matrix
Expand Down Expand Up @@ -117,7 +121,11 @@ puma <- function(motif,expr=NULL,ppi=NULL,alpha=0.1,mir_file,hamming=0.001,
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])
}else{
tf.names =unique(intersect(unique(ppi[,1]),unique(motif[,1])))
}
num.TFs <- length(tf.names)
num.genes <- length(gene.names)
# gene expression matrix
Expand Down Expand Up @@ -241,6 +249,7 @@ puma <- function(motif,expr=NULL,ppi=NULL,alpha=0.1,mir_file,hamming=0.001,

if(!is.null(mir_file)){
mirIndex = match(mir_file,tf.names)
mirIndex <- mirIndex[!is.na(mirIndex)]
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.

0 comments on commit 9ffe82a

Please sign in to comment.