some minor changes
This commit is contained in:
parent
928ec504d6
commit
be19c716c4
@ -25,13 +25,17 @@ OtableMaker <- function(parametersReal){
|
|||||||
OTFzero <- OTF[OTF$GROUP==0,]
|
OTFzero <- OTF[OTF$GROUP==0,]
|
||||||
OT0 <- constMatrix [constMatrix$INDEX %in% zeroIndexes,] %>%
|
OT0 <- constMatrix [constMatrix$INDEX %in% zeroIndexes,] %>%
|
||||||
mutate(MIN=OTFzero$MIN,MAX=OTFzero$MAX)
|
mutate(MIN=OTFzero$MIN,MAX=OTFzero$MAX)
|
||||||
|
if(nrow(OT0)!=nrow(OTF)){
|
||||||
sliced <- constMatrix %>%
|
sliced <- constMatrix %>%
|
||||||
dplyr::filter(GROUP %in% groupIDs)
|
dplyr::filter(GROUP %in% groupIDs)
|
||||||
slicedIndexes<- which(sliced[,"INDEX"] %in% intersect(sliced[,"INDEX"],otfIndexes))
|
slicedIndexes<- which(sliced[,"INDEX"] %in% intersect(sliced[,"INDEX"],otfIndexes))
|
||||||
sliced[slicedIndexes,c("MIN","MAX")] <- OTF[which(OTF["GROUP"] == groupIDs),c("MIN","MAX")]
|
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)
|
parnumbers <- nrow(OTbig)
|
||||||
|
|
||||||
for(i in 1:parnumbers){
|
for(i in 1:parnumbers){
|
||||||
|
|||||||
@ -57,7 +57,7 @@ calibMuso <- function(settings,parameters=NULL, timee="d", debugging=FALSE, logf
|
|||||||
|
|
||||||
if(silent!=TRUE){
|
if(silent!=TRUE){
|
||||||
if(length(grep("(dayout$)|(log$)",list.files(inputLoc)))>0){
|
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")
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
BIN
RBBGCMuso/src/RBBGCMuso.so
Executable file
BIN
RBBGCMuso/src/RBBGCMuso.so
Executable file
Binary file not shown.
BIN
RBBGCMuso/src/RcppExports.o
Normal file
BIN
RBBGCMuso/src/RcppExports.o
Normal file
Binary file not shown.
BIN
RBBGCMuso/src/musoRandomizer.o
Normal file
BIN
RBBGCMuso/src/musoRandomizer.o
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user