Browse code

fixed documentation error and updated the looseFile flag to flatFile

Ming Liu authored on 05/01/2024 20:34:37
Showing 1 changed files
... ...
@@ -7,8 +7,8 @@
7 7
 runNormalization(
8 8
   inSCE,
9 9
   useAssay = "counts",
10
-  outAssayName = "customNormalizedAssay",
11
-  normalizationMethod = NULL,
10
+  outAssayName = "logcounts",
11
+  normalizationMethod = "logNormCounts",
12 12
   scale = FALSE,
13 13
   seuratScaleFactor = 10000,
14 14
   transformation = NULL,
Browse code

New version number; rebuilt docs; fixed QC UI bugs

Yichen Wang authored on 20/10/2022 20:04:38
Showing 1 changed files
... ...
@@ -2,12 +2,7 @@
2 2
 % Please edit documentation in R/runNormalization.R
3 3
 \name{runNormalization}
4 4
 \alias{runNormalization}
5
-\title{Wrapper function to run any of the integrated normalization/transformation
6
-methods in the singleCellTK. The available methods include 'LogNormalize',
7
-'CLR', 'RC' and 'SCTransform' from Seurat, 'logNormCounts and 'CPM' from
8
-Scater. Additionally, users can 'scale' using Z.Score, 'transform' using
9
-log, log1p and sqrt, add 'pseudocounts' and trim the final matrices
10
-between a range of values.}
5
+\title{Run normalization/transformation with various methods}
11 6
 \usage{
12 7
 runNormalization(
13 8
   inSCE,
Browse code

Example fixes

Yichen Wang authored on 11/05/2021 03:19:03
Showing 1 changed files
... ...
@@ -47,11 +47,11 @@ selected assay. Options include `log2` (base 2 log transformation),
47 47
 `log1p` (natural log + 1 transformation) and `sqrt` (square root). Default
48 48
 value is \code{NULL}, which will not run any transformation.}
49 49
 
50
-\item{pseudocountsBeforeNorm}{Specify a numeric pseudo value that should be added 
50
+\item{pseudocountsBeforeNorm}{Specify a numeric pseudo value that should be added
51 51
 to the assay before normalization is performed. Default is \code{NULL},
52 52
 which will not add any value.}
53 53
 
54
-\item{pseudocountsBeforeTransform}{Specify a numeric pseudo value that should be 
54
+\item{pseudocountsBeforeTransform}{Specify a numeric pseudo value that should be
55 55
 added to the assay before transformation is run. Default is \code{NULL},
56 56
 which will not add any value.}
57 57
 
... ...
@@ -77,8 +77,8 @@ between a range of values.
77 77
 \examples{
78 78
 data(sce_chcl, package = "scds")
79 79
 sce_chcl <- runNormalization(
80
- inSCE = sce_chcl, 
81
- normalizationMethod = "SCTransform", 
82
- useAssay = "counts", 
83
- outAssayName = "sctCounts")
80
+ inSCE = sce_chcl,
81
+ normalizationMethod = "LogNormalize",
82
+ useAssay = "counts",
83
+ outAssayName = "logcounts")
84 84
 }
Browse code

Fixed a bug in "runNormalization" wrapper.

Irzam Sarfraz authored on 29/03/2021 18:29:11
Showing 1 changed files
... ...
@@ -15,7 +15,7 @@ runNormalization(
15 15
   outAssayName = "customNormalizedAssay",
16 16
   normalizationMethod = NULL,
17 17
   scale = FALSE,
18
-  seuratScaleFactor = 10,
18
+  seuratScaleFactor = 10000,
19 19
   transformation = NULL,
20 20
   pseudocountsBeforeNorm = NULL,
21 21
   pseudocountsBeforeTransform = NULL,
... ...
@@ -39,7 +39,7 @@ normalization method.}
39 39
 Z.Score. Default \code{FALSE}.}
40 40
 
41 41
 \item{seuratScaleFactor}{Specify the `scaleFactor` argument if a Seurat
42
-normalization method is selected. Default is \code{10}. This parameter
42
+normalization method is selected. Default is \code{10000}. This parameter
43 43
 will not be used if methods other than seurat are selected.}
44 44
 
45 45
 \item{transformation}{Specify the transformation options to run on the
Browse code

Refactored normalization tab server code

Irzam Sarfraz authored on 27/03/2021 15:49:50
Showing 1 changed files
... ...
@@ -11,9 +11,9 @@ between a range of values.}
11 11
 \usage{
12 12
 runNormalization(
13 13
   inSCE,
14
-  normalizationMethod = NULL,
15 14
   useAssay = "counts",
16
-  normAssayName = "customNormalizedAssay",
15
+  outAssayName = "customNormalizedAssay",
16
+  normalizationMethod = NULL,
17 17
   scale = FALSE,
18 18
   seuratScaleFactor = 10,
19 19
   transformation = NULL,
... ...
@@ -26,15 +26,15 @@ runNormalization(
26 26
 \arguments{
27 27
 \item{inSCE}{Input \code{SingleCellExperiment} object.}
28 28
 
29
+\item{useAssay}{Specify the name of the assay that should be used.}
30
+
31
+\item{outAssayName}{Specify the name of the new output assay.}
32
+
29 33
 \item{normalizationMethod}{Specify a normalization method from `LogNormalize`,
30 34
 `CLR`, `RC` and `SCTransform` from Seurat or `logNormCounts` and `CPM` from
31 35
 scater packages. Default \code{NULL} is set which will not run any
32 36
 normalization method.}
33 37
 
34
-\item{useAssay}{Specify the name of the assay that should be used.}
35
-
36
-\item{normAssayName}{Specify the name of the new output assay.}
37
-
38 38
 \item{scale}{Logical value indicating if the data should be scaled using
39 39
 Z.Score. Default \code{FALSE}.}
40 40
 
... ...
@@ -78,7 +78,7 @@ between a range of values.
78 78
 data(sce_chcl, package = "scds")
79 79
 sce_chcl <- runNormalization(
80 80
  inSCE = sce_chcl, 
81
- "SCTransform", 
82
- "counts", 
83
- "sctCounts")
81
+ normalizationMethod = "SCTransform", 
82
+ useAssay = "counts", 
83
+ outAssayName = "sctCounts")
84 84
 }
Browse code

Refactored runNormalization method and added informative messages

Irzam Sarfraz authored on 27/03/2021 12:09:12
Showing 1 changed files
... ...
@@ -19,8 +19,8 @@ runNormalization(
19 19
   transformation = NULL,
20 20
   pseudocountsBeforeNorm = NULL,
21 21
   pseudocountsBeforeTransform = NULL,
22
-  pseudocountsAfterTransform = NULL,
23
-  trim = NULL
22
+  trim = NULL,
23
+  verbose = TRUE
24 24
 )
25 25
 }
26 26
 \arguments{
... ...
@@ -55,14 +55,13 @@ which will not add any value.}
55 55
 added to the assay before transformation is run. Default is \code{NULL},
56 56
 which will not add any value.}
57 57
 
58
-\item{pseudocountsAfterTransform}{Specify a numeric pseudo value that should be 
59
-added to the assay after transformation is run. Default is \code{NULL},
60
-which will not add any value.}
61
-
62 58
 \item{trim}{Specify a vector of two numeric values that should be used
63 59
 as the upper and lower trim values to trim the assay between these two
64 60
 values. For example, \code{c(10,-10)} will trim the values between 10
65 61
 and -10. Default is \code{NULL}, which will not trim the data assay.}
62
+
63
+\item{verbose}{Logical value indicating if progress messages should be
64
+displayed to the user. Default is \code{TRUE}.}
66 65
 }
67 66
 \value{
68 67
 Output SCE object with new normalized/transformed assay stored.
Browse code

Added option to add pseudocounts after transformation option in "runNormalization" method. Pending refactor!

Irzam Sarfraz authored on 21/03/2021 10:21:56
Showing 1 changed files
... ...
@@ -17,8 +17,9 @@ runNormalization(
17 17
   scale = FALSE,
18 18
   seuratScaleFactor = 10,
19 19
   transformation = NULL,
20
-  pseudocountsNorm = NULL,
21
-  pseudocountsTransform = NULL,
20
+  pseudocountsBeforeNorm = NULL,
21
+  pseudocountsBeforeTransform = NULL,
22
+  pseudocountsAfterTransform = NULL,
22 23
   trim = NULL
23 24
 )
24 25
 }
... ...
@@ -46,18 +47,22 @@ selected assay. Options include `log2` (base 2 log transformation),
46 47
 `log1p` (natural log + 1 transformation) and `sqrt` (square root). Default
47 48
 value is \code{NULL}, which will not run any transformation.}
48 49
 
49
-\item{trim}{Specify a vector of two numeric values that should be used
50
-as the upper and lower trim values to trim the assay between these two
51
-values. For example, \code{c(10,-10)} will trim the values between 10
52
-and -10. Default is \code{NULL}, which will not trim the data assay.}
53
-
54
-\item{pseduoCountsNorm}{Specify a numeric pseudo value that should be added 
50
+\item{pseudocountsBeforeNorm}{Specify a numeric pseudo value that should be added 
55 51
 to the assay before normalization is performed. Default is \code{NULL},
56 52
 which will not add any value.}
57 53
 
58
-\item{pseduoCountsTransform}{Specify a numeric pseudo value that should be 
54
+\item{pseudocountsBeforeTransform}{Specify a numeric pseudo value that should be 
59 55
 added to the assay before transformation is run. Default is \code{NULL},
60 56
 which will not add any value.}
57
+
58
+\item{pseudocountsAfterTransform}{Specify a numeric pseudo value that should be 
59
+added to the assay after transformation is run. Default is \code{NULL},
60
+which will not add any value.}
61
+
62
+\item{trim}{Specify a vector of two numeric values that should be used
63
+as the upper and lower trim values to trim the assay between these two
64
+values. For example, \code{c(10,-10)} will trim the values between 10
65
+and -10. Default is \code{NULL}, which will not trim the data assay.}
61 66
 }
62 67
 \value{
63 68
 Output SCE object with new normalized/transformed assay stored.
Browse code

Updated runNormalization() doc

Irzam Sarfraz authored on 21/03/2021 08:53:55
Showing 1 changed files
... ...
@@ -3,7 +3,11 @@
3 3
 \name{runNormalization}
4 4
 \alias{runNormalization}
5 5
 \title{Wrapper function to run any of the integrated normalization/transformation
6
-methods in the singleCellTK.}
6
+methods in the singleCellTK. The available methods include 'LogNormalize',
7
+'CLR', 'RC' and 'SCTransform' from Seurat, 'logNormCounts and 'CPM' from
8
+Scater. Additionally, users can 'scale' using Z.Score, 'transform' using
9
+log, log1p and sqrt, add 'pseudocounts' and trim the final matrices
10
+between a range of values.}
7 11
 \usage{
8 12
 runNormalization(
9 13
   inSCE,
... ...
@@ -19,24 +23,52 @@ runNormalization(
19 23
 )
20 24
 }
21 25
 \arguments{
22
-\item{inSCE}{input}
26
+\item{inSCE}{Input \code{SingleCellExperiment} object.}
23 27
 
24
-\item{normalizationMethod}{normal}
28
+\item{normalizationMethod}{Specify a normalization method from `LogNormalize`,
29
+`CLR`, `RC` and `SCTransform` from Seurat or `logNormCounts` and `CPM` from
30
+scater packages. Default \code{NULL} is set which will not run any
31
+normalization method.}
25 32
 
26
-\item{useAssay}{use}
33
+\item{useAssay}{Specify the name of the assay that should be used.}
27 34
 
28
-\item{normAssayName}{npr}
35
+\item{normAssayName}{Specify the name of the new output assay.}
29 36
 
30
-\item{scale}{scale}
37
+\item{scale}{Logical value indicating if the data should be scaled using
38
+Z.Score. Default \code{FALSE}.}
31 39
 
32
-\item{seuratScaleFactor}{factor}
40
+\item{seuratScaleFactor}{Specify the `scaleFactor` argument if a Seurat
41
+normalization method is selected. Default is \code{10}. This parameter
42
+will not be used if methods other than seurat are selected.}
43
+
44
+\item{transformation}{Specify the transformation options to run on the
45
+selected assay. Options include `log2` (base 2 log transformation),
46
+`log1p` (natural log + 1 transformation) and `sqrt` (square root). Default
47
+value is \code{NULL}, which will not run any transformation.}
48
+
49
+\item{trim}{Specify a vector of two numeric values that should be used
50
+as the upper and lower trim values to trim the assay between these two
51
+values. For example, \code{c(10,-10)} will trim the values between 10
52
+and -10. Default is \code{NULL}, which will not trim the data assay.}
53
+
54
+\item{pseduoCountsNorm}{Specify a numeric pseudo value that should be added 
55
+to the assay before normalization is performed. Default is \code{NULL},
56
+which will not add any value.}
57
+
58
+\item{pseduoCountsTransform}{Specify a numeric pseudo value that should be 
59
+added to the assay before transformation is run. Default is \code{NULL},
60
+which will not add any value.}
33 61
 }
34 62
 \value{
35
-object
63
+Output SCE object with new normalized/transformed assay stored.
36 64
 }
37 65
 \description{
38 66
 Wrapper function to run any of the integrated normalization/transformation
39
-methods in the singleCellTK.
67
+methods in the singleCellTK. The available methods include 'LogNormalize',
68
+'CLR', 'RC' and 'SCTransform' from Seurat, 'logNormCounts and 'CPM' from
69
+Scater. Additionally, users can 'scale' using Z.Score, 'transform' using
70
+log, log1p and sqrt, add 'pseudocounts' and trim the final matrices
71
+between a range of values.
40 72
 }
41 73
 \examples{
42 74
 data(sce_chcl, package = "scds")
Browse code

Updated plotTopHVG method with separate support for highlighting top genes and their labels

Irzam Sarfraz authored on 21/03/2021 07:24:34
Showing 1 changed files
... ...
@@ -2,15 +2,20 @@
2 2
 % Please edit documentation in R/runNormalization.R
3 3
 \name{runNormalization}
4 4
 \alias{runNormalization}
5
-\title{Title}
5
+\title{Wrapper function to run any of the integrated normalization/transformation
6
+methods in the singleCellTK.}
6 7
 \usage{
7 8
 runNormalization(
8 9
   inSCE,
9
-  normalizationMethod,
10
-  useAssay,
11
-  normAssayName,
10
+  normalizationMethod = NULL,
11
+  useAssay = "counts",
12
+  normAssayName = "customNormalizedAssay",
12 13
   scale = FALSE,
13
-  seuratScaleFactor
14
+  seuratScaleFactor = 10,
15
+  transformation = NULL,
16
+  pseudocountsNorm = NULL,
17
+  pseudocountsTransform = NULL,
18
+  trim = NULL
14 19
 )
15 20
 }
16 21
 \arguments{
... ...
@@ -30,7 +35,8 @@ runNormalization(
30 35
 object
31 36
 }
32 37
 \description{
33
-Title
38
+Wrapper function to run any of the integrated normalization/transformation
39
+methods in the singleCellTK.
34 40
 }
35 41
 \examples{
36 42
 data(sce_chcl, package = "scds")
Browse code

Created new wrapper runNormalization() that integrates all normalization and transformation options in SCTK

Irzam Sarfraz authored on 17/03/2021 17:25:51
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,42 @@
1
+% Generated by roxygen2: do not edit by hand
2
+% Please edit documentation in R/runNormalization.R
3
+\name{runNormalization}
4
+\alias{runNormalization}
5
+\title{Title}
6
+\usage{
7
+runNormalization(
8
+  inSCE,
9
+  normalizationMethod,
10
+  useAssay,
11
+  normAssayName,
12
+  scale = FALSE,
13
+  seuratScaleFactor
14
+)
15
+}
16
+\arguments{
17
+\item{inSCE}{input}
18
+
19
+\item{normalizationMethod}{normal}
20
+
21
+\item{useAssay}{use}
22
+
23
+\item{normAssayName}{npr}
24
+
25
+\item{scale}{scale}
26
+
27
+\item{seuratScaleFactor}{factor}
28
+}
29
+\value{
30
+object
31
+}
32
+\description{
33
+Title
34
+}
35
+\examples{
36
+data(sce_chcl, package = "scds")
37
+sce_chcl <- runNormalization(
38
+ inSCE = sce_chcl, 
39
+ "SCTransform", 
40
+ "counts", 
41
+ "sctCounts")
42
+}