From a903bd2f8b93a3aca5f6e3871c813e966ee30cc9 Mon Sep 17 00:00:00 2001
From: hollorol <hollorol@gmail.com>
Date: Sat, 5 May 2018 08:15:18 +0200
Subject: [PATCH] fix the oTableMaker bug

---
 RBBGCMuso/R/OtableMaker.R   | 10 +++++++---
 RBBGCMuso/R/outputMapping.R |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/RBBGCMuso/R/OtableMaker.R b/RBBGCMuso/R/OtableMaker.R
index dd74ed0..5893a3d 100644
--- a/RBBGCMuso/R/OtableMaker.R
+++ b/RBBGCMuso/R/OtableMaker.R
@@ -27,7 +27,10 @@ OtableMaker <- function(parametersReal){
     mutate(MIN=OTFzero$MIN,MAX=OTFzero$MAX)
 
   sliced <- constMatrix %>%
-    dplyr::filter(GROUP %in% groupIDs)
+      dplyr::filter(GROUP %in% groupIDs)
+  slicedIndexes<- which(sliced[,"INDEX"] %in% intersect(sliced[,"INDEX"],otfIndexes))
+  sliced[slicedIndexes,c("MIN","MAX")] <- OTF[which(OTF["GROUP"] == groupIDs),c("MIN","MAX")]
+  
   OTbig <- rbind(OT0,sliced) %>% data.frame()
   parnumbers <- nrow(OTbig)
 
@@ -36,7 +39,7 @@ OtableMaker <- function(parametersReal){
       OTbig[i,3] <- OTF[OTF$INDEX==OTbig[i,1],2]
       OTbig[i,4] <- OTF[OTF$INDEX==OTbig[i,1],3]
       if(OTbig$Type[i]==2){
-        OTbig$DEPENDENCE[i] <-2
+        OTbig$DEPENDENCE[i] <- 2
       }
     }
   }
@@ -47,4 +50,5 @@ OtableMaker <- function(parametersReal){
     select(nGroup,TYPE)
   return(list(Otable=OTbig,driver=summaries))
 
-}
\ No newline at end of file
+}
+
diff --git a/RBBGCMuso/R/outputMapping.R b/RBBGCMuso/R/outputMapping.R
index 5189f8b..45fc578 100644
--- a/RBBGCMuso/R/outputMapping.R
+++ b/RBBGCMuso/R/outputMapping.R
@@ -44,3 +44,4 @@ musoMappingFind <- function(variable=NULL){
                             mMapping[grep(variable,mMapping[,2]),]
                     }
 }
+