v2.4.2

- Update dependencies to C++ - Update requirement R version
oumarkme · Oct 5, 2023 · 44cc907 · 44cc907
1 parent 8580032
commit 44cc907
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 33 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: TSDFGS
 Type: Package
 Title: Training Set Determination For Genomic Selection
-Version: 2.4.1
+Version: 2.4.2
 Encoding: UTF-8
 Date: 2023-04-09
 Authors@R: c(
@@ -18,7 +18,7 @@ Authors@R: c(
             role = c("aut", "ths"), 
             comment = c(ORCID = "0000-0001-9777-3701")))
 URL: https://oumarkme.github.io/TSDFGS
-Depends: R (>= 3.10)
+Depends: R (>= 4.0)
 Maintainer: Jen-Hsiang Ou <jen-hsiang.ou@imbim.uu.se>
 Description: We propose an optimality criterion to determine the required training set, r-score, which is derived directly from Pearson's correlation between the genomic estimated breeding values and phenotypic values of the test set <doi:10.1007/s00122-019-03387-0>. This package provides two main functions to determine a good training set and its size.
 License: GPL (>= 3)
@@ -30,5 +30,5 @@ Imports:
     Rcpp,
     RcppEigen
 LinkingTo: Rcpp, RcppEigen
-RoxygenNote: 7.2.1
+RoxygenNote: 7.2.0
 LazyData: true
diff --git a/NAMESPACE b/NAMESPACE
@@ -13,4 +13,5 @@ import(dplyr)
 import(ggplot2)
 import(latex2exp)
 import(parallel)
-useDynLib(TSDFGS)
+importFrom(Rcpp,sourceCpp)
+useDynLib(TSDFGS, .registration = TRUE)
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -20,7 +20,7 @@
 #' \dontrun{cd_score(geno[1:50, ], geno[51:100])}
 #'
 cd_score <- function(X, X0) {
-    .Call('_TSDFGS_cd_score', PACKAGE = 'TSDFGS', X, X0)
+    .Call(`_TSDFGS_cd_score`, X, X0)
 }
 
 #' PEV score
@@ -42,7 +42,7 @@ cd_score <- function(X, X0) {
 #' \dontrun{pev_score(geno[1:50, ], geno[51:100])}
 #'
 pev_score <- function(X, X0) {
-    .Call('_TSDFGS_pev_score', PACKAGE = 'TSDFGS', X, X0)
+    .Call(`_TSDFGS_pev_score`, X, X0)
 }
 
 #' r-score
@@ -63,6 +63,6 @@ pev_score <- function(X, X0) {
 #' \dontrun{r_score(geno[1:50, ], geno[51:100])}
 #'
 r_score <- function(X, X0) {
-    .Call('_TSDFGS_r_score', PACKAGE = 'TSDFGS', X, X0)
+    .Call(`_TSDFGS_r_score`, X, X0)
 }
 
diff --git a/R/TSDFGS.R b/R/TSDFGS.R
@@ -1,7 +1,9 @@
+## usethis namespace: start
 #' TSDFGS
 #' @description We propose an optimality criterion to determine the required training set, r-score, which is derived directly from Pearson's correlation between the genomic estimated breeding values and phenotypic values of the test set <doi:10.1007/s00122-019-03387-0>. This package provides two main functions to determine a good training set and its size.
-#'
+#' @importFrom Rcpp sourceCpp
 #' @docType package
-#' @useDynLib TSDFGS
+#' @useDynLib TSDFGS, .registration = TRUE
 #' @name TSDFGS
+## usethis namespace: end
 NULL
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/reference/FGCM.html b/docs/reference/FGCM.html
diff --git a/docs/reference/SSDFGS.html b/docs/reference/SSDFGS.html
diff --git a/docs/reference/TSDFGS.html b/docs/reference/TSDFGS.html
diff --git a/docs/reference/cd_score.html b/docs/reference/cd_score.html
diff --git a/docs/reference/geno.html b/docs/reference/geno.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/nt2r.html b/docs/reference/nt2r.html
diff --git a/docs/reference/optTrain.html b/docs/reference/optTrain.html
diff --git a/docs/reference/pev_score.html b/docs/reference/pev_score.html
diff --git a/docs/reference/r_score.html b/docs/reference/r_score.html
diff --git a/docs/reference/subpop.html b/docs/reference/subpop.html
diff --git a/docs/search.json b/docs/search.json