From d5639ca841c70220e016fe782f2f5205e34cebbc Mon Sep 17 00:00:00 2001
From: sanchezi <isabelle.sanchez@inrae.fr>
Date: Wed, 13 Apr 2022 10:21:47 +0200
Subject: [PATCH] correc DESCRIPTION pour voir si correc CI/CD
---
.gitlab-ci.yml | 1 +
DESCRIPTION | 11 ++++++-----
R/kfino.R | 8 ++++----
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b3de43..13db31c 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 2b3f3d3..08f8dfb 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 cb516de..c0ac87d 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]
--
GitLab