diff --git a/RBBGCMuso/R/OtableMaker.R b/RBBGCMuso/R/OtableMaker.R index 5893a3d..9cde899 100644 --- a/RBBGCMuso/R/OtableMaker.R +++ b/RBBGCMuso/R/OtableMaker.R @@ -25,13 +25,17 @@ OtableMaker <- function(parametersReal){ OTFzero <- OTF[OTF$GROUP==0,] OT0 <- constMatrix [constMatrix$INDEX %in% zeroIndexes,] %>% mutate(MIN=OTFzero$MIN,MAX=OTFzero$MAX) - - sliced <- constMatrix %>% + if(nrow(OT0)!=nrow(OTF)){ + sliced <- constMatrix %>% 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")] + 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() + } else { + OTbig <- OT0 %>% data.frame() + } - OTbig <- rbind(OT0,sliced) %>% data.frame() parnumbers <- nrow(OTbig) for(i in 1:parnumbers){ diff --git a/RBBGCMuso/R/calibMuso.R b/RBBGCMuso/R/calibMuso.R index c284ff9..1c08443 100644 --- a/RBBGCMuso/R/calibMuso.R +++ b/RBBGCMuso/R/calibMuso.R @@ -57,7 +57,7 @@ calibMuso <- function(settings,parameters=NULL, timee="d", debugging=FALSE, logf if(silent!=TRUE){ if(length(grep("(dayout$)|(log$)",list.files(inputLoc)))>0){ - cat(" \n \n WARMING: there is a log or dayout file nearby the ini files, that may cause problemes. \n \n If you want to avoid that possible problemes, please copy the log or dayout files into a save place, and after do a cleanupMuso(), or delete these manually, or run the rungetMuso(), with the agressive=TRUE parameter \n \n") + warning("there is a log or dayout file nearby the ini files, that may cause problemes. \n \n If you want to avoid that possible problemes, please copy the log or dayout files into a save place, and after do a cleanupMuso(), or delete these manually, or run the rungetMuso(), with the agressive=TRUE parameter \n \n") } diff --git a/RBBGCMuso/src/RBBGCMuso.so b/RBBGCMuso/src/RBBGCMuso.so new file mode 100755 index 0000000..6b3b735 Binary files /dev/null and b/RBBGCMuso/src/RBBGCMuso.so differ diff --git a/RBBGCMuso/src/RcppExports.o b/RBBGCMuso/src/RcppExports.o new file mode 100644 index 0000000..cd3146d Binary files /dev/null and b/RBBGCMuso/src/RcppExports.o differ diff --git a/RBBGCMuso/src/musoRandomizer.o b/RBBGCMuso/src/musoRandomizer.o new file mode 100644 index 0000000..0e919db Binary files /dev/null and b/RBBGCMuso/src/musoRandomizer.o differ