Commit 3d716a5f authored by Tom Reynkens's avatar Tom Reynkens

Add extra details in code

parent 9308f871
Type: Package
Package: smurf
Title: Sparse Multi-Type Regularized Feature Modeling
Version: 0.4.1.9000
Version: 0.4.1.9001
Date: 2018-09-25
Authors@R: c(
person("Tom", "Reynkens", email = "tomreynkens@hotmail.com", role = c("aut", "cre"),
......
......@@ -286,10 +286,12 @@
if (!all(pen.cov == "none")) {
tmp <- unlist(pen.weights)
# Add penalty weights in lambda1 to tmp, divide by lambda1.orig to only consider the penalty weights (and not the weighted lambda1)
if (lambda1.orig > 0) {
tmp <- c(tmp, unlist(lambda1[pen.cov %in% c("flasso", "gflasso", "ggflasso")]) / lambda1.orig)
}
# Add penalty weights in lambda2 to tmp, divide by lambda2.orig to only consider the penalty weights (and not the weighted lambda2)
if (lambda2.orig > 0) {
tmp <- c(tmp, unlist(lambda2[pen.cov %in% c("flasso", "gflasso", "ggflasso")]) / lambda2.orig)
}
......@@ -357,10 +359,12 @@
pen.weights <- Map("*", pen.weights, STAND.pen.weights)
tmp <- unlist(pen.weights)
# Add penalty weights in lambda1 to tmp, divide by lambda1.orig to only consider the penalty weights (and not the weighted lambda1)
if (lambda1.orig > 0) {
tmp <- c(tmp, unlist(lambda1[pen.cov %in% c("flasso", "gflasso", "ggflasso")]) / lambda1.orig)
}
# Add penalty weights in lambda2 to tmp, divide by lambda2.orig to only consider the penalty weights (and not the weighted lambda2)
if (lambda2.orig > 0) {
tmp <- c(tmp, unlist(lambda2[pen.cov %in% c("flasso", "gflasso", "ggflasso")]) / lambda2.orig)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment