diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b3de436ce764a9f03aceb7beab542d0c9e07e3e..13db31cd925e276ec06b5fd313c04aecf74a35f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,3 +30,4 @@ installpkg: stage: deploy script: - R -e 'devtools::install(build_vignettes=TRUE,dependencies = TRUE)' + diff --git a/DESCRIPTION b/DESCRIPTION index 2b3f3d352f73a5ad7a136c97e639c6775e00e518..08f8dfbbc99607d17e94a056aaf06eba4786993c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -17,14 +17,15 @@ Encoding: UTF-8 LazyData: TRUE URL: https://forgemia.inra.fr/isabelle.sanchez/kfino BugReports: https://forgemia.inra.fr/isabelle.sanchez/kfino/issues -Imports: ggplot2, dplyr +Imports: + ggplot2, + dplyr, + foreach, + doParallel, + parallel Suggests: rmarkdown, knitr, - RColorBrewer, - foreach, - parallel, - doParallel, testthat (>= 3.0.0) VignetteBuilder: knitr RoxygenNote: 7.1.2 diff --git a/R/kfino.R b/R/kfino.R index cb516deabaa5bc70ee4775ef1cb4978e756b5fea..c0ac87de7cbd639ebd2cbbc0612f5e42c04937ba 100644 --- a/R/kfino.R +++ b/R/kfino.R @@ -193,8 +193,8 @@ kfino_fit<-function(datain,Tvar,Yvar, TpsTps=Tps NN=N - #Subechant=sort(sample(1:NN,50)) - Subechant=sort(.Internal(sample(NN, 50L, FALSE, NULL))) + Subechant=sort(sample(1:NN,50)) + #Subechant=sort(.Internal(sample(NN, 50L, FALSE, NULL))) Y=YY[Subechant] Tps=TpsTps[Subechant] N=50 @@ -215,8 +215,8 @@ kfino_fit<-function(datain,Tvar,Yvar, for (p in seqp){ # A voir si 50 sous-echantillons au hasard suffisent. Comme dans # Robbins Monroe, permet aussi de reduire l'impact de la troncature - #Subechant=sort(sample(1:NN,50)) - Subechant=sort(.Internal(sample(NN, 50L, FALSE, NULL))) + Subechant=sort(sample(1:NN,50)) + #Subechant=sort(.Internal(sample(NN, 50L, FALSE, NULL))) Y=YY[Subechant] Tps=TpsTps[Subechant]