From 6ef8f32a729614806bf20f7b1d1d7898702e268c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Holl=C3=B3s?= Date: Fri, 8 Feb 2019 14:12:47 +0100 Subject: [PATCH] Fixing depTableMaker ordering bug --- RBBGCMuso/R/musoRand.R | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/RBBGCMuso/R/musoRand.R b/RBBGCMuso/R/musoRand.R index ea38e40..477bd17 100644 --- a/RBBGCMuso/R/musoRand.R +++ b/RBBGCMuso/R/musoRand.R @@ -18,11 +18,13 @@ musoRand <- function(parameters, constrains = NULL, iterations=3000){ constMatrix <- constMatrix[,-1] depTableMaker <- function(constMatrix,parameters){ - parameters <- parameters[order(parameters[,1]),] - constMatrix[constMatrix[,"INDEX"] %in% parameters[,1],c(5,6)]<-parameters[,c(2,3)] + ## parameters <- parameters[order(parameters[,1]),] ## BUG!!! + 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"] & (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 }