Merge branch 'master' of github.com:tmsalab/simcdm

DESCRIPTION

@@ -5,15 +5,17 @@ Version: 0.1.0
 Authors@R: c(person("James Joseph", "Balamuta", 
                     email = "balamut2@illinois.edu",
                     role = c("aut", "cre", "cph"),
-                    comment = c(ORCID = "0000-0003-2826-8458")),
+                    comment = c(ORCID = "0000-0003-2826-8458")
+                    ),
              person("Steven Andrew", "Culpepper", 
                     email = "sculpepp@illinois.edu",
                     role = c("aut", "cph"),
                     comment = c(ORCID = "0000-0003-4226-6176")
                     ),
              person("Aaron", "Hudson", 
                     email = "awhudson@uw.edu",
-                    role = c("ctb", "cph")
+                    role = c("ctb", "cph"),
+                    comment = c(ORCID = "0000-0002-9731-2224")
                     )
             )
 Description: Provides efficient R and 'C++' routines to simulate cognitive diagnostic

NEWS.md

@@ -3,10 +3,11 @@
 ## Changes
 
 - Renamed `sim_attribute_classes()` to `attribute_classes()`.
+- Addressed ambiguous calls to `std::pow(<int>, <int>)`
 
 ## Documentation
 
-- Added a CITATION file for the package
+- Added a `CITATION` file for the package
 - Improved Vignette Examples
 - Improved README contents
 

inst/CITATION

@@ -8,7 +8,7 @@ citEntry(entry = "Manual",
                                    as.person("Aaron Hudson")
                                   ),
          year         = 2019,
-         textVersion  = paste("Balamuta, J.J., Culpepper, S.A., and Hudson A. (2019)",
+         textVersion  = paste("Balamuta, J. J., Culpepper, S. A., and Hudson A. (2019)",
                               "simcdm: Simulate Cognitive Diagnostic Model (CDM) Data.",
                               "URL https://cran.r-project.org/package=simcdm.")
 )

src/sim_dina.cpp

@@ -17,15 +17,15 @@
 //'              the probability of an incorrect response for individuals with
 //'              all of the required attributes
 //'
-//' @return 
+//' @return
 //' A dichotomous item matrix with dimensions \eqn{N \times J}{N x J}.
-//' 
-//' @author 
+//'
+//' @author
 //' Steven Andrew Culpepper and James Joseph Balamuta
-//' 
-//' @seealso 
+//'
+//' @seealso
 //' [simcdm::sim_dina_attributes()] and [simcdm::sim_dina_items()]
-//' 
+//'
 //' @export
 //' @template sim-dina-class-example
 // [[Rcpp::export]]
@@ -50,19 +50,19 @@ arma::mat sim_dina_class(unsigned int N, unsigned int J, const arma::vec &CLASS,
 //'
 //' Generates a DINA model's \eqn{\eta} matrix based on alphas and
 //' the \eqn{\mathbf{Q}} matrix.
-//' 
+//'
 //' @inheritParams sim_dina_items
 //'
-//' @return 
+//' @return
 //' The \eqn{\eta} `matrix` with dimensions \eqn{N \times J}{N x J} under
 //' the DINA model.
-//' 
-//' @author 
+//'
+//' @author
 //' Steven Andrew Culpepper and James Joseph Balamuta
-//' 
-//' @seealso 
+//'
+//' @seealso
 //' [simcdm::sim_dina_class()] and [simcdm::sim_dina_items()]
-//' 
+//'
 //' @export
 //' @template sim-dina-example-body
 // [[Rcpp::export]]
@@ -94,20 +94,20 @@ arma::mat sim_dina_attributes(const arma::mat &alphas, const arma::mat &Q)
 //' generated under DINA model.
 //'
 //' @param alphas A \eqn{N} by \eqn{K} `matrix` of latent attributes.
-//' @param Q      A \eqn{J} by \eqn{K} `matrix` indicating which skills are required
-//'               for which items.
-//' @param ss     A \eqn{J} `vector` of item slipping parameters.
+//' @param Q      A \eqn{J} by \eqn{K} `matrix` indicating which skills are
+//'               required for which items.
+//' @param ss     A \eqn{J} `vector` of item slipping parameters. 
 //' @param gs     A \eqn{J} `vector` of item guessing parameters.
 //'
-//' @return 
+//' @return
 //' A \eqn{N} by \eqn{J} `matrix` of responses from the DINA model.
-//' 
-//' @author 
+//'
+//' @author
 //' Steven Andrew Culpepper and James Joseph Balamuta
-//' 
-//' @seealso 
+//'
+//' @seealso
 //' [simcdm::sim_dina_class()] and [simcdm::sim_dina_attributes()]
-//' 
+//'
 //' @export
 //' @template sim-dina-example-body
 // [[Rcpp::export]]

src/sim_rrum.cpp

@@ -67,9 +67,9 @@ arma::mat sim_rrum_main(const arma::mat &Q, const arma::mat &rstar,
 //' @return Y     A `matrix` with \eqn{N} rows and \eqn{J} columns indicating
 //'               the indviduals' responses to each of the items, where \eqn{J}
 //'               represents the number of items.
-//' @author 
+//' @author
 //' Steven Andrew Culpepper, Aaron Hudson, and James Joseph Balamuta
-//' 
+//'
 //' @export
 //' @template rrum-example
 //' @template rrum-references