Skip to content

Commit

Permalink
Revert "Always export do_call if quoted_call is exported"
Browse files Browse the repository at this point in the history
This reverts commit 7c352d9.
  • Loading branch information
asardaes committed Jun 22, 2024
1 parent 7c352d9 commit 909b082
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions R/CLUSTERING-all-cent2.R
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ shape_cent <- function(x, x_split, cent, id_changed, cl_id, ..., distmat) {
.combine = c,
.multicombine = TRUE,
.packages = "dtwclust",
.export = c("quoted_call", "do_call")) %op% {
.export = c("quoted_call")) %op% {
Map(x_split, cent, f = function(x, cent) {
quoted_call(shape_extraction, X = x, centroid = cent, dots = dots)
})
Expand All @@ -72,7 +72,7 @@ dba_cent <- function(x, x_split, cent, id_changed, cl_id, ..., distmat) {
.combine = c,
.multicombine = TRUE,
.packages = "dtwclust",
.export = c("quoted_call", "do_call")) %op% {
.export = c("quoted_call")) %op% {
Map(x_split, cent, f = function(x, cent) {
quoted_call(DBA, X = x, centroid = cent, dots = dots)
})
Expand All @@ -92,7 +92,7 @@ sdtw_cent_cent <- function(x, x_split, cent, id_changed, cl_id, ..., distmat) {
.combine = c,
.multicombine = TRUE,
.packages = "dtwclust",
.export = c("quoted_call", "do_call")) %op% {
.export = c("quoted_call")) %op% {
Map(x_split, cent, f = function(x, cent) {
quoted_call(sdtw_cent, series = x, centroid = cent, dots = dots)
})
Expand Down
2 changes: 1 addition & 1 deletion R/DISTANCES-dtw-lb.R
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ dtw_lb <- function(x, y = NULL, window.size = NULL, norm = "L1",
.combine = rbind,
.multicombine = TRUE,
.packages = "dtwclust",
.export = c("quoted_call", "call_dtwlb", "do_call")) %op% {
.export = c("quoted_call", "call_dtwlb")) %op% {
if (nn.margin != 1L)
warning("Column-wise nearest neighbors are not implemented for dtw::dtw") # nocov
dots$pairwise <- TRUE
Expand Down

0 comments on commit 909b082

Please sign in to comment.