diff --git a/NAMESPACE b/NAMESPACE index 82a1122..083c653 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -3,7 +3,6 @@ export(Ktrunc) export(bsearch) export(chunk) -export(eigsym) export(euc_dist) export(fdskrls) export(generateK) @@ -17,7 +16,6 @@ export(krlogit_hess_trunc_inv) export(krls) export(krls_gr_trunc) export(krls_hess_trunc_inv) -export(lambda_search) export(lambdab.fn) export(lambdabsearch) export(lambdaline) diff --git a/R/RcppExports.R b/R/RcppExports.R index a7293bf..ebf1df2 100644 --- a/R/RcppExports.R +++ b/R/RcppExports.R @@ -6,11 +6,6 @@ mult_diag <- function(x, d) { .Call('_KRLS2_mult_diag', PACKAGE = 'KRLS2', x, d) } -#' @export -eigsym <- function(x) { - .Call('_KRLS2_eigsym', PACKAGE = 'KRLS2', x) -} - #' @export krls_gr_trunc <- function(U, D, y, w, fitted, dhat, lambda) { .Call('_KRLS2_krls_gr_trunc', PACKAGE = 'KRLS2', U, D, y, w, fitted, dhat, lambda) @@ -61,11 +56,6 @@ new_gauss_kern <- function(newx, oldx, b) { .Call('_KRLS2_new_gauss_kern', PACKAGE = 'KRLS2', newx, oldx, b) } -#' @export -lambda_search <- function(tol, l, u, y, eigvals, eigvecs, eigtrunc) { - .Call('_KRLS2_lambda_search', PACKAGE = 'KRLS2', tol, l, u, y, eigvals, eigvecs, eigtrunc) -} - #' @export solve_for_d_ls <- function(y, U, D, lambda) { .Call('_KRLS2_solve_for_d_ls', PACKAGE = 'KRLS2', y, U, D, lambda) diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp index e10bf94..cb59881 100644 --- a/src/RcppExports.cpp +++ b/src/RcppExports.cpp @@ -18,17 +18,6 @@ BEGIN_RCPP return rcpp_result_gen; END_RCPP } -// eigsym -Rcpp::List eigsym(const arma::mat& x); -RcppExport SEXP _KRLS2_eigsym(SEXP xSEXP) { -BEGIN_RCPP - Rcpp::RObject rcpp_result_gen; - Rcpp::RNGScope rcpp_rngScope_gen; - Rcpp::traits::input_parameter< const arma::mat& >::type x(xSEXP); - rcpp_result_gen = Rcpp::wrap(eigsym(x)); - return rcpp_result_gen; -END_RCPP -} // krls_gr_trunc arma::vec krls_gr_trunc(const arma::mat& U, const arma::vec& D, const arma::vec& y, const arma::vec& w, const arma::vec& fitted, const arma::vec& dhat, const double& lambda); RcppExport SEXP _KRLS2_krls_gr_trunc(SEXP USEXP, SEXP DSEXP, SEXP ySEXP, SEXP wSEXP, SEXP fittedSEXP, SEXP dhatSEXP, SEXP lambdaSEXP) { @@ -171,23 +160,6 @@ BEGIN_RCPP return rcpp_result_gen; END_RCPP } -// lambda_search -double lambda_search(const double& tol, const double& l, const double& u, const arma::vec& y, const arma::vec& eigvals, const arma::mat& eigvecs, const double& eigtrunc); -RcppExport SEXP _KRLS2_lambda_search(SEXP tolSEXP, SEXP lSEXP, SEXP uSEXP, SEXP ySEXP, SEXP eigvalsSEXP, SEXP eigvecsSEXP, SEXP eigtruncSEXP) { -BEGIN_RCPP - Rcpp::RObject rcpp_result_gen; - Rcpp::RNGScope rcpp_rngScope_gen; - Rcpp::traits::input_parameter< const double& >::type tol(tolSEXP); - Rcpp::traits::input_parameter< const double& >::type l(lSEXP); - Rcpp::traits::input_parameter< const double& >::type u(uSEXP); - Rcpp::traits::input_parameter< const arma::vec& >::type y(ySEXP); - Rcpp::traits::input_parameter< const arma::vec& >::type eigvals(eigvalsSEXP); - Rcpp::traits::input_parameter< const arma::mat& >::type eigvecs(eigvecsSEXP); - Rcpp::traits::input_parameter< const double& >::type eigtrunc(eigtruncSEXP); - rcpp_result_gen = Rcpp::wrap(lambda_search(tol, l, u, y, eigvals, eigvecs, eigtrunc)); - return rcpp_result_gen; -END_RCPP -} // solve_for_d_ls Rcpp::List solve_for_d_ls(const arma::vec& y, const arma::mat& U, const arma::vec& D, const double& lambda); RcppExport SEXP _KRLS2_solve_for_d_ls(SEXP ySEXP, SEXP USEXP, SEXP DSEXP, SEXP lambdaSEXP) { @@ -251,7 +223,6 @@ END_RCPP static const R_CallMethodDef CallEntries[] = { {"_KRLS2_mult_diag", (DL_FUNC) &_KRLS2_mult_diag, 2}, - {"_KRLS2_eigsym", (DL_FUNC) &_KRLS2_eigsym, 1}, {"_KRLS2_krls_gr_trunc", (DL_FUNC) &_KRLS2_krls_gr_trunc, 7}, {"_KRLS2_krls_hess_trunc_inv", (DL_FUNC) &_KRLS2_krls_hess_trunc_inv, 4}, {"_KRLS2_krlogit_fn_trunc", (DL_FUNC) &_KRLS2_krlogit_fn_trunc, 6}, @@ -262,7 +233,6 @@ static const R_CallMethodDef CallEntries[] = { {"_KRLS2_kern_gauss_1d", (DL_FUNC) &_KRLS2_kern_gauss_1d, 3}, {"_KRLS2_kern_gauss", (DL_FUNC) &_KRLS2_kern_gauss, 2}, {"_KRLS2_new_gauss_kern", (DL_FUNC) &_KRLS2_new_gauss_kern, 3}, - {"_KRLS2_lambda_search", (DL_FUNC) &_KRLS2_lambda_search, 7}, {"_KRLS2_solve_for_d_ls", (DL_FUNC) &_KRLS2_solve_for_d_ls, 4}, {"_KRLS2_solve_for_d_ls_w", (DL_FUNC) &_KRLS2_solve_for_d_ls_w, 5}, {"_KRLS2_pwmfx", (DL_FUNC) &_KRLS2_pwmfx, 6}, diff --git a/src/rcpparma_fns.cpp b/src/rcpparma_fns.cpp index 410af01..a4c3832 100644 --- a/src/rcpparma_fns.cpp +++ b/src/rcpparma_fns.cpp @@ -25,21 +25,6 @@ arma::mat mult_diag(const arma::mat& x, const arma::vec& d) { return out; } - -// Eigen decomposition, unused - -//' @export -// [[Rcpp::export]] -Rcpp::List eigsym(const arma::mat& x) { - arma::vec eigval; - arma::mat eigvec; - - eig_sym(eigval, eigvec, x); - - return Rcpp::List::create(Rcpp::Named("eigvec") = eigvec, - Rcpp::Named("eigval") = eigval); -} - //' @export // [[Rcpp::export]] arma::vec krls_gr_trunc( @@ -225,19 +210,6 @@ arma::mat new_gauss_kern(const arma::mat& newx, const arma::mat& oldx, const dou } - -//' @export -// [[Rcpp::export]] -double lambda_search(const double& tol, - const double& l, - const double& u, - const arma::vec& y, - const arma::vec& eigvals, - const arma::mat& eigvecs, - const double& eigtrunc) { - return 42; -} - //' @export // [[Rcpp::export]] Rcpp::List solve_for_d_ls(const arma::vec& y,