Merge branch 'release-2.1.5'

.Rbuildignore

@@ -1,6 +1,5 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
-^NEWS\.md$
 ^README\.md$
 ^dev\.R$
 ^\.travis\.yml$
@@ -10,3 +9,5 @@ gendat3*
 .vscode
 ^Meta$
 ^doc$
+^\.github$
+^CRAN-SUBMISSION$

.github/.gitignore

@@ -0,0 +1 @@
+*.html

.github/workflows/R-CMD-check.yaml

@@ -0,0 +1,50 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
+on:
+  push:
+    branches: [master, develop, release-*]
+  pull_request:
+    branches: [develop]
+
+name: R-CMD-check
+
+jobs:
+  R-CMD-check:
+    runs-on: ${{ matrix.config.os }}
+
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: macos-latest,   r: 'release'}
+          - {os: windows-latest, r: 'release'}
+          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,   r: 'release'}
+          - {os: ubuntu-latest,   r: 'oldrel-1'}
+
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: ${{ matrix.config.r }}
+          http-user-agent: ${{ matrix.config.http-user-agent }}
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::rcmdcheck
+          needs: check
+
+      - uses: r-lib/actions/check-r-package@v2
+        with:
+          upload-snapshots: true
+          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

.github/workflows/rhub.yaml

@@ -0,0 +1,95 @@
+# R-hub's generic GitHub Actions workflow file. It's canonical location is at
+# https://github.com/r-hub/actions/blob/v1/workflows/rhub.yaml
+# You can update this file to a newer version using the rhub2 package:
+#
+# rhub::rhub_setup()
+#
+# It is unlikely that you need to modify this file manually.
+
+name: R-hub
+run-name: "${{ github.event.inputs.id }}: ${{ github.event.inputs.name || format('Manually run by {0}', github.triggering_actor) }}"
+
+on:
+  workflow_dispatch:
+    inputs:
+      config:
+        description: 'A comma separated list of R-hub platforms to use.'
+        type: string
+        default: 'linux,windows,macos'
+      name:
+        description: 'Run name. You can leave this empty now.'
+        type: string
+      id:
+        description: 'Unique ID. You can leave this empty now.'
+        type: string
+
+jobs:
+
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      containers: ${{ steps.rhub-setup.outputs.containers }}
+      platforms: ${{ steps.rhub-setup.outputs.platforms }}
+
+    steps:
+    # NO NEED TO CHECKOUT HERE
+    - uses: r-hub/actions/setup@v1
+      with:
+        config: ${{ github.event.inputs.config }}
+      id: rhub-setup
+
+  linux-containers:
+    needs: setup
+    if: ${{ needs.setup.outputs.containers != '[]' }}
+    runs-on: ubuntu-latest
+    name: ${{ matrix.config.label }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config: ${{ fromJson(needs.setup.outputs.containers) }}
+    container:
+      image: ${{ matrix.config.container }}
+
+    steps:
+      - uses: r-hub/actions/checkout@v1
+      - uses: r-hub/actions/platform-info@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/setup-deps@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/run-check@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+
+  other-platforms:
+    needs: setup
+    if: ${{ needs.setup.outputs.platforms != '[]' }}
+    runs-on: ${{ matrix.config.os }}
+    name: ${{ matrix.config.label }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config: ${{ fromJson(needs.setup.outputs.platforms) }}
+
+    steps:
+      - uses: r-hub/actions/checkout@v1
+      - uses: r-hub/actions/setup-r@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}
+      - uses: r-hub/actions/platform-info@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/setup-deps@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}
+      - uses: r-hub/actions/run-check@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}

.gitignore

@@ -1,3 +1,5 @@
+CRAN-SUBMISSION
+
 #--------------------------#
 #--- The usual suspects ---#
 #--------------------------#

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: lsasim
 Title: Functions to Facilitate the Simulation of Large Scale Assessment Data
-Version: 2.1.4
+Version: 2.1.5
 Authors@R: c(
   person("Tyler", "Matta",
          email = "[email protected]", role = "aut"),
@@ -30,11 +30,12 @@ Depends:
 License: GPL-3
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Suggests:
     testthat,
     knitr,
     formatR,
-    rmarkdown
+    rmarkdown,
+    NAEPirtparams
 VignetteBuilder: knitr
-Date: 2023-08-21
+Date: 2024-05-06

NEWS.md

@@ -1,62 +1,62 @@
-lsasim 2.1.4
-------------
+# lsasim 2.1.5
 
-### Bug fixes
+## Bug fixes
+
+* Fixed `block_design()` for non-sequential items (issue #50)
+* Fixed typos in documentation
+* Reimplemented continuous integration routine (issue #47)
+
+# lsasim 2.1.4
+
+## Bug fixes
 
 * Fixed top-level package documentation (`?lsasim`)
 
-lsasim 2.1.3
-------------
+# lsasim 2.1.3
 
-### Bug fixes
+## Bug fixes
 
 * Fixes generation of thresholds on `item_gen()` (issue #48)
 * Refactored usage of `class()` on if-statements
 
-lsasim 2.1.2
-------------
+# lsasim 2.1.2
 
-### Bug fixes
+## Bug fixes
 
 * Refactoring to fix building on Fedora/Clang and M1-powered Macs
 
-lsasim 2.1.1
-------------
+# lsasim 2.1.1
 
-### Bug fixes
+## Bug fixes
 
 * Fixes test unit dependency on GNU libiconv
 
-lsasim 2.1.0
-------------
+# lsasim 2.1.0
 
-### API changes
+## API changes
 
 * Adds `cluster_gen`, a function to generate background questionnaires (with `questionnaire_gen`) in a cluster sampling structure.
 * Package description now includes a literary reference for the theoretical framework behind the package (issue #38, pull request #42)
 
-### Bug fixes
+## Bug fixes
 
-* Fixes item parameter generation by `irt_gen` when the guesssing parameter is larger than zero (issue #40)
+* Fixes item parameter generation by `irt_gen` when the guessing parameter is larger than zero (issue #40)
 
-lsasim 2.0.2
-------------
+# lsasim 2.0.2
 
-### Bug fixes
+## Bug fixes
 
 * Solves [Issue #11](https://github.com/tmatta/lsasim/issues/11), which was causing `item_gen()` to produce out-of-bounds item difficulties in some situations.
 
-lsasim 2.0.1
-------------
+# lsasim 2.0.1
 
-### Bug fixes
+## Bug fixes
 
-* Makes lsasim compliant with changes to be introduced in the next major release of R. lsasim 2.0.1 is functionally identical to 2.0.0, as all changes relate to how `if (class(x) == "matrix"` statements are written. Specifically, such statements were changed to `if(class(x))[1] == "matrix"` to accomodate for cases where `x` may be a matrix with complex classes such as `"matrix" "array"`.
+* Makes lsasim compliant with changes to be introduced in the next major release of R. lsasim 2.0.1 is functionally identical to 2.0.0, as all changes relate to how `if (class(x) == "matrix"` statements are written. Specifically, such statements were changed to `if(class(x))[1] == "matrix"` to accommodate for cases where `x` may be a matrix with complex classes such as `"matrix" "array"`.
 
-lsasim 2.0.0
-------------
+# lsasim 2.0.0
 
-### API changes
+## API changes
 
 This release adds several features to the `questionnaire_gen` function, such as:
 
@@ -69,25 +69,22 @@ Please read the function's help file for more details on how to access these new
 
 *Note*: any R code written for the `questionnaire_gen` function from previous versions of lsasim may not work properly on this version due to the rearrangement of the function's arguments and slight changes in its default behavior. Please review your code before executing old scripts.
 
-lsasim 1.0.1
--------------
+# lsasim 1.0.1
 
-### API changes
+## API changes
 * Added `cov_bounds` to `cor_gen`.
 * Removed `d1` from the returned data frame of `item_gen` when `thresholds = 1`.
 
 
-lsasim 1.0.1.9000
--------------
+# lsasim 1.0.1.9000
 
-### API changes
+## API changes
 * Added `item_no` to `response_gen`.
 
-### Bug fixes
+## Bug fixes
 * `response_gen` can now handle item subsets.
 
 
-lsasim 1.0.0
--------------
+# lsasim 1.0.0
 
 * Launched

R/anova.R

@@ -2,7 +2,7 @@
 #' @description Prints Analysis of Variance table for `cluster_gen` output.
 #' @param object list output of `cluster_gen`
 #' @param print if `TRUE`, output will be a list containing estimators; if `FALSE` (default), output are formatted tables of this information
-#' @param calc.se if `TRUE`, will try to calculate the standard error of the intreaclass correlation
+#' @param calc.se if `TRUE`, will try to calculate the standard error of the intraclass correlation
 #' @param ... additional objects of the same type (see `help("anova")` for details)
 #' @return Printed ANOVA table or list of parameters
 #' @note  If the rhos for different levels are varied in scale, the generated rho will be less accurate.

R/beta_gen.R

@@ -16,7 +16,7 @@
 #'   "q"
 #' @param verbose if `FALSE`, output messages will be suppressed (useful for simulations). Defaults to `TRUE`
 #' @importFrom stats lm model.matrix quantile cov pnorm setNames
-#' @details This function was primarily conceived as a subfunction of
+#' @details This function was primarily conceived as a sub-function of
 #'   \code{questionnaire_gen}, when \code{family = "gaussian"}, \code{theta =
 #'   TRUE}, and \code{full_output = TRUE}. However, it can also be directly
 #'   called by the user so they can perform further analysis.