diff --git a/.Rbuildignore b/.Rbuildignore index 6f2dbfd..dc8aa14 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,3 +1,4 @@ +^README\.md$ ^mixsqp\.Rproj$ ^\.Rproj\.user$ ^\.travis\.yml$ diff --git a/DESCRIPTION b/DESCRIPTION index 8205026..0dd1239 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Encoding: UTF-8 Type: Package Package: mixsqp -Version: 0.3-47 -Date: 2022-04-04 +Version: 0.3-48 +Date: 2022-11-15 Title: Sequential Quadratic Programming for Fast Maximum-Likelihood Estimation of Mixture Proportions Authors@R: c(person("Youngseok","Kim",role="aut", @@ -46,4 +46,4 @@ LinkingTo: LazyData: true NeedsCompilation: yes VignetteBuilder: knitr -RoxygenNote: 7.1.0 +RoxygenNote: 7.1.2 diff --git a/R/mixsqp.R b/R/mixsqp.R index 8a1accd..4a37dd4 100644 --- a/R/mixsqp.R +++ b/R/mixsqp.R @@ -261,7 +261,7 @@ mixsqp.status.didnotrun <- "SQP algorithm was not run" #' algorithm for maximum likelihood estimation of mixture proportions #' using sequential quadratic programming. \emph{Journal of #' Computational and Graphical Statistics} \bold{29}, -#' 261-273. \url{https://doi.org/10.1080/10618600.2019.1689985} +#' 261-273. \doi{10.1080/10618600.2019.1689985} #' #' @seealso \code{\link{mixobjective}}, \code{\link{mixkwdual}} #' @@ -445,7 +445,7 @@ mixsqp <- function (L, w = rep(1,nrow(L)), x0 = rep(1,ncol(L)), # Print a brief summary of the analysis, if requested. if (verbose) { - cat(sprintf("Running mix-SQP algorithm 0.3-47 on %d x %d matrix\n",n,m)) + cat(sprintf("Running mix-SQP algorithm 0.3-48 on %d x %d matrix\n",n,m)) cat(sprintf("convergence tol. (SQP): %0.1e\n",convtol.sqp)) cat(sprintf("conv. tol. (active-set): %0.1e\n",convtol.activeset)) cat(sprintf("zero threshold (solution): %0.1e\n",zero.threshold.solution)) diff --git a/README.md b/README.md index ec27dc6..5bf80cd 100644 --- a/README.md +++ b/README.md @@ -189,8 +189,8 @@ with contributions from [Matthew Stephens][matthew] and [uchicago]: https://www.uchicago.edu [youngseok]: https://github.com/youngseok-kim [peter]: https://pcarbo.github.io -[matthew]: http://stephenslab.uchicago.edu -[mihai]: http://www.mcs.anl.gov/~anitescu +[matthew]: https://stephenslab.uchicago.edu +[mihai]: https://web.cels.anl.gov/~anitescu/ [mit-license]: https://opensource.org/licenses/mit-license.html [devtools]: https://github.com/r-lib/devtools [roxygen2]: https://cran.r-project.org/package=roxygen2 diff --git a/man/mixsqp.Rd b/man/mixsqp.Rd index 9cc0c30..9da2b68 100644 --- a/man/mixsqp.Rd +++ b/man/mixsqp.Rd @@ -294,7 +294,7 @@ Y. Kim, P. Carbonetto, M. Stephens and M. Anitescu (2020). A fast algorithm for maximum likelihood estimation of mixture proportions using sequential quadratic programming. \emph{Journal of Computational and Graphical Statistics} \bold{29}, -261-273. \url{https://doi.org/10.1080/10618600.2019.1689985} +261-273. \doi{10.1080/10618600.2019.1689985} } \seealso{ \code{\link{mixobjective}}, \code{\link{mixkwdual}}