Merge pull request #148 from schalkdaniel/general_updates

bernoulli loss printe + tests
schalkdaniel · Mar 30, 2018 · f0ec965 · f0ec965
2 parents 558ca19 + f054064
commit f0ec965
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 4 deletions.
diff --git a/R/class_printer.R b/R/class_printer.R
@@ -40,7 +40,7 @@
 # Helper functions:
 # -----------------
 
-glueLoss = function (name, definition = NULL)
+glueLoss = function (name, definition = NULL, additional.desc = "")
 {
   if (is.null(definition)) {
     definition = "No function specified, probably you are using a custom loss."
@@ -54,6 +54,7 @@ glueLoss = function (name, definition = NULL)
 
       {definition}
 
+      {additional.desc}
 
     ")
 
@@ -193,6 +194,11 @@ ignore.me = setMethod("show", "Rcpp_AbsoluteLoss", function (object) {
   glueLoss("AbsoluteLoss", "|y - f(x)|")
 })
 
+setClass("Rcpp_BernoulliLoss")
+ignore.me = setMethod("show", "Rcpp_BernoulliLoss", function (object) {
+  glueLoss("BernoulliLoss", "log(1 + exp(-yf(x))", "Labels should be coded as -1 and 1!")
+})
+
 setClass("Rcpp_CustomLoss")
 ignore.me = setMethod("show", "Rcpp_CustomLoss", function (object) {
   glueLoss("CustomLoss")

diff --git a/man/cpp_man/mystyle.css b/man/cpp_man/mystyle.css
@@ -255,7 +255,7 @@ div.dynheader {
     background-color: rgba(0, 0, 0, 0.1);
     border-bottom-left-radius: 0px;
     border-bottom-right-radius: 0px;
-    box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+    box-shadow: none;
     -moz-border-radius-bottomleft: 0px;
     -moz-border-radius-bottomright: 0px;
     -moz-box-shadow: none;

diff --git a/src/compboost_modules.cpp b/src/compboost_modules.cpp
@@ -823,7 +823,7 @@ RCPP_MODULE (loss_module)
     .method("testConstantInitializer", &AbsoluteLossWrapper::testConstantInitializer, "Test the constant initializer function of th eloss")
   ;
 
-  class_<BernoulliLossWrapper> ("AbsoluteLoss")
+  class_<BernoulliLossWrapper> ("BernoulliLoss")
     .derives<LossWrapper> ("Loss")
     .constructor ()
     .method("testLoss", &BernoulliLossWrapper::testLoss, "Test the defined loss function of the loss")

diff --git a/src/loss.cpp b/src/loss.cpp
@@ -166,7 +166,7 @@ double AbsoluteLoss::constantInitializer (const arma::vec& true_value) const
 
 arma::vec BernoulliLoss::definedLoss (const arma::vec& true_value, const arma::vec& prediction) const
 {
-  return arma::log(1 + arma::exp(- true_value * prediction));
+  return arma::log(1 + arma::exp(- true_value % prediction));
 }
 
 /**

diff --git a/tests/testthat/test_loss.R b/tests/testthat/test_loss.R
@@ -42,7 +42,28 @@ test_that("Absolute loss works", {
     absolute.loss$testConstantInitializer(true.value),
     median.default(true.value)
   )
+})
+
+test_that("Bernoulli loss works", {
+  true.value = rbinom(100, 1, 0.4) * 2 - 1
+  prediction = runif(100, -1, 1)
+
+  bernoulli.loss = BernoulliLoss$new()
 
+  # Tests:
+  # -----------
+  expect_equal(
+    bernoulli.loss$testLoss(true.value, prediction), 
+    as.matrix(log(1 + exp(-true.value * prediction)))
+  )
+  expect_equal(
+    bernoulli.loss$testGradient(true.value, prediction),
+    as.matrix(-true.value / (1 + exp(true.value * prediction)))
+  )
+  expect_equal(
+    bernoulli.loss$testConstantInitializer(true.value),
+    log(mean(true.value > 0) / (1 - mean(true.value > 0))) / 2
+  )
 })
 
 test_that("Custom loss works", {

diff --git a/tests/testthat/test_printer.R b/tests/testthat/test_printer.R
@@ -43,6 +43,7 @@ test_that("Loss printer works", {
 
   quadratic.loss = QuadraticLoss$new()
   absolute.loss  = AbsoluteLoss$new()
+  bernoulli.loss = BernoulliLoss$new()
 
   # Function for Custom Loss:
   myLossFun = function (true.value, prediction) NULL
@@ -58,6 +59,7 @@ test_that("Loss printer works", {
   test.quadratic.printer = show(quadratic.loss)
   test.absolute.printer  = show(absolute.loss)
   test.custom.printer    = show(custom.loss)
+  test.bernoulliprinter  = show(bernoulli.loss)
 
   sink()
   close(tc)
@@ -67,6 +69,7 @@ test_that("Loss printer works", {
 
   expect_equal(test.quadratic.printer, "QuadraticLossPrinter")
   expect_equal(test.absolute.printer, "AbsoluteLossPrinter")
+  expect_equal(test.bernoulliprinter, "BernoulliLossPrinter")
   expect_equal(test.custom.printer, "CustomLossPrinter")
 
 })