Skip to content

Commit

Permalink
Fixed URLs and DOIs; removed README from package.
Browse files Browse the repository at this point in the history
  • Loading branch information
pcarbo committed Nov 16, 2022
1 parent 0a80f7e commit 0da946b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
^README\.md$
^mixsqp\.Rproj$
^\.Rproj\.user$
^\.travis\.yml$
Expand Down
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -46,4 +46,4 @@ LinkingTo:
LazyData: true
NeedsCompilation: yes
VignetteBuilder: knitr
RoxygenNote: 7.1.0
RoxygenNote: 7.1.2
4 changes: 2 additions & 2 deletions R/mixsqp.R
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
#'
Expand Down Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion man/mixsqp.Rd

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

0 comments on commit 0da946b

Please sign in to comment.