Skip to content

Commit 5146a57

Browse files
committed
Removed C++11 requirement.
1 parent 29b671d commit 5146a57

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Encoding: UTF-8
22
Type: Package
33
Package: mixsqp
4-
Version: 0.3-53
4+
Version: 0.3-54
55
Date: 2023-12-20
66
Title: Sequential Quadratic Programming for Fast Maximum-Likelihood
77
Estimation of Mixture Proportions

R/mixsqp.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ mixsqp <- function (L, w = rep(1,nrow(L)), x0 = rep(1,ncol(L)),
436436

437437
# Print a brief summary of the analysis, if requested.
438438
if (verbose) {
439-
cat(sprintf("Running mix-SQP algorithm 0.3-53 on %d x %d matrix\n",n,m))
439+
cat(sprintf("Running mix-SQP algorithm 0.3-54 on %d x %d matrix\n",n,m))
440440
cat(sprintf("convergence tol. (SQP): %0.1e\n",convtol.sqp))
441441
cat(sprintf("conv. tol. (active-set): %0.1e\n",convtol.activeset))
442442
cat(sprintf("zero threshold (solution): %0.1e\n",zero.threshold.solution))

src/Makevars

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
CXX_STD = CXX11
21
PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DARMA_DONT_PRINT_ERRORS \
32
-DARMA_NO_DEBUG -DARMA_USE_BLAS -DARMA_DONT_USE_OPENMP -DARMA_WARN_LEVEL=1
43
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

src/Makevars.win

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
CXX_STD = CXX11
21
PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DARMA_DONT_PRINT_ERRORS \
32
-DARMA_NO_DEBUG -DARMA_USE_BLAS -DARMA_DONT_USE_OPENMP -DARMA_WARN_LEVEL=1
43
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

0 commit comments

Comments
 (0)