Fix LTO issue

mi2-warsaw · Apr 25, 2023 · 68d25b1 · 68d25b1
1 parent e194b6b
commit 68d25b1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: FSelectorRcpp
 Type: Package
 Title: 'Rcpp' Implementation of 'FSelector' Entropy-Based Feature Selection Algorithms with a Sparse Matrix Support
-Version: 0.3.10
+Version: 0.3.11
 Authors@R: c(
  person("Zygmunt", "Zawadzki", role = c("aut", "cre"), email = "[email protected]"),
  person("Marcin", "Kosinski", role = c("aut"), email = "[email protected]"),

diff --git a/R/information_gain.R b/R/information_gain.R
@@ -100,8 +100,9 @@ information_gain <- function(formula, data, x, y,
   }
 
   if (!missing(formula) && !missing(data)) {
-    return(.information_gain(formula, data, type, equal, nbins,
-                             threads, discIntegers = discIntegers))
+    return(.information_gain(formula, data, type = type,
+                             equal = equal, nbins = nbins, threads = threads,
+                             discIntegers = discIntegers))
   }
 }
 
@@ -132,8 +133,8 @@ information_gain <- function(formula, data, x, y,
 .information_gain <- function(x, y,
                               type = c("infogain", "gainratio", "symuncert"),
                               equal = FALSE,
-                              nbins = 5,
                               discIntegers = TRUE,
+                              nbins = 5,
                               threads = 1) {
   UseMethod(".information_gain", x)
 }
@@ -145,6 +146,7 @@ information_gain <- function(formula, data, x, y,
                                                "symuncert"),
                                       equal = FALSE,
                                       discIntegers = TRUE,
+                                      nbins = 5,
                                       threads = 1) {
   stop("Unsupported data type.")
 }
@@ -202,8 +204,8 @@ information_gain <- function(formula, data, x, y,
                                                "gainratio",
                                                "symuncert"),
                                       equal = FALSE,
-                                      nbins = 5,
                                       discIntegers = TRUE,
+                                      nbins = 5,
                                       threads = 1) {
   if (!is.data.frame(y)) {
     stop("y must be a data.frame!")
@@ -231,8 +233,8 @@ information_gain <- function(formula, data, x, y,
                                                  "gainratio",
                                                  "symuncert"),
                                         equal = FALSE,
-                                        nbins = 5,
                                         discIntegers = TRUE,
+                                        nbins = 5,
                                         threads = 1) {
   type <- match.arg(type)
 

diff --git a/man/dot-information_gain.Rd b/man/dot-information_gain.Rd
diff --git a/src/init.c b/src/init.c
@@ -17,7 +17,7 @@ extern SEXP _FSelectorRcpp_fs_table_numeric2d(SEXP, SEXP);
 extern SEXP _FSelectorRcpp_fs_table1d(SEXP);
 extern SEXP _FSelectorRcpp_information_gain_cpp(SEXP, SEXP, SEXP, SEXP);
 extern SEXP _FSelectorRcpp_sparse_information_gain_cpp(SEXP, SEXP, SEXP);
-extern void run_testthat_tests(void);
+extern SEXP run_testthat_tests(SEXP use_xml_sxp);
 
 static const R_CallMethodDef CallEntries[] = {
   {"_FSelectorRcpp_cutOff_k",                    (DL_FUNC) &_FSelectorRcpp_cutOff_k,                    3},