version 1.2-7

cran · Feb 26, 2018 · 74dc263 · 74dc263
1 parent e09f40f
commit 74dc263
Show file tree

Hide file tree

Showing 18 changed files with 117 additions and 108 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,18 +1,21 @@
 Package: mmcm
 Type: Package
 Title: Modified Maximum Contrast Method
-Version: 1.2-6
-Author: Kengo NAGASHIMA and Yasunori SATO
-Maintainer: Kengo NAGASHIMA <nshi@chiba-u.jp>
-Depends: mvtnorm
-Description: An implementation of modified maximum contrast methods
-    and the maximum contrast method: Functions 'mmcm.mvt' and
-    'mcm.mvt' give P-value by using randomized quasi-Monte Carlo
-    method with 'pmvt' function of package 'mvtnorm', and
-    'mmcm.resamp' gives P-value by using a permutation method.
+Version: 1.2-7
+Authors@R: c(
+  person("Kengo", "Nagashima", email = "nshi1201@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-4529-9045")),
+  person("Yasunori", "Sato", role = c("aut")))
+Imports: mvtnorm, OpenMPController
+Description: An implementation of modified maximum contrast methods (Sato et al. (2009) <doi:10.1038/tpj.2008.17>;
+  Nagashima et al. (2011) <doi:10.2202/1544-6115.1560>) and the maximum contrast method (Yoshimura et al. (1997)
+  <doi:10.1177/009286159703100213>): Functions mmcm.mvt() and mcm.mvt() give P-value by using randomized quasi-Monte
+  Carlo method with pmvt() function of package 'mvtnorm', and mmcm.resamp() gives P-value by using a permutation method.
 License: GPL-3
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
 NeedsCompilation: yes
-Packaged: 2016-01-15 06:22:52 UTC; NAGASHIMA
+Packaged: 2018-02-26 05:46:05 UTC; NAGASHIMA
+Author: Kengo Nagashima [aut, cre] (<https://orcid.org/0000-0003-4529-9045>),
+  Yasunori Sato [aut]
+Maintainer: Kengo Nagashima <nshi1201@gmail.com>
 Repository: CRAN
-Date/Publication: 2016-01-15 10:28:27
+Date/Publication: 2018-02-26 11:42:42 UTC
diff --git a/MD5 b/MD5
@@ -1,18 +1,21 @@
-d0956382adb614aaac8a86e52a38684d *DESCRIPTION
-d02c8baa1155011115dd46d8a101646c *NAMESPACE
-2209702aa3fc40e69c6866d9b46238b1 *NEWS
-2209702aa3fc40e69c6866d9b46238b1 *NEWS.md
-1a174f7482d4662053fe916409c34dd5 *R/mcm.mvt.R
-2b30db8f6cbc83316b314e197cdc050d *R/mmcm.mvt.R
-1dc5c85e94dc07fc60a03781eeae9c6c *R/mmcm.resamp.R
-b891718f70927b490becbcff14a30632 *R/package.R
+21fb0f401548f3ac21a6ee734fb8cb8c *DESCRIPTION
+f8d2f86a8eb3d7906b8e9ecac9cd7e8f *NAMESPACE
+2fb1d055c70ad789d09fcd93dd66f156 *NEWS.md
+c7d39ce0f19faa3349f6ecfefc09771b *R/mcm.mvt.R
+23d727ad84fd4cc9170db471bd10f19a *R/mmcm.mvt.R
+580c405f762b55bb0983dd5f945cea6e *R/mmcm.resamp.R
+2a2adf851a5c6ccc1973da435abe41cb *R/package.R
 82c42fb0da3176c8683cda87e565191d *R/print.mmcm.R
+e4ae4adfbeb49e7ee862151ed3f1ec6d *R/utils.R
+2ebf449e7836eba51567a8c830319c76 *README.md
 cf99cf87d37f5eea81cfca2a23c41d6b *inst/CITATION
-8585ec899d8e68c747a0899e36adfb33 *man/mcm.mvt.Rd
-b757871bd57bff9d945f8c4c22906350 *man/mmcm-package.Rd
-3d8a1c12fec45edc8949058068a620a6 *man/mmcm.mvt.Rd
-11bc87e2af572cc13b3e3a6bbe43b070 *man/mmcm.resamp.Rd
-a4ab52fe63a79205227225268184b4ce *man/print.mmcm.Rd
+003fdd71b8afc0bd4ec14d48011fe926 *man/mcm.mvt.Rd
+9fd5a873ee2a4d0d75f5239b4590d4de *man/mmcm-package.Rd
+62729137511444cb663be7caa2e6da51 *man/mmcm.mvt.Rd
+396de21cf4945a742a574df5c67ec941 *man/mmcm.resamp.Rd
+0beec9d851d36e349df90e322ae783ff *man/print.mmcm.Rd
+5109f0b38d17f2e69a1418a1cc804039 *man/reexports.Rd
 3aa4d79c226dafc525ce3c26da376e0e *src/Makevars
 94cf30c8a4fb9675720721d73ce1aeb2 *src/mmcm.resamp.c
 5626fa6c1969752e528c730b66efabf7 *src/mmcm.resamp.h
+d37f1462bebf0baaa1c7b7be04db9b44 *src/packagename_init.c
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,9 +1,12 @@
 # Generated by roxygen2: do not edit by hand
 
 S3method(print,mmcm)
+export(GenzBretz)
 export(mcm.mvt)
 export(mmcm.mvt)
 export(mmcm.resamp)
-import(mvtnorm)
+importFrom(OpenMPController,omp_set_num_threads)
+importFrom(mvtnorm,GenzBretz)
+importFrom(mvtnorm,pmvt)
 importFrom(stats,var)
-useDynLib(mmcm)
+useDynLib(mmcm, .registration = TRUE)
diff --git a/NEWS b/NEWS
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,11 @@
 # The 'mmcm' package
 
 
+## Changes in version 1.2-7 (2018-02-26)
+
+* Updated according to the CRAN policies 
+
+
 ## Changes in version 1.2-6 (2016-01-15)
 
 * Fixed the NAMESPACE file

diff --git a/R/mcm.mvt.R b/R/mcm.mvt.R
@@ -164,6 +164,7 @@
 #' yy
 #' @keywords htest
 #' @importFrom stats var
+#' @importFrom mvtnorm pmvt
 #' @export
 mcm.mvt <- function(x, g, contrast, alternative = c("two.sided", "less", "greater"), algorithm = GenzBretz()) {
 

diff --git a/R/mmcm.mvt.R b/R/mmcm.mvt.R
@@ -168,6 +168,7 @@
 #' yy
 #' @keywords htest
 #' @importFrom stats var
+#' @importFrom mvtnorm pmvt
 #' @export
 mmcm.mvt <- function(x, g, contrast, alternative = c("two.sided", "less", "greater"),
   algorithm = GenzBretz()) {

diff --git a/R/mmcm.resamp.R b/R/mmcm.resamp.R
@@ -119,6 +119,8 @@
 #' @seealso
 #' \code{\link{mmcm.mvt}}
 #' @examples
+#' OpenMPController::omp_set_num_threads(2)
+#' 
 #' ## Example 1 ##
 #' #  true response pattern: dominant model c=(1, 1, -2)
 #' set.seed(136885)
@@ -186,6 +188,7 @@
 #' yy
 #' @keywords htest
 #' @importFrom stats var
+#' @importFrom OpenMPController omp_set_num_threads
 #' @export
 mmcm.resamp <- function(x, g, contrast, alternative = c("two.sided", "less", "greater"),
   nsample = 20000, abseps = 0.001, seed = NULL) {

diff --git a/R/package.R b/R/package.R
@@ -7,10 +7,6 @@
 #' @name mmcm-package
 #' @aliases mmcm
 #' @docType package
-#' @author
-#' Author: Kengo NAGASHIMA and Yasunori SATO
-#' 
-#' Maintainer: Kengo NAGASHIMA \email{nshi@@chiba-u.jp}
 #' @references
 #' Nagashima, K., Sato, Y., Hamada, C. (2011).
 #' A modified maximum contrast method for unequal sample sizes in pharmacogenomic studies
@@ -29,7 +25,6 @@
 #' \code{\link{mcm.mvt}},
 #' \code{\link{mmcm.mvt}},
 #' \code{\link{mmcm.resamp}}
-#' @useDynLib mmcm
-#' @import mvtnorm
+#' @useDynLib mmcm, .registration = TRUE
 #' @keywords htest
 NULL
diff --git a/R/utils.R b/R/utils.R
@@ -0,0 +1,3 @@
+#' @importFrom mvtnorm GenzBretz
+#' @export
+mvtnorm::GenzBretz
diff --git a/README.md b/README.md
@@ -0,0 +1,28 @@
+
+# mmcm package
+
+
+## Modified Maximum Contrast Method
+
+An implementation of modified maximum contrast methods and
+the maximum contrast method: Functions 'mmcm.mvt' and 'mcm.mvt'
+give P-value by using randomized quasi-Monte Carlo method with
+'pmvt' function of package 'mvtnorm', and 'mmcm.resamp' gives
+P-value by using a permutation method.
+
+
+## Installation
+
+Get the released version from CRAN:
+
+```R
+install.packages("mmcm")
+```
+
+Or the development version from github:
+
+```R
+# install.packages("devtools")
+devtools::install_github("nshi-stat/mmcm")
+```
+
diff --git a/man/mcm.mvt.Rd b/man/mcm.mvt.Rd
diff --git a/man/mmcm-package.Rd b/man/mmcm-package.Rd
diff --git a/man/mmcm.mvt.Rd b/man/mmcm.mvt.Rd
diff --git a/man/mmcm.resamp.Rd b/man/mmcm.resamp.Rd
diff --git a/man/print.mmcm.Rd b/man/print.mmcm.Rd
diff --git a/man/reexports.Rd b/man/reexports.Rd
diff --git a/src/packagename_init.c b/src/packagename_init.c
@@ -0,0 +1,20 @@
+#include <stdlib.h> // for NULL
+#include <R_ext/Rdynload.h>
+
+/* FIXME: 
+   Check these declarations against the C/Fortran source code.
+*/
+
+/* .C calls */
+extern void mmcm_rwrap(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *);
+
+static const R_CMethodDef CEntries[] = {
+    {"mmcm_rwrap", (DL_FUNC) &mmcm_rwrap, 11},
+    {NULL, NULL, 0}
+};
+
+void R_init_mmcm(DllInfo *dll)
+{
+    R_registerRoutines(dll, CEntries, NULL, NULL, NULL);
+    R_useDynamicSymbols(dll, FALSE);
+}