Skip to content

Commit

Permalink
fixed roxygen2 issues
Browse files Browse the repository at this point in the history
  • Loading branch information
danheck committed Feb 19, 2024
1 parent 99ab58c commit 10909a6
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 19 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: multinomineq
Type: Package
Title: Bayesian Inference for Multinomial Models with Inequality Constraints
Version: 0.2.5
Date: 2022-11-21
Version: 0.2.6
Date: 2024-02-19
Authors@R: person("Daniel W.", "Heck",
email = "daniel.heck@uni-marburg.de",
role = c("aut","cre"),
Expand Down Expand Up @@ -52,4 +52,4 @@ LinkingTo:
RcppArmadillo,
RcppProgress
VignetteBuilder: knitr
RoxygenNote: 7.2.2
RoxygenNote: 7.3.1
4 changes: 2 additions & 2 deletions R/data_hilbig2014_heck2017.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#' Each participant made 32 choices for each of 3 item types with four cues (with validities .9, .8, .7, and .6).
#'
#' The pattern of cue values of Option A and and B was as follows:
#' \itemize{
#' \describe{
#' \item{Item Type 1: }{A = (1, 1, 1, -1) vs. B = (-1, 1, -1, 1)}
#' \item{Item Type 2: }{A = (1, -1, -1, -1) vs. B = (-1, 1, 1, -1)}
#' \item{Item Type 3: }{A = (1, 1, 1, -1) vs. B = (-1, 1, 1, 1)}
Expand Down Expand Up @@ -63,7 +63,7 @@
#' Each participant made 40 choices for each of 4 item types with four cues
#' (with validities .9, .8, .7, and .6).
#' The pattern of cue values of Option A and and B was as follows:
#' \itemize{
#' \describe{
#' \item{Item Type 1: }{A = (-1, 1, 1, -1) vs. B = (-1, -1, -1, -1)}
#' \item{Item Type 2: }{A = (1, -1, -1, 1) vs. B = (-1, 1, -1, 1)}
#' \item{Item Type 3: }{A = (-1, 1, 1, 1) vs. B = (-1, 1, 1, -1)}
Expand Down
2 changes: 1 addition & 1 deletion R/data_swop.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#' Strict Weak Order Polytope for 5 Elements and Ternary Choices
#'
#' Facet-defining inequalities of the strict weak order mixture model
#' for all 10 paired comparisons of 5 choice elements {a,b,c,d,e} in a
#' for all 10 paired comparisons of 5 choice elements \{a,b,c,d,e\} in a
#' 3-alternative forced-choice task (Regenwetter & Davis-Stober, 2012).
#'
#' @format A list with 3 elements:
Expand Down
2 changes: 1 addition & 1 deletion R/nirt.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#' the latent trait are tested directly.
#'
#' The axioms are as follows:
#' \itemize{
#' \describe{
#' \item{\code{"W1"}: }{Weak row/subject independence: Persons can be ordered on
#' an ordinal scale independent of items.}
#' \item{\code{"W2"}: }{Weak column/item independence: Items can be ordered on
Expand Down
2 changes: 1 addition & 1 deletion R/strategy_multiattribute.R
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ as_strategy <- function(pattern, c = .50, ordered = TRUE, prior = c(1, 1)) {
#'
#' @return
#' a \code{strategy} object (a list) with the entries:
#' \itemize{
#' \describe{
#' \item{\code{pattern}: }{a numeric vector encoding the predicted choice pattern by the sign
#' (negative = Option A, positive = Option B, 0 = guessing).
#' Identical error probabilities are encoded by using the same absolute number
Expand Down
4 changes: 2 additions & 2 deletions man-roxygen/details_strategy.R
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#' @return
#' a \code{strategy} object (a list) with the entries:
#' \itemize{
#' \describe{
#' \item{\code{pattern}: }{a numeric vector encoding the predicted choice pattern by the sign
#' (negative = Option A, positive = Option B, 0 = guessing).
#' Identical error probabilities are encoded by using the same absolute number
#' (e.g., \code{c(-1,1,1)} defines one error probability with A,B,B predictions).}
#' \item{\code{c}}{upper boundary of error probabilities}
#' \item{\code{c}: }{upper boundary of error probabilities}
#' \item{\code{ordered}: }{whether error probabilities are linearly ordered by their absolute value in \code{pattern} (largest error: smallest absolute number)}
#' \item{\code{prior}: }{a numeric vector with two positive values specifying the shape parameters of the beta prior distribution (truncated to the interval \code{[0,c]}}
#' \item{\code{label}: }{strategy label (optional)}
Expand Down
2 changes: 1 addition & 1 deletion man/heck2017.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/hilbig2014.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/nirt_to_Ab.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/strategy_multiattribute.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/swop5.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions src/Makevars
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
# RcppProgress:
# PKG_LIBS = '$(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)' $(SHLIB_OPENMP_CXXFLAGS) '$(R_HOME)/bin/Rscript -e "RcppProgress:::CxxFlags()"' $(SHLIB_OPENMP_CFLAGS)
# RcppProgress requires:

PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(SHLIB_OPENMP_CXXFLAGS)

PKG_CPPFLAGS = -I../inst/include

PKG_CXXFLAGS =-Ilibsrc $(SHLIB_OPENMP_CXXFLAGS)

CXX_STD = CXX11

0 comments on commit 10909a6

Please sign in to comment.