Skip to content

Commit 2447feb

Browse files
committed
Revert "Merge pull request #75 from DiseaseTranscriptomicsLab/main"
This reverts commit 4c58b64, reversing changes made to f6335ca.
1 parent 4c58b64 commit 2447feb

20 files changed

Lines changed: 443 additions & 622 deletions

DESCRIPTION

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: markeR
22
Title: An R Toolkit for Evaluating Gene Signatures as Phenotypic Markers
3-
Version: 0.99.5
3+
Version: 0.99.3
44
Authors@R:
55
c(
66
person("Rita", "Martins-Silva",
@@ -58,9 +58,7 @@ Suggests:
5858
rmarkdown,
5959
roxygen2,
6060
mockery,
61-
covr,
62-
magick,
63-
BiocStyle
61+
covr
6462
Config/testthat/edition: 3
6563
Depends:
6664
R (>= 4.5.0)

NAMESPACE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ importFrom(pROC,roc)
6363
importFrom(reshape2,melt)
6464
importFrom(rstatix,t_test)
6565
importFrom(scales,hue_pal)
66-
importFrom(scales,rescale)
6766
importFrom(scales,squish)
6867
importFrom(stats,TukeyHSD)
6968
importFrom(stats,anova)

NEWS.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
# markeR 0.99.5 (17 Sep, 2025)
2-
3-
- Minor fix in `.onAttach()` to avoid errors when checking `ggplot2` version and ensure the startup warning works correctly.
4-
5-
# markeR 0.99.4 (17 Sep, 2025)
6-
7-
## General
8-
- Addressed feedback from the Bioconductor review process with updates to documentation and vignette style.
9-
10-
## Documentation and vignette
11-
- Updated vignette style to **Bioconductor’s BiocStyle** with automatic table of contents.
12-
- Improved vignette content with small corrections.
13-
- Revised dataset documentation by adding explicit `usage: data(object)` entries.
14-
15-
## Functions
16-
- Updated `geneset_similarity()` color handling: replaced the single `color_values` parameter with three new parameters — `color`, `neutral_color`, and `cold_color`, for more interpretable visualization.
17-
181
# markeR 0.99.3 (21 Aug, 2025)
192

203
## Package size and structure

R/FPR_Simulation.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ utils::globalVariables(c( "cohen", "method", "contrast" ))
108108
#' @export
109109
#'
110110
FPR_Simulation <- function(data, metadata, original_signatures, Variable,
111-
gene_list = NULL, number_of_sims=100, title=NULL,
111+
gene_list = NULL, number_of_sims=10, title=NULL,
112112
widthTitle = 30, titlesize = 12, pointSize = 2,
113113
labsize = 10,mode = c( "none","simple","medium","extensive"),
114114
ColorValues=NULL, ncol=NULL, nrow=NULL) {

R/PlotScores.R

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -786,16 +786,16 @@ PlotScores_Categorical <- function(data, metadata, gene_sets,
786786
if (!is.null(title)) title <- wrap_title(title, width = widthTitle)
787787

788788
# Create label for y axis based on method.
789-
# if (method == "ssGSEA") {
790-
# ylab <- "ssGSEA Enrichment Score"
791-
# } else if (method == "logmedian") {
792-
# ylab <- "Normalised Signature Score"
793-
# } else if (method == "ranking") {
794-
# ylab <- "Signature Genes' Ranking"
795-
# }
789+
if (method == "ssGSEA") {
790+
ylab <- "ssGSEA Enrichment Score"
791+
} else if (method == "logmedian") {
792+
ylab <- "Normalised Signature Score"
793+
} else if (method == "ranking") {
794+
ylab <- "Signature Genes' Ranking"
795+
}
796796

797797
combined_plot <- ggpubr::annotate_figure(combined_plot,
798-
left = grid::textGrob(paste0("Gene Set's Score (", method, ")"),
798+
left = grid::textGrob(ylab,
799799
rot = 90, vjust = 1,
800800
gp = grid::gpar(cex = 1.3,
801801
fontsize = labsize)),
@@ -1093,16 +1093,16 @@ PlotScores_Numeric <- function(data,
10931093
if (!is.null(title)) title <- wrap_title(title, width = widthTitle)
10941094

10951095
# Create label for y axis based on method.
1096-
# if (method == "ssGSEA") {
1097-
# ylab <- "ssGSEA Enrichment Score"
1098-
# } else if (method == "logmedian") {
1099-
# ylab <- "Normalised Signature Score"
1100-
# } else if (method == "ranking") {
1101-
# ylab <- "Signature Genes' Ranking"
1102-
# }
1096+
if (method == "ssGSEA") {
1097+
ylab <- "ssGSEA Enrichment Score"
1098+
} else if (method == "logmedian") {
1099+
ylab <- "Normalised Signature Score"
1100+
} else if (method == "ranking") {
1101+
ylab <- "Signature Genes' Ranking"
1102+
}
11031103

11041104
combined_plot <- ggpubr::annotate_figure(combined_plot,
1105-
left = grid::textGrob(paste0("Gene Set's Score (", method, ")"),
1105+
left = grid::textGrob(ylab,
11061106
rot = 90,
11071107
vjust = 1,
11081108
gp = grid::gpar(cex = 1.3,

R/data.R

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#' for senescent samples, "young" for proliferative).}
1616
#' }
1717
#'
18-
#'
1918
#' @source \url{https://www.ncbi.nlm.nih.gov/geo/query/acc.cgi?acc=GSE63577}
2019
#'
2120
#' @references Marthandan S, Priebe S, Baumgart M, Groth M et al. Similarities
@@ -25,23 +24,23 @@
2524
#' @references Marthandan S, Baumgart M, Priebe S, Groth M et al. Conserved
2625
#' Senescence Associated Genes and Pathways in Primary Human Fibroblasts
2726
#' Detected by RNA-Seq. PLoS One 2016;11(5):e0154531. PMID: 27140416
28-
#'
29-
#' @usage data(metadata_example)
27+
#'
28+
#' @keywords datasets
3029
"metadata_example"
3130

3231
#' Gene Expression Counts for Marthandan et al. (2016) RNA-Seq Data
3332
#'
34-
#' A numeric matrix containing filtered and normalized (non log-transformed)
35-
#' gene expression data from the Marthandan et al. (2016) study (GEO accession
36-
#' GSE63577).
33+
#' A numeric matrix containing filtered and normalized gene expression data from
34+
#' the Marthandan et al. (2016) study (GEO accession GSE63577).
3735
#'
3836
#' Raw FASTQ files were downloaded using `fasterq-dump` (v2.11.0) and processed
3937
#' in a reproducible conda environment (Python v3.11.5). Quality control was
4038
#' conducted using FastQC (v0.12.1) and summarised with MultiQC (v1.14).
4139
#' Pseudo-alignment to the RefSeq transcriptome (NCBI release 109) was performed
4240
#' using kallisto (v0.44.0). Genes with low expression (mean count < 70 in all
4341
#' conditions) were filtered out. Count normalization factors were calculated
44-
#' with `edgeR::calcNormFactors`.
42+
#' with `edgeR::calcNormFactors`, and log2-transformed values were obtained via
43+
#' `limma::voom`.
4544
#'
4645
#' Intermediate time points for HFF and MRC5 cell lines were excluded, resulting
4746
#' in a final dataset with 45 high-quality samples across proliferative,
@@ -53,7 +52,7 @@
5352
#'
5453
#' @format A numeric matrix with rows as genes (gene symbols) and columns as
5554
#' samples (sample IDs).
56-
#'
55+
#'
5756
#' @source \url{https://www.ncbi.nlm.nih.gov/geo/query/acc.cgi?acc=GSE63577}
5857
#'
5958
#' @references Marthandan S, Priebe S, Baumgart M, Groth M et al. Similarities
@@ -64,8 +63,8 @@
6463
#' Senescence Associated Genes and Pathways in Primary Human Fibroblasts
6564
#' Detected by RNA-Seq.
6665
#' *PLoS One* 2016;11(5):e0154531. PMID: 27140416
67-
#'
68-
#' @usage data(counts_example)
66+
#'
67+
#' @keywords datasets
6968
"counts_example"
7069

7170
#' Example Gene Sets for Cellular Senescence
@@ -76,15 +75,15 @@
7675
#' curated gene set of commonly reported senescence markers,
7776
#' with directionality (+1 or -1).}
7877
#' \item{REACTOME_Senescence}{Character vector of gene symbols. The
79-
#' REACTOME_CELLULAR_SENESCENCE from MSigDB database No directionality.}
78+
#' REACTOME_CELLULAR_SENESCENCE from MSigDB pathway. No directionality.}
8079
#' \item{HernandezSegura}{A data frame with columns `gene` and `direction`.
8180
#' A gene set from Hernandez-Segura et al. (2017), with directionality (+1 or -1).}
8281
#' }
83-
#'
82+
#'
8483
#' @references Hernandez-Segura A, de Jong TV, Melov S, Guryev V, Campisi J,
8584
#' Demaria M. Unmasking Transcriptional Heterogeneity in Senescent Cells.
8685
#' *Curr Biol.* 2017 Sep 11;27(17):2652-2660.e4. doi: 10.1016/j.cub.2017.07.033.
8786
#' Epub 2017 Aug 30. PMID: 28844647; PMCID: PMC5788810.
88-
#' @usage data(genesets_example)
87+
#' @keywords datasets
8988
"genesets_example"
9089

0 commit comments

Comments
 (0)