Skip to content

Commit

Permalink
bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
gtesei committed Oct 30, 2015
1 parent 2df7650 commit 59db003
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions R-package/R/fastRegression.R
Original file line number Diff line number Diff line change
Expand Up @@ -337,16 +337,16 @@ ff.trainAndPredict.reg = function(Ytrain ,
Xtest = fs$Xtest

if (model.label == "lm") { ### LinearReg
model <- caret::train(y = Ytrain, x = Xtrain , method = "lm", trControl = controlObject)
model <- caret::train(y = Ytrain, x = Xtrain , method = "lm", trControl = controlObject, ...)
pred = as.numeric( predict(model , Xtest ) )
} else if (model.label == "bayesglm") { ### bayesglm
model <- caret::train(y = Ytrain, x = Xtrain , method = "bayesglm", trControl = controlObject)
model <- caret::train(y = Ytrain, x = Xtrain , method = "bayesglm", trControl = controlObject, ...)
pred = as.numeric( predict(model , Xtest ) )
} else if (model.label == "glm") { ### glm
model <- caret::train(y = Ytrain, x = Xtrain , method = "glm", trControl = controlObject)
model <- caret::train(y = Ytrain, x = Xtrain , method = "glm", trControl = controlObject, ...)
pred = as.numeric( predict(model , Xtest ) )
} else if (model.label == "glmStepAIC") { ### glmStepAIC
model <- caret::train(y = Ytrain, x = Xtrain , method = "glmStepAIC", trControl = controlObject)
model <- caret::train(y = Ytrain, x = Xtrain , method = "glmStepAIC", trControl = controlObject, ...)
pred = as.numeric( predict(model , Xtest ) )
} else if (model.label == "rlm") { ### RobustLinearReg
model <- caret::train(y = Ytrain, x = Xtrain , method = "rlm", preProcess="pca", trControl = controlObject, ... )
Expand Down
Binary file modified fastfurious-manual.pdf
Binary file not shown.

0 comments on commit 59db003

Please sign in to comment.