diff --git a/07_final_assignment/.RData b/07_final_assignment/.RData index 5a21acb..8a10e06 100644 --- a/07_final_assignment/.RData +++ b/07_final_assignment/.RData Binary files differ diff --git a/07_final_assignment/baboonSimulation.R b/07_final_assignment/baboonSimulation.R index e716a07..c8ab5b7 100644 --- a/07_final_assignment/baboonSimulation.R +++ b/07_final_assignment/baboonSimulation.R @@ -39,9 +39,9 @@ RandomPick <- function(data, n) { if ( is.data.frame(data) ){ - data[sample(nrow(data), n, replace=T),] + data[sample(nrow(data), n, replace=TRUE),] } else { - data[sample(length(data), n, replace=T)] + data[sample(length(data), n, replace=TRUE)] } } @@ -174,7 +174,7 @@ expect_equal(length(stimuli$StimulusType[stimuli$StimulusType == "LearnedWord"]), 102) }) -# The original colSums fails if matrix filters to 1 row and gets implicit castet to a vector +# The original colSums fails if matrix filters to 1 row and gets implicit casted to a vector ColSums <- function(x) { if(is.matrix(x)){ return(colSums(x)) @@ -234,13 +234,24 @@ return(weights) } - list( + return(list( GetWeights=give_weights, Learner=learner, - Rate=rate - ) + Rate=rate)) } +################################################ +#TODO @David: Insert in right place. +#replace get.real.guess() by the Monkey's guess. + +#randomly pick a guess in 50% of the cases +monkeyGuess = get.real.guess() +if(isTRUE(all.equal(1,sample(1:2, 1)))) { + monkeyGuess = ifelse(isTRUE(all.equal(1,sample(1:2, 1))), "Word", "Nonword") +} +################################################ + + test_that("MakeMonkey",{ cueset <- c("a","b","c") @@ -273,7 +284,7 @@ trialNum <- round(trialCount) pres <- PresentTrials( trialNum, - monkey$Learner,data$dat) + monkey$Learner, data$dat) return(pres) } @@ -401,7 +412,7 @@ write.table(resultdat, file=filename, col.names=names(resultdat)) } - resultdat = resultdat[-1, ] #remove 1st row which is just always 0 + resultdat <- resultdat[-1, ] #remove 1st row which is just always 0 write.table(resultdat, file=filename, col.names=names(resultdat)) return(resultdat) }