diff --git a/DESCRIPTION b/DESCRIPTION index 2d9cfe3..d281dec 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: cccp -Version: 0.2-5 -Date: 2015-05-07 +Version: 0.2-6 +Date: 2020-04-16 Title: Cone Constrained Convex Problems Authors@R: c(person("Bernhard", "Pfaff", role = c("aut", "cre"), email = "bernhard@pfaffikus.de"), person("Lieven", "Vandenberghe", role = "cph", comment = "copyright holder of cvxopt"), person("Martin", "Andersen", role = "cph", comment = "copyright holder of cvxopt"), person("Joachim", "Dahl", role = "cph", comment = "copyright holder of cvxopt")) Maintainer: Bernhard Pfaff diff --git a/R/ctrl.R b/R/ctrl.R index 6442a3f..1699ae8 100644 --- a/R/ctrl.R +++ b/R/ctrl.R @@ -1,6 +1,6 @@ ## ## Function for creating 'CTRL' objects -ctrl <- function(maxiters = 100L, abstol = 1e-7, reltol = 1e-6, feastol = 1e-7, +ctrl <- function(maxiters = 100L, abstol = 1e-6, reltol = 1e-6, feastol = 1e-6, stepadj = 0.95, beta = 0.5, trace = TRUE){ if(!is.integer(maxiters)){ diff --git a/man/ctrl.Rd b/man/ctrl.Rd index cb972ec..cd597bc 100644 --- a/man/ctrl.Rd +++ b/man/ctrl.Rd @@ -12,8 +12,8 @@ } \usage{ -ctrl(maxiters = 100L, abstol = 1e-07, reltol = 1e-06, - feastol = 1e-07, stepadj = 0.95, beta = 0.5, trace = TRUE) +ctrl(maxiters = 100L, abstol = 1e-06, reltol = 1e-06, + feastol = 1e-06, stepadj = 0.95, beta = 0.5, trace = TRUE) } \arguments{ diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp new file mode 100644 index 0000000..d029d9c --- /dev/null +++ b/src/RcppExports.cpp @@ -0,0 +1,21 @@ +// Generated by using Rcpp::compileAttributes() -> do not edit by hand +// Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393 + +#include "../inst/include/cccp.h" +#include +#include + +using namespace Rcpp; + + +RcppExport SEXP _rcpp_module_boot_CPG(); + +static const R_CallMethodDef CallEntries[] = { + {"_rcpp_module_boot_CPG", (DL_FUNC) &_rcpp_module_boot_CPG, 0}, + {NULL, NULL, 0} +}; + +RcppExport void R_init_cccp(DllInfo *dll) { + R_registerRoutines(dll, NULL, CallEntries, NULL, NULL); + R_useDynamicSymbols(dll, FALSE); +}