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

Fixing depTableMaker ordering bug

Browse Source
This commit is contained in:
Roland Hollós 2019-02-08 14:12:47 +01:00
parent 6cdcb4d4d6
commit 6ef8f32a72
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
RBBGCMuso/R/musoRand.R
View File

@ -18,11 +18,13 @@ musoRand <- function(parameters, constrains = NULL, iterations=3000){
constMatrix <- constMatrix[,-1] constMatrix <- constMatrix[,-1]
depTableMaker <- function(constMatrix,parameters){ depTableMaker <- function(constMatrix,parameters){
parameters <- parameters[order(parameters[,1]),] ## parameters <- parameters[order(parameters[,1]),] ## BUG!!!
constMatrix[constMatrix[,"INDEX"] %in% parameters[,1],c(5,6)]<-parameters[,c(2,3)] selectedRows <- constMatrix[,"INDEX"] %in% parameters[,1]
rankList <- rank(constMatrix[selectedRows,2])
constMatrix[selectedRows,c(5,6)] <- parameters[rankList,c(2,3)]
logiConstrain <- (constMatrix[,"GROUP"] %in% constMatrix[constMatrix[,"INDEX"] %in% parameters[,1],"GROUP"] & logiConstrain <- (constMatrix[,"GROUP"] %in% constMatrix[constMatrix[,"INDEX"] %in% parameters[,1],"GROUP"] &
(constMatrix[,"GROUP"]!=0)) | ((constMatrix[,"INDEX"] %in% parameters[,1]) & (constMatrix[,"GROUP"] == 0)) (constMatrix[,"GROUP"]!=0)) | ((constMatrix[,"INDEX"] %in% parameters[,1]) & (constMatrix[,"GROUP"] == 0))
constMatrix<-constMatrix[logiConstrain,] constMatrix <- constMatrix[logiConstrain,]
constMatrix <- constMatrix[order(apply(constMatrix[,7:8],1,function(x){x[1]/10+abs(x[2])})),] constMatrix <- constMatrix[order(apply(constMatrix[,7:8],1,function(x){x[1]/10+abs(x[2])})),]
constMatrix constMatrix
} }