Merge pull request #24 from SensitiveQuestions/9.2.6

9.2.6
SensitiveQuestions · Jan 16, 2024 · e088e5f · e088e5f
2 parents c8181f6 + d24435c
commit e088e5f
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 38 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 9.2.4
-Date: 2022-06-26 03:47:54 UTC
-SHA: 2b644fc51c8188f529b905751334000f2837afd5
+Version: 9.2.6
+Date: 2024-01-10 16:46:34 UTC
+SHA: 1b73cd366c06fdb334049779d27b983189da9fd2
diff --git a/ChangeLog b/ChangeLog
@@ -24,4 +24,5 @@ version      date  description
 9.2  03/19/19 Bug fix
 9.2.1 05/09/22 Bug fix
 9.2.2 05/05/25 Warnings removed; ability to use new data for predictions from a direct question
-9.2.4 06/27/22 Bug fix
+9.2.4 06/27/22 Bug fix
+9.2.6 01/02/24 Remove C++ warnings
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: list
-Version: 9.2.4
+Version: 9.2.6
 Title: Statistical Methods for the Item Count Technique and List Experiment
 Authors@R: c(person("Graeme", "Blair", email = "[email protected]", role = c("aut", "cre")),
              person("Winston", "Chou", email = "[email protected]", role = c("aut")),
@@ -53,4 +53,4 @@ LazyLoad: yes
 LazyData: yes
 License: GPL (>= 2)
 Encoding: UTF-8
-RoxygenNote: 7.2.0
+RoxygenNote: 7.2.3
diff --git a/R/list-package.R b/R/list-package.R
@@ -29,7 +29,7 @@
 #' numeric \tab age of a respondent divided by 10 \cr treat \tab numeric \tab
 #' treatment status \tab 0 - 1 }
 #' @source The full data set is available at SDA (Survey Documentation and
-#' Analysis; \url{http://sda.berkeley.edu/D3/Natlrace/Doc/nrac.htm})
+#' Analysis; \url{https://sda.berkeley.edu/D3/Natlrace/Doc/nrac.htm})
 #' @keywords datasets
 NULL
 
@@ -162,7 +162,7 @@ NULL
 #' 
 #' }
 #' @source The full data set is available at SDA (Survey Documentation and
-#' Analysis; \url{http://sda.berkeley.edu/D3/Multi/Doc/mult.htm})
+#' Analysis; \url{https://sda.berkeley.edu/D3/Multi/Doc/mult.htm})
 #' @keywords datasets
 NULL
 
@@ -205,7 +205,7 @@ NULL
 #' numeric \tab age of a respondent divided by 10 \cr treat \tab numeric \tab
 #' treatment status \tab 0 - 2 }
 #' @source The full data set is available at SDA (Survey Documentation and
-#' Analysis; \url{http://sda.berkeley.edu/D3/Natlrace/Doc/nrac.htm})
+#' Analysis; \url{https://sda.berkeley.edu/D3/Natlrace/Doc/nrac.htm})
 #' @keywords datasets
 NULL
 
@@ -242,7 +242,7 @@ NULL
 #' numeric \tab age of a respondent divided by 10 \cr treat \tab numeric \tab
 #' treatment status \tab 0 - 1 }
 #' @source The full data set is available at SDA (Survey Documentation and
-#' Analysis; \url{http://sda.berkeley.edu/D3/Natlrace/Doc/nrac.htm})
+#' Analysis; \url{https://sda.berkeley.edu/D3/Natlrace/Doc/nrac.htm})
 #' @keywords datasets
 NULL
 

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # R package list
-[![Travis-CI Build Status](https://travis-ci.org/SensitiveQuestions/list.svg?branch=master)](https://travis-ci.org/SensitiveQuestions/list) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/list)](https://cran.r-project.org/package=list) ![CRAN downloads](http://cranlogs.r-pkg.org/badges/grand-total/list)
+ [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/list)](https://cran.r-project.org/package=list) ![CRAN downloads](http://cranlogs.r-pkg.org/badges/grand-total/list)
 
 This package allows researchers to conduct multivariate statistical analyses of survey data with list experiments. This survey methodology is also known as the item count technique or the unmatched count technique and is an alternative to the commonly used randomized response method. The package implements the methods developed by [Imai (2011)](https://doi.org/10.1198/jasa.2011.ap10415), [Blair and Imai (2012)](https://doi.org/10.1093/pan/mpr048), [Blair, Imai, and Lyall (2013)](https://doi.org/10.1111/ajps.12086), [Imai, Park, and Greene (2014)](https://doi.org/10.1093/pan/mpu017), [Aronow, Coppock, Crawford, and Green (2015)](https://doi.org/10.1093/jssam/smu023), and [Chou, Imai, and Rosenfeld (2017)](https://doi.org/10.1177/0049124117729711), and [Blair, Chou, and Imai (2018)](https://imai.fas.harvard.edu/research/files/listerror.pdf) 
 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,11 +1,10 @@
 ## Submission
 
-Thank you for reviewing this minor bug fix patch.
+Addressing warnings in r-devel noted in email from Kurt on 11/26/2023.
 
 ## Test environments
-* local OS X install, R 3.5.1
-* ubuntu 12.04 (on travis-ci), R 3.5.1
-* win-builder (devel and release)
+* local OS X install, R devel
+* win-builder (devel, oldrel, release)
 
 ## R CMD check results
 

diff --git a/inst/CITATION b/inst/CITATION
@@ -1,17 +1,17 @@
-citHeader("To cite list in publications use:")
-
-citEntry(entry = "misc",
-  title        = "{list}: Statistical Methods for the Item Count Technique and List Experiment",
-  author       = personList(as.person("Graeme Blair"),
-                   as.person("Kosuke Imai")),
-  howpublished = "Available at The Comprehensive R Archive Network (CRAN)",
-  year         = "2010",
-  url          = "https://CRAN.R-project.org/package=list",
-
-  textVersion  =
-  paste("Graeme Blair and Kosuke Imai (2010).",
-        "list: Statistical Methods for the Item Count Technique and List Experiment.",
-        "available at The Comprehensive R Archive Network (CRAN).",
-        "URL https://CRAN.R-project.org/package=list")
-)
-
+citHeader("To cite list in publications use:")
+
+bibentry(bibtype = "Manual",
+  title        = "{list}: Statistical Methods for the Item Count Technique and List Experiment",
+  author     = c(person("Graeme", "Blair"),
+                 person("Kosuke", "Imai")),
+  howpublished = "Available at The Comprehensive R Archive Network (CRAN)",
+  year         = "2010",
+  url          = "https://CRAN.R-project.org/package=list",
+
+  textVersion  =
+  paste("Graeme Blair and Kosuke Imai (2010).",
+        "list: Statistical Methods for the Item Count Technique and List Experiment.",
+        "available at The Comprehensive R Archive Network (CRAN).",
+        "URL https://CRAN.R-project.org/package=list")
+)
+
diff --git a/man/affirm.Rd b/man/affirm.Rd
diff --git a/man/mis.Rd b/man/mis.Rd
diff --git a/man/multi.Rd b/man/multi.Rd
diff --git a/man/race.Rd b/man/race.Rd
diff --git a/src/combine.c b/src/combine.c
@@ -661,7 +661,7 @@ void CombineEndorseListProbit(/* Starging the endorsement code stuff */
 
     /* printing */
     if (main_loop % 100 == 0) {
-      Rprintf("Acceptance rate for psi: %4g\n", (j + 1), fprec((double) *psiCounter / (double) main_loop, 3));
+      Rprintf("Acceptance rate for psi: %d, %4g\n", (j + 1), fprec((double) *psiCounter / (double) main_loop, 3));
     }
 
     R_FlushConsole();

diff --git a/src/subroutines.c b/src/subroutines.c
@@ -54,7 +54,7 @@ void dinv(double **X,
   if (!errorM) {
     F77_CALL(dpptri)("U", &size, pdInv, &errorM FCONE);
     if (errorM) {
-      Rprintf("LAPACK dpptri failed, %d\n", errorM FCONE);
+      Rprintf("LAPACK dpptri failed, %d\n", errorM);
       error("Exiting from dinv().\n");
     }
   }