From 6d8e85713be3394849712a2d591e02e20385dc42 Mon Sep 17 00:00:00 2001
From: wbonat <wbonat@gmail.com>
Date: Fri, 2 Oct 2015 14:52:08 +0200
Subject: [PATCH] Modify output to be compatible with mc_fast_forward
---
R/mc_main_function.R | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/R/mc_main_function.R b/R/mc_main_function.R
index eda852c..a3e4232 100644
--- a/R/mc_main_function.R
+++ b/R/mc_main_function.R
@@ -62,11 +62,19 @@ mcglm <- function(linear_pred, matrix_pred, link, variance, covariance, offset,
Ntrial <- as.list(Ntrial)
power_fixed = as.list(power_fixed)
if (class(control_initial) != "list") {
- control_initial <- mc_initial_values(linear_pred = linear_pred, matrix_pred = matrix_pred, link = link, variance = variance,
- covariance = covariance, offset = offset, Ntrial = Ntrial, contrasts = contrasts, data = data)
- cat("Automatic initial values selected.")
+ control_initial <- mc_initial_values(linear_pred = linear_pred,
+ matrix_pred = matrix_pred,
+ link = link,
+ variance = variance,
+ covariance = covariance,
+ offset = offset,
+ Ntrial = Ntrial,
+ contrasts = contrasts,
+ data = data)
+ cat("Automatic initial values selected.", "\n")
}
- con <- list(correct = TRUE, max_iter = 20, tol = 1e-04, method = "chaser", tunning = 1, verbose = FALSE)
+ con <- list(correct = TRUE, max_iter = 20, tol = 1e-04,
+ method = "chaser", tunning = 1, verbose = FALSE)
con[(namc <- names(control_algorithm))] <- control_algorithm
if (!is.null(contrasts)) {
list_X <- list()
@@ -101,6 +109,11 @@ mcglm <- function(linear_pred, matrix_pred, link, variance, covariance, offset,
model_fit$con <- con
model_fit$observed <- Matrix(y_vec, ncol = length(list_Y), nrow = dim(data)[1])
model_fit$list_X <- list_X
+ model_fit$matrix_pred <- matrix_pred
+ model_fit$Ntrial <- Ntrial
+ model_fit$offset <- offset
+ model_fit$power_fixed
+ model_fit$sparse <- sparse
class(model_fit) <- "mcglm"
}
return(model_fit)
--
GitLab