Skip to content

Commit 6b9c93e

Browse files
author
Khodadadi-Jamayran
committed
“1.7.0”
1 parent c18ea50 commit 6b9c93e

20 files changed

Lines changed: 412 additions & 629 deletions

DESCRIPTION

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: iCellR
22
Type: Package
33
Title: Analyzing High-Throughput Single Cell Sequencing Data
4-
Version: 1.6.6
4+
Version: 1.7.0
55
Authors@R: c(
66
person(given = 'Alireza', family = 'Khodadadi-Jamayran',role = c('aut','cre'), email = 'alireza.khodadadi.j@gmail.com', comment = c(ORCID = '0000-0003-2495-7504')),
77
person(given = 'Joseph', family = 'Pucella',role = c('aut','ctb'), comment = c(ORCID = '0000-0003-0875-8046')),
@@ -17,17 +17,17 @@ Description: A toolkit that allows scientists to work with data from single cell
1717
Depends: R (>= 3.3.0), ggplot2, plotly
1818
Imports: Matrix, Rtsne, gridExtra, ggrepel, ggpubr, scatterplot3d,
1919
RColorBrewer, knitr, NbClust, shiny, pheatmap, ape, ggdendro,
20-
plyr, reshape, Hmisc, htmlwidgets, methods, uwot, hdf5r,
21-
progress, igraph, data.table, Rcpp, RANN, jsonlite, png
20+
plyr, reshape, Hmisc, htmlwidgets, methods, uwot, progress,
21+
igraph, data.table, Rcpp, hdf5r, RANN, jsonlite, png
2222
License: GPL-2
2323
LinkingTo: Rcpp
2424
Encoding: UTF-8
2525
LazyData: true
26-
RoxygenNote: 7.1.1
26+
RoxygenNote: 7.1.2
2727
BugReports: https://github.com/rezakj/iCellR/issues
2828
URL: https://github.com/rezakj/iCellR
2929
NeedsCompilation: yes
30-
Packaged: 2021-11-09 18:05:17 UTC; khodaa01
30+
Packaged: 2025-10-28 14:48:40 UTC; khodaa01
3131
Author: Alireza Khodadadi-Jamayran [aut, cre]
3232
(<https://orcid.org/0000-0003-2495-7504>),
3333
Joseph Pucella [aut, ctb] (<https://orcid.org/0000-0003-0875-8046>),

NAMESPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export(add.10x.image)
55
export(add.adt)
66
export(add.vdj)
77
export(adt.rna.merge)
8+
export(bubble.gg.plot)
89
export(capture.image.10x)
910
export(cc)
1011
export(cell.cycle)

R/F0018.R

Lines changed: 36 additions & 280 deletions
Large diffs are not rendered by default.

R/F0028.R

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#' @param pval.test Choose from "t.test", "wilcox.test", default = "t.test".
88
#' @param p.adjust.method Correction method. Choose from "holm", "hochberg", "hommel", "bonferroni", "BH", "BY","fdr", "none", default = "hochberg".
99
#' @param padjval Minimum adjusted p value for out put, default = 0.1.
10+
#' @param low.cell.filt filter out clusters with low number of cells, default = 5.
1011
#' @param Inf.FCs If set to FALSE the infinite fold changes would be filtered from out put, default = FALSE.
1112
#' @param uniq If set to TRUE only genes that are a marker for only one cluster would be in the out put, default = FALSE.
1213
#' @param positive If set to FALSE both the up regulated (positive) and down regulated (negative) markers would be in the out put, default = TRUE.
@@ -18,6 +19,7 @@ findMarkers <- function (x = NULL,
1819
p.adjust.method = "hochberg",
1920
fold.change = 2,
2021
padjval = 0.1,
22+
low.cell.filt = 5,
2123
Inf.FCs = FALSE,
2224
uniq = FALSE,
2325
positive = TRUE) {
@@ -42,7 +44,7 @@ findMarkers <- function (x = NULL,
4244
}
4345
# get cluster data
4446
# get avrages
45-
x <- clust.avg.exp(x, data.type = data.type)
47+
x <- clust.avg.exp(x, data.type = data.type, low.cell.filt = low.cell.filt)
4648
##########
4749
DATA <- x@best.clust
4850
if(!is.numeric(DATA$clusters)){

R/F0030.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,10 @@ heatmap.gg.plot <- function (x = NULL,
224224
}
225225
### plot
226226
data$expression <- as.numeric(as.character(data$expression))
227+
228+
######### cluster order (this makes cluster numeric factors)
229+
CL=as.numeric(data$clusters)
230+
data$clusters=factor(CL, levels=sort(unique(CL)))
227231
#############
228232
heatmap <- ggplot(data, aes(x = cell, y = gene, fill = expression, text=clusters)) + geom_tile() +
229233
scale_fill_gradient2(low = col.low, mid = col.mid, high = col.high, name = "",

R/F0036.R

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ add.adt <- function (x = NULL, adt.data = "data.frame") {
99
if ("iCellR" != class(x)[1]) {
1010
stop("x should be an object of class iCellR")
1111
}
12-
if (class(adt.data) != "data.frame") {
13-
stop("ADT data should be a data frame object")
14-
}
1512
# Add ADT to gene names
1613
row.names(adt.data) <- paste("ADT", row.names(adt.data), sep = "_")
1714
row.names(adt.data) <- gsub("-",".",row.names(adt.data))

R/F0039.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
prep.vdj <- function (vdj.data = "data.frame", cond.name = "NULL") {
99
# read VDJ data
1010
my.vdj <- vdj.data
11-
my.vdj <- subset(my.vdj, productive == "True")
11+
# my.vdj <- subset(my.vdj, productive == "True")
1212
my.vdj <- subset(my.vdj, raw_clonotype_id != "None")
1313
cell.barcodes <- my.vdj$barcode
1414
cell.barcodes <- gsub("-",".",cell.barcodes)

R/F0040.R

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ add.vdj <- function (x = NULL, vdj.data = "data.frame") {
99
if ("iCellR" != class(x)[1]) {
1010
stop("x should be an object of class iCellR")
1111
}
12-
if (class(vdj.data) != "data.frame") {
13-
stop("VDJ data should be a data frame object")
14-
}
1512
attributes(x)$vdj.data <- vdj.data
1613
return(x)
1714
}

R/F0051.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
#' A dataset containing the genes for S phase
44
#'
55
#' @format A character with 43 genes
6-
#' @source \url{https://www.science.org/doi/abs/10.1126/science.aad0501}
6+
#' @source Paper: Dissecting the multicellular ecosystem of metastatic melanoma by single-cell RNA-seq.
77
"s.phase"

R/F0053.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
#' A dataset containing the genes for G2 and M phase
44
#'
55
#' @format A character with 54 genes
6-
#' @source \url{https://www.science.org/doi/abs/10.1126/science.aad0501}
6+
#' @source Paper: Dissecting the multicellular ecosystem of metastatic melanoma by single-cell RNA-seq.
77
"g2m.phase"

0 commit comments

Comments
 (0)