Updating for package version 2.1.1

JacobSeedorff21 · May 14, 2023 · 2a60d10 · 2a60d10
1 parent 1dac6c6
commit 2a60d10
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 38 deletions.
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -1,32 +1,36 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
-BranchAndBoundCpp <- function(x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, maxsize, metric, display_progress, NumBest, cutoff) {
-    .Call(`_BranchGLM_BranchAndBoundCpp`, x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, maxsize, metric, display_progress, NumBest, cutoff)
+BranchAndBoundCpp <- function(x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, maxsize, pen, display_progress, NumBest, cutoff) {
+    .Call(`_BranchGLM_BranchAndBoundCpp`, x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, maxsize, pen, display_progress, NumBest, cutoff)
 }
 
-BackwardBranchAndBoundCpp <- function(x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, metric, display_progress, NumBest, cutoff) {
-    .Call(`_BranchGLM_BackwardBranchAndBoundCpp`, x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, metric, display_progress, NumBest, cutoff)
+BackwardBranchAndBoundCpp <- function(x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, pen, display_progress, NumBest, cutoff) {
+    .Call(`_BranchGLM_BackwardBranchAndBoundCpp`, x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, pen, display_progress, NumBest, cutoff)
 }
 
-SwitchBranchAndBoundCpp <- function(x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, metric, display_progress, NumBest, cutoff) {
-    .Call(`_BranchGLM_SwitchBranchAndBoundCpp`, x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, metric, display_progress, NumBest, cutoff)
+SwitchBranchAndBoundCpp <- function(x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, pen, display_progress, NumBest, cutoff) {
+    .Call(`_BranchGLM_SwitchBranchAndBoundCpp`, x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, pen, display_progress, NumBest, cutoff)
 }
 
 BranchGLMfit <- function(x, y, offset, init, method, m, Link, Dist, nthreads, tol, maxit, GetInit) {
     .Call(`_BranchGLM_BranchGLMfit`, x, y, offset, init, method, m, Link, Dist, nthreads, tol, maxit, GetInit)
 }
 
-MetricIntervalCpp <- function(x, y, offset, indices, num, models, method, m, Link, Dist, nthreads, tol, maxit, metric, mle, se, best, goal, rootMethod) {
-    .Call(`_BranchGLM_MetricIntervalCpp`, x, y, offset, indices, num, models, method, m, Link, Dist, nthreads, tol, maxit, metric, mle, se, best, goal, rootMethod)
+RLogLik <- function(x, y, offset, beta, Dist, Link) {
+    .Call(`_BranchGLM_RLogLik`, x, y, offset, beta, Dist, Link)
 }
 
-ForwardCpp <- function(x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, steps, metric) {
-    .Call(`_BranchGLM_ForwardCpp`, x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, steps, metric)
+MetricIntervalCpp <- function(x, y, offset, indices, num, models, method, m, Link, Dist, nthreads, tol, maxit, pen, mle, se, best, cutoff, metrics, rootMethod) {
+    .Call(`_BranchGLM_MetricIntervalCpp`, x, y, offset, indices, num, models, method, m, Link, Dist, nthreads, tol, maxit, pen, mle, se, best, cutoff, metrics, rootMethod)
 }
 
-BackwardCpp <- function(x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, steps, metric) {
-    .Call(`_BranchGLM_BackwardCpp`, x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, steps, metric)
+ForwardCpp <- function(x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, steps, pen) {
+    .Call(`_BranchGLM_ForwardCpp`, x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, steps, pen)
+}
+
+BackwardCpp <- function(x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, steps, pen) {
+    .Call(`_BranchGLM_BackwardCpp`, x, y, offset, indices, num, interactions, method, m, Link, Dist, nthreads, tol, maxit, keep, steps, pen)
 }
 
 MakeTable <- function(preds, y, cutoff) {