Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code refactoring: merge all into mftot and mf3 #24

Merged
merged 7 commits into from
Mar 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions R/kron_tmp.R

This file was deleted.

17 changes: 0 additions & 17 deletions R/m4.R

This file was deleted.

107 changes: 0 additions & 107 deletions R/mf.R

This file was deleted.

87 changes: 63 additions & 24 deletions R/mf3.R
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ mf3 <- function(model_switch,xt,x,a,bpop,d,sigma,docc,poped.db){
numnotfixed_sigma = sum(poped.db$parameters$notfixed_sigma)
numnotfixed_covsigma = sum(poped.db$parameters$notfixed_covsigma)

n_fixed_eff <- numnotfixed_bpop
n_rand_eff <- numnotfixed_d+numnotfixed_covd+numnotfixed_docc+numnotfixed_covdocc+numnotfixed_sigma+numnotfixed_covsigma

n=size(xt,1)
ret = 0

Expand All @@ -53,43 +56,79 @@ mf3 <- function(model_switch,xt,x,a,bpop,d,sigma,docc,poped.db){
poped.db$mean_data = mean_data
}

n_fixed_eff <- numnotfixed_bpop
n_rand_eff <- numnotfixed_d+numnotfixed_covd+numnotfixed_docc+numnotfixed_covdocc+numnotfixed_sigma+numnotfixed_covsigma
start_col <- 1

f1=zeros(n+n*n,n_fixed_eff+n_rand_eff)

if(n_fixed_eff!=0){
returnArgs <- m1(model_switch,xt,x,a,bpop,b_ind,bocc_ind,d,poped.db)
f1[1:n,start_col:(start_col+n_fixed_eff-1)] <- returnArgs[[1]]
returnArgs <- m1(model_switch,xt,x,a,bpop,b_ind,bocc_ind,d,poped.db)
m1_tmp <- returnArgs[[1]]
poped.db <- returnArgs[[2]]
start_col <- start_col + n_fixed_eff
}
if(n_rand_eff!=0){
returnArgs <- m3(model_switch,xt,x,a,bpop,b_ind,bocc_ind,d,sigma,docc,TRUE,poped.db)
f1[(n+1):(n+n*n),start_col:(start_col+n_rand_eff-1)] <- returnArgs[[1]]
bUseVarSigmaDerivative = poped.db$settings$iFIMCalculationType != 4
returnArgs <- m3(model_switch,xt,x,a,bpop,b_ind,bocc_ind,d,sigma,docc,bUseVarSigmaDerivative,poped.db)
m3_tmp <- returnArgs[[1]]
poped.db <- returnArgs[[2]]
}

f2=zeros(n+n*n,n+n*n)
if(n_fixed_eff!=0 & n_rand_eff!=0 & poped.db$settings$iFIMCalculationType %in% c(0,5,6)){
returnArgs <- m2(model_switch,xt,x,a,bpop,b_ind,bocc_ind,d,sigma,docc,poped.db)
m2_tmp <- returnArgs[[1]]
poped.db <- returnArgs[[2]]
} else {
m2_tmp <- 0
}

returnArgs <- v(model_switch,xt,x,a,bpop,b_ind,bocc_ind,d,sigma,docc,poped.db)
v_tmp <- returnArgs[[1]]
poped.db <- returnArgs[[2]]
if(any(v_tmp!=0)){#If there are some non-zero elements to v_tmp
v_tmp_inv = inv(v_tmp,pseudo_on_fail = T)
f2[1:n,1:n] = v_tmp_inv

if (!poped.db$settings$iFIMCalculationType %in% c(5,7)) {
f1=zeros(n+n*n,n_fixed_eff+n_rand_eff)
f1[1:n,1:n_fixed_eff] <- m1_tmp
f1[(n+1):(n+n*n),1:n_fixed_eff] <- m2_tmp
f1[(n+1):(n+n*n),(n_fixed_eff+1):(n_fixed_eff+n_rand_eff)] <- m3_tmp

#tmp_m4_inv=0.25*m4(v_tmp_inv,n)
tmp_m4_inv <- 1/2*kronecker(v_tmp_inv,v_tmp_inv)
f2[(n+1):(n+n*n),(n+1):(n+n*n)] = tmp_m4_inv
}
if((all(f2==0))){
ret = ret+t(f1)%*%f1
if(any(v_tmp!=0)){#If there are some non-zero elements to v_tmp
f2=zeros(n+n*n,n+n*n)

v_tmp_inv = inv(v_tmp,pseudo_on_fail = T)
f2[1:n,1:n] = v_tmp_inv

tmp_m4_inv <- 1/2*kronecker(v_tmp_inv,v_tmp_inv)
f2[(n + 1):(n + n*n), (n + 1):(n + n*n)] = tmp_m4_inv
ret = ret + t(f1) %*% f2 %*% f1
} else {
ret = ret + t(f1) %*% f1
}
} else {
ret = ret+t(f1)%*%f2%*%f1
v_tmp_inv = inv(v_tmp)
dim(m3_tmp) = c(n,n,n_rand_eff)

tmp_fim = zeros(n_fixed_eff + n_rand_eff, n_fixed_eff + n_rand_eff)
tmp_fim[1:n_fixed_eff,1:n_fixed_eff] = 2*t(m1_tmp) %*% v_tmp_inv %*% m1_tmp

if (is.matrix(m2_tmp)) {
dim(m2_tmp) = c(n,n,n_fixed_eff)
for (m in 1:n_fixed_eff) {
for (k in 1:n_fixed_eff) {
tmp_fim[m,k] = tmp_fim[m,k] + trace_matrix(m2_tmp[,,m]%*%v_tmp_inv%*%m2_tmp[,,k]%*%v_tmp_inv)
}
}
for(m in 1:n_rand_eff){
for(k in 1:n_fixed_eff){
num = trace_matrix(m3_tmp[,,m]%*%v_tmp_inv%*%m2_tmp[,,k]%*%v_tmp_inv)
tmp_fim[n_fixed_eff + m, k]=num
tmp_fim[k, n_fixed_eff + m]=num
}
}
}

for (m in 1:n_rand_eff) {
for (k in 1:n_rand_eff) {
tmp_fim[n_fixed_eff + m, n_fixed_eff + k] = trace_matrix(m3_tmp[,,m] %*% v_tmp_inv %*% m3_tmp[,,k] %*% v_tmp_inv)
}
}
ret = ret + 1/2*tmp_fim
}
}
ret = ret/poped.db$settings$iFOCENumInd

return(list( ret= ret,poped.db=poped.db))
return(list(ret = ret,poped.db = poped.db))
}
83 changes: 0 additions & 83 deletions R/mf5.R

This file was deleted.

Loading