Skip to content

Commit

Permalink
Merge 68d0571 into 9d3a679
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Schalk committed Apr 3, 2020
2 parents 9d3a679 + 68d0571 commit 7c61fc4
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 43 deletions.
31 changes: 17 additions & 14 deletions R/RcppExports.R
Expand Up @@ -150,39 +150,42 @@ NULL
#'
#' @section Usage:
#' \preformatted{
#' BaselearnerPSpline$new(data_source, data_target, list(degree, n_knots, penalty,
#' baselearnerpspline$new(data_source, data_target, list(degree, n_knots, penalty,
#' differences))
#' }
#'
#' @section Arguments:
#' @section arguments:
#' \describe{
#' \item{\code{data_source} [\code{Data} Object]}{
#' Data object which contains the source data.
#' \item{\code{data_source} [\code{data} object]}{
#' data object which contains the source data.
#' }
#' \item{\code{data_target} [\code{Data} Object]}{
#' Data object which gets the transformed source data.
#' \item{\code{data_target} [\code{data} object]}{
#' data object which gets the transformed source data.
#' }
#' \item{\code{degree} [\code{integer(1)}]}{
#' Degree of the spline functions to interpolate the knots.
#' degree of the spline functions to interpolate the knots.
#' }
#' \item{\code{n_knots} [\code{integer(1)}]}{
#' Number of \strong{inner knots}. To prevent weird behavior on the edges
#' number of \strong{inner knots}. to prevent weird behavior on the edges
#' the inner knots are expanded by \eqn{\mathrm{degree} - 1} additional knots.
#' }
#' \item{\code{penalty} [\code{numeric(1)}]}{
#' Positive numeric value to specify the penalty parameter. Setting the
#' penalty to 0 ordinary B-splines are used for the fitting.
#' positive numeric value to specify the penalty parameter. setting the
#' penalty to 0 ordinary b-splines are used for the fitting.
#' }
#' \item{\code{differences} [\code{integer(1)}]}{
#' The number of differences which are penalized. A higher value leads to
#' the number of differences which are penalized. a higher value leads to
#' smoother curves.
#' }
#' \item{\code{use_binning} [\code{logical(1)}]}{
#' Indicator if feature should be discretized first (default is \code{FALSE}).
#' }
#' }
#'
#' @section Details:
#' The data matrix of the source data is restricted to have just one column.
#' The spline bases are created for this single feature. Multidimensional
#' splines are not supported at the moment.
#' If \code{use_binning = TRUE} the original feature is discretized to on an equidistant grid on
#' \eqn{[\min(x),\max(x)]} with \eqn{\sqrt{n}} points. The fitting is then done by
#' using weights per new data point.
#'
#' @section Fields:
#' This class doesn't contain public fields.
Expand Down
31 changes: 17 additions & 14 deletions man/BaselearnerPSpline.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/baselearner.h
Expand Up @@ -230,7 +230,7 @@ class BaselearnerCustom : public Baselearner

};

// BaselearnerCustom:
// BaselearnerCustomCpp:
// -----------------------

// This is a bit tricky. The key is that we store the cpp functions as
Expand Down
31 changes: 17 additions & 14 deletions src/compboost_modules.cpp
Expand Up @@ -333,39 +333,42 @@ class BaselearnerPolynomialFactoryWrapper : public BaselearnerFactoryWrapper
//'
//' @section Usage:
//' \preformatted{
//' BaselearnerPSpline$new(data_source, data_target, list(degree, n_knots, penalty,
//' baselearnerpspline$new(data_source, data_target, list(degree, n_knots, penalty,
//' differences))
//' }
//'
//' @section Arguments:
//' @section arguments:
//' \describe{
//' \item{\code{data_source} [\code{Data} Object]}{
//' Data object which contains the source data.
//' \item{\code{data_source} [\code{data} object]}{
//' data object which contains the source data.
//' }
//' \item{\code{data_target} [\code{Data} Object]}{
//' Data object which gets the transformed source data.
//' \item{\code{data_target} [\code{data} object]}{
//' data object which gets the transformed source data.
//' }
//' \item{\code{degree} [\code{integer(1)}]}{
//' Degree of the spline functions to interpolate the knots.
//' degree of the spline functions to interpolate the knots.
//' }
//' \item{\code{n_knots} [\code{integer(1)}]}{
//' Number of \strong{inner knots}. To prevent weird behavior on the edges
//' number of \strong{inner knots}. to prevent weird behavior on the edges
//' the inner knots are expanded by \eqn{\mathrm{degree} - 1} additional knots.
//' }
//' \item{\code{penalty} [\code{numeric(1)}]}{
//' Positive numeric value to specify the penalty parameter. Setting the
//' penalty to 0 ordinary B-splines are used for the fitting.
//' positive numeric value to specify the penalty parameter. setting the
//' penalty to 0 ordinary b-splines are used for the fitting.
//' }
//' \item{\code{differences} [\code{integer(1)}]}{
//' The number of differences which are penalized. A higher value leads to
//' the number of differences which are penalized. a higher value leads to
//' smoother curves.
//' }
//' \item{\code{use_binning} [\code{logical(1)}]}{
//' Indicator if feature should be discretized first (default is \code{FALSE}).
//' }
//' }
//'
//' @section Details:
//' The data matrix of the source data is restricted to have just one column.
//' The spline bases are created for this single feature. Multidimensional
//' splines are not supported at the moment.
//' If \code{use_binning = TRUE} the original feature is discretized to on an equidistant grid on
//' \eqn{[\min(x),\max(x)]} with \eqn{\sqrt{n}} points. The fitting is then done by
//' using weights per new data point.
//'
//' @section Fields:
//' This class doesn't contain public fields.
Expand Down

0 comments on commit 7c61fc4

Please sign in to comment.