Fixed C++ syntax warning.

Former-commit-id: f275d0d

Author: pcarbo

DESCRIPTION

@@ -1,7 +1,7 @@
 Encoding: UTF-8
 Type: Package
 Package: mixsqp
-Version: 0.2-0
+Version: 0.2-1
 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-0 on %d x %d matrix\n",n,m))
+    cat(sprintf("Running mix-SQP algorithm 0.2-1 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-0.tar.gz
-R CMD check --as-cran mixsqp_0.2-0.tar.gz
+R CMD INSTALL mixsqp_0.2-1.tar.gz
+R CMD check --as-cran mixsqp_0.2-1.tar.gz
 ```
 
 Note that these commands require that the dependencies have already

src/mixsqp.cpp

@@ -374,8 +374,8 @@ void backtrackinglinesearch (double f, const mat& L, const vec& w,
     // Check whether the new candidate solution (y) satisfies the
     // sufficient decrease condition, and remains feasible. If so,
     // accept this candidate solution.
-    if (y.min() >= 0 &
-	fnew + sum(y) <= f + sum(x) + suffdecr*stepsize*dot(p,g + 1))
+    if ((y.min() >= 0) &
+	(fnew + sum(y) <= f + sum(x) + suffdecr*stepsize*dot(p,g + 1)))
       break;
     newstepsize = stepsizereduce * stepsize;
     if (newstepsize < minstepsize) {