hollorol/RBBGCMuso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the bug for randType 2

Browse Source
This commit is contained in:
Roland Hollós 2019-01-24 21:19:29 +01:00
parent fdb0a32480
commit 78781c3103
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
RBBGCMuso/R/musoRand.R
View File

@ -55,13 +55,17 @@ musoRand <- function(parameters, constrains = NULL, iterations=3000){
G<-G[dep[,4]!=0,] G<-G[dep[,4]!=0,]
if(is.null(nrow(G))){
G<-t(as.matrix(G))
}
numRowsInG <- nrow(G)
if(Range[1]==1){ if(Range[1]==1){
G<-cbind(G,matrix(ncol=(N-Range[2]),nrow=nrow(G),data=0)) G<-cbind(G,matrix(ncol=(N-Range[2]),nrow=numRowsInG,data=0))
} else{ } else{
if(Range[2]==N){ if(Range[2]==N){
G<-cbind(matrix(ncol=(Range[1]-1),nrow=nrow(G),data=0),G) G<-cbind(matrix(ncol=(Range[1]-1),nrow=numRowsInG,data=0),G)
} else { } else {
G <- cbind(matrix(ncol=(Range[1]-1),nrow=nrow(G),data=0),G,matrix(ncol=(N-Range[2]),nrow=nrow(G),data=0)) G <- cbind(matrix(ncol=(Range[1]-1),nrow=numRowsInG,data=0),G,matrix(ncol=(N-Range[2]),nrow=numRowsInG,data=0))
} }
} }
return(list(G=G,h=rep(0,nrow(G)))) return(list(G=G,h=rep(0,nrow(G))))
@ -86,6 +90,10 @@ musoRand <- function(parameters, constrains = NULL, iterations=3000){
G <- t(matrix(sign(dep[2,4])*G)) G <- t(matrix(sign(dep[2,4])*G))
h <- abs(dep[1,4]) h <- abs(dep[1,4])
if(dep[1,"TYPE"]==2){
G <- G*(-1)
h <- h*(-1)
}
return(list(G=G,h=h)) return(list(G=G,h=h))
} }