Fixed testthat test skipping.

Former-commit-id: b10a22b

Author: pcarbo

DESCRIPTION

@@ -1,7 +1,7 @@
 Encoding: UTF-8
 Type: Package
 Package: mixsqp
-Version: 0.2-1
+Version: 0.2-2
 Date: 2019-10-15
 Title: Sequential Quadratic Programming for Fast Maximum-Likelihood
     Estimation of Mixture Proportions

R/mixsqp.R

@@ -382,7 +382,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.2-1 on %d x %d matrix\n",n,m))
+    cat(sprintf("Running mix-SQP algorithm 0.2-2 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))

README.md

@@ -140,8 +140,8 @@ in the shell:
 
 ```bash
 R CMD build mixsqp
-R CMD INSTALL mixsqp_0.2-1.tar.gz
-R CMD check --as-cran mixsqp_0.2-1.tar.gz
+R CMD INSTALL mixsqp_0.2-2.tar.gz
+R CMD check --as-cran mixsqp_0.2-2.tar.gz
 ```
 
 Note that these commands require that the dependencies have already

tests/testthat/test_mixsqp.R

@@ -4,9 +4,9 @@ context("mixsqp")
 # is used for some of the tests to check whether the correct Rmosek
 # package (the one downloaded from mosek.com) is installed.
 skip_if_mixkwdual_doesnt_work <- function() {
-  testthat::skip_if_not_installed("REBayes")
-  testthat::skip_if_not_installed("Rmosek")
-  testthat::skip_if(!is.element("mosek",getNamespaceExports("Rmosek")))
+  skip_if_not_installed("REBayes")
+  skip_if_not_installed("Rmosek")
+  skip_if(!is.element("mosek_lptoprob",getNamespaceExports("Rmosek")))
 }
 
 test_that("Version number in mixsqp with verbose = TRUE is correct",{