Skip to content

Commit 7859e7d

Browse files
author
aliaksah
committed
detect cores - 1 added to the example, unintended warnings surpressed
1 parent ed11171 commit 7859e7d

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

R/results.R

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ merge_results <- function (results, populations = NULL, complex.measure = NULL,
123123
# Generate mock data to compare features with
124124
uk <- 1
125125
good.mock <- FALSE
126-
while(!good.mock & uk < 10)
126+
while(!good.mock & uk < 5)
127127
{
128128
uk <- uk + 1
129129
if (is.null(data)) mock.data <- list(x = matrix(runif((results[[1]]$ncov)^2, -100, 100), ncol = results[[1]]$ncov))
@@ -140,17 +140,8 @@ merge_results <- function (results, populations = NULL, complex.measure = NULL,
140140
break
141141
}
142142
}
143-
if(uk == 10)
144-
warning(
145-
"Constant features detected in merge_results().\n",
146-
" - If not already, provide the 'data' argument in the function call.\n",
147-
" - If the warning persists, one or more features in your dataset are constant (no variation).\n",
148-
"This should not affect results critically, but please:\n",
149-
" * check your input data, or\n",
150-
" * reconsider the chosen nonlinearities/features."
151-
)
152-
# Calculate the correlation to find equivalent features
153-
cors <- cor(mock.data.precalc)
143+
144+
cors <- suppressWarnings(cor(mock.data.precalc))
154145

155146
# A map to link equivalent features together,
156147
# row 1-3 are the simplest equivalent features based on three different complexity measures

tests_current/JSS_Script.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ result.P50 <- fbms(data = df.train, method = "gmjmcmc", transforms = transforms,
8383
set.seed(123)
8484

8585
result_parallel <- fbms(data = df.train, method = "gmjmcmc.parallel", transforms = transforms,
86-
runs = 40, cores = 8, P = 25)
86+
runs = 40, cores = parallel::detectCores()-1, P = 25)
8787

8888

8989
####################################################
@@ -455,7 +455,7 @@ c(time.lme4$callback_msg, time.inla$callback_msg, time.rtmb$callback_msg)
455455

456456

457457
result2a <- fbms(formula = z ~ 1+., data = df, N = 5000,
458-
method = "mjmcmc.parallel", runs = 40, cores = 8,
458+
method = "mjmcmc.parallel", runs = 40, cores = parallel::detectCores()-1,
459459
family = "custom", loglik.pi = mixed.model.loglik.lme4,
460460
model_prior = list(r = 1/dim(df)[1]),
461461
extra_params = list(dr = droplevels(Zambia$dr)))
@@ -476,7 +476,7 @@ params$feat$pop.max = 10
476476

477477
result2b <- fbms(formula = z ~ 1+., data = df, transforms = transforms,
478478
probs = probs, params = params, P=25, N = 100,
479-
method = "gmjmcmc.parallel", runs = 40, cores = 8,
479+
method = "gmjmcmc.parallel", runs = 40, cores = parallel::detectCores()-1,
480480
family = "custom", loglik.pi = mixed.model.loglik.lme4,
481481
model_prior = list(r = 1/dim(df)[1]),
482482
extra_params = list(dr = droplevels(Zambia$dr)))
@@ -496,7 +496,7 @@ params$feat$pop.max = 10
496496

497497
result2c <- fbms(formula = z ~ 1+., data = df, transforms = transforms,
498498
probs = probs, params = params, P=25, N = 100,
499-
method = "gmjmcmc.parallel", runs = 40, cores = 8,
499+
method = "gmjmcmc.parallel", runs = 40, cores = parallel::detectCores()-1,
500500
family = "custom", loglik.pi = mixed.model.loglik.lme4,
501501
model_prior = list(r = 1/dim(df)[1]),
502502
extra_params = list(dr = droplevels(Zambia$dr)))

0 commit comments

Comments
 (0)