Merge branch 'main' of github.com:openpharma/mtdesign into main

# Conflicts: # cran-comments.md
openpharma · Oct 24, 2022 · ac55a7f · ac55a7f
2 parents b5a2450 + da41396
commit ac55a7f
Show file tree

Hide file tree

Showing 28 changed files with 482 additions and 358 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -1,4 +1,3 @@
-
 ---
 name: Check 🛠
 
@@ -48,23 +47,9 @@ jobs:
     if: github.event_name == 'pull_request'
     name: Spell Check 🆎
     uses: insightsengineering/r.pkg.template/.github/workflows/spelling.yaml@main
-  links:
-    if: github.event_name == 'pull_request'
-    name: Check URLs 🌐
-    uses: insightsengineering/r.pkg.template/.github/workflows/links.yaml@main
-  version:
-    name: Version Check 🏁
-    uses: insightsengineering/r.pkg.template/.github/workflows/version.yaml@main
-  licenses:
-    name: License Check 🃏
-    uses: insightsengineering/r.pkg.template/.github/workflows/licenses.yaml@main
   style:
     if: github.event_name == 'pull_request'
     name: Style Check 👗
     uses: insightsengineering/r.pkg.template/.github/workflows/style.yaml@main
     with:
       auto-update: true
-  grammar:
-    if: github.event_name == 'pull_request'
-    name: Grammar Check 🔤
-    uses: insightsengineering/r.pkg.template/.github/workflows/grammar.yaml@main
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,4 @@ vignettes/*.R
 vignettes/*.html
 vignettes/*.md
 .vscode/
+lib/
diff --git a/.lintr b/.lintr
@@ -3,5 +3,8 @@
 linters: linters_with_defaults(
   line_length_linter = line_length_linter(120),
   cyclocomp_linter = NULL,
-  object_usage_linter = NULL
+  object_usage_linter = NULL,
+  object_name_linter = NULL,
+  commented_code_linter = NULL,
+  vector_logic_linter = NULL
   )
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -23,6 +23,7 @@ LazyData: true
 URL: https://github.com/openpharma/mtdesign
 BugReports: https://github.com/openpharma/mtdesign/issues
 RoxygenNote: 7.1.2
+RoxygenNote: 7.2.1
 Imports: 
     dplyr,
     ggplot2,

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -2,14 +2,13 @@
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
 simonProb <- function(p, n1, r1, n, r) {
-    .Call('_mtdesign_simonProb', PACKAGE = 'mtdesign', p, n1, r1, n, r)
+  .Call("_mtdesign_simonProb", PACKAGE = "mtdesign", p, n1, r1, n, r)
 }
 
 manderProb <- function(p, n1, r1, r2, n, r) {
-    .Call('_mtdesign_manderProb', PACKAGE = 'mtdesign', p, n1, r1, r2, n, r)
+  .Call("_mtdesign_manderProb", PACKAGE = "mtdesign", p, n1, r1, r2, n, r)
 }
 
 augmentGridC <- function(d) {
-    .Call('_mtdesign_augmentGridC', PACKAGE = 'mtdesign', d)
+  .Call("_mtdesign_augmentGridC", PACKAGE = "mtdesign", d)
 }
-