Skip to content

Commit 795a694

Browse files
committed
Merge branch 'issue-46' into dev
* issue-46: Increment version number to 1.2.3.9001 🐞 Fix: update docs 🐞 Fix: DRY code
2 parents 2ada6b6 + 202d540 commit 795a694

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: DIscBIO
22
Date: 2026-01-08
33
Title: A User-Friendly Pipeline for Biomarker Discovery in Single-Cell Transcriptomics
4-
Version: 1.2.3.9000
4+
Version: 1.2.3.9001
55
Authors@R:
66
c(
77
person(

NAMESPACE

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,13 @@ importFrom(httr,status_code)
9191
importFrom(igraph,E)
9292
importFrom(igraph,V)
9393
importFrom(igraph,as_adjacency_matrix)
94-
importFrom(igraph,mean_distance)
9594
importFrom(igraph,betweenness)
9695
importFrom(igraph,degree)
9796
importFrom(igraph,distance_table)
98-
importFrom(igraph,as_adjacency_matrix)
9997
importFrom(igraph,get.edgelist)
10098
importFrom(igraph,get.shortest.paths)
101-
importFrom(igraph,graph_from_data_frame)
10299
importFrom(igraph,graph_from_adjacency_matrix)
100+
importFrom(igraph,graph_from_data_frame)
103101
importFrom(igraph,mean_distance)
104102
importFrom(igraph,mst)
105103
importFrom(impute,impute.knn)

R/DIscBIO-generic-clusteringOrder.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#' @param quiet if `TRUE`, suppresses intermediary output
77
#' @param export if `TRUE`, exports order table to csv
88
#' @param filename Name of the exported file (if `export=TRUE`)
9-
#' @importFrom TSCAN TSCANorder
109
#' @note This function has been replaced by pseudoTimeOrdering(), but it is
1110
#' being kept for legacy purposes. It will, however, be removed from future
1211
#' versions of DIscBIO.
@@ -19,6 +18,7 @@ setGeneric("KmeanOrder", function(
1918

2019
#' @export
2120
#' @rdname KmeanOrder
21+
#' @importFrom TSCAN TSCANorder
2222
setMethod(
2323
"KmeanOrder",
2424
signature = "DISCBIO",
@@ -31,6 +31,7 @@ setMethod(
3131
"but will be removed in future versions of DIscBIO. ",
3232
"Please adapt your scripts accordingly."
3333
)
34+
3435
# Validation
3536
if (length(object@kmeans$kpart) == 0) {
3637
stop("run Clustexp before KmeanOrder")

R/DIscBIO-generic-pseudoTimeOrdering.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#' @param quiet if `TRUE`, suppresses intermediary output
77
#' @param export if `TRUE`, exports order table to csv
88
#' @param filename Name of the exported file (if `export=TRUE`)
9-
#' @importFrom TSCAN TSCANorder
109
#' @return The DISCBIO-class object input with the kordering slot filled.
1110
setGeneric("pseudoTimeOrdering", function(
1211
object,
@@ -18,6 +17,7 @@ setGeneric("pseudoTimeOrdering", function(
1817

1918
#' @export
2019
#' @rdname pseudoTimeOrdering
20+
#' @importFrom TSCAN TSCANorder
2121
setMethod(
2222
"pseudoTimeOrdering",
2323
signature = "DISCBIO",
@@ -31,15 +31,15 @@ setMethod(
3131
Obj <- object@fdata
3232
Names <- object@cpart
3333
lpsmclust <- Exprmclust(Obj, K = 4, reduce = FALSE, cluster = Names)
34-
lpsorder <- TSCANorder(lpsmclust)
3534
} else if (ran_m) {
3635
Obj <- object@fdata
3736
Names <- names(object@MBclusters$clusterid)
3837
lpsmclust <- object@MBclusters
39-
lpsorder <- TSCANorder(lpsmclust)
4038
} else {
4139
stop("run clustexp before this pseudoTimeOrdering")
4240
}
41+
lpsorder <- TSCANorder(lpsmclust)
42+
4343
# ======================================================================
4444
# Ordering
4545
# ======================================================================

0 commit comments

Comments
 (0)