corrections

.Rbuildignore

@@ -5,3 +5,8 @@ usefulltools.R
 ^\.Rproj\.user$
 LICENSE
 README.rmd
+paper.bib
+paper.md
+softbib.Rmd
+softbib.bib
+softbib.tex

R/fitConf.R

@@ -197,12 +197,12 @@
 #'
 #' @export
 fitConf <- function(data, model = "SDT",
-                    diffCond = NULL, stimulus = NULL, correct = NULL, rating = NULL,
+                  #  diffCond = NULL, stimulus = NULL, correct = NULL, rating = NULL,
                     nInits = 5, nRestart = 4) {
-  if (!is.null(diffCond)) data$diffCond <- data[,diffCond]
-  if (!is.null(stimulus)) data$stimulus <- data[,stimulus]
-  if (!is.null(correct)) data$correct <- data[,correct]
-  if (!is.null(rating)) data$rating <- data[,rating]
+  # if (!is.null(diffCond)) data$diffCond <- data[,diffCond]
+  # if (!is.null(stimulus)) data$stimulus <- data[,stimulus]
+  # if (!is.null(correct)) data$correct <- data[,correct]
+  # if (!is.null(rating)) data$rating <- data[,rating]
   if (is.null(data$diffCond)) data$diffCond <- 1
   if (!is.factor(data$diffCond)) {
     data$diffCond <- factor(data$diffCond)

R/fitConfModels.R

@@ -211,7 +211,7 @@
 
 #' @export
 fitConfModels <- function(data, models="all",
-                          diffCond = NULL, stimulus = NULL, correct = NULL, rating = NULL,
+                         # diffCond = NULL, stimulus = NULL, correct = NULL, rating = NULL,
                           nInits = 5, nRestart = 4,
                           .parallel=FALSE, n.cores=NULL) {
   AllModels <- c('WEV', 'SDT','IG','ITGc',
@@ -224,10 +224,10 @@ fitConfModels <- function(data, models="all",
     warning("Duplicate models are dropped")
     models <- unique(models)
   }
-  if (!is.null(diffCond)) data$diffCond <- data[,diffCond]
-  if (!is.null(stimulus)) data$stimulus <- data[,stimulus]
-  if (!is.null(correct)) data$correct <- data[,correct]
-  if (!is.null(rating)) data$rating <- data[,rating]
+  # if (!is.null(diffCond)) data$diffCond <- data[,diffCond]
+  # if (!is.null(stimulus)) data$stimulus <- data[,stimulus]
+  # if (!is.null(correct)) data$correct <- data[,correct]
+  # if (!is.null(rating)) data$rating <- data[,rating]
   if (is.null(data$diffCond)) data$diffCond <- factor(1)
   if (!is.factor(data$diffCond)) {
     data$diffCond <- factor(data$diffCond)

R/simulateConf.R

@@ -35,7 +35,7 @@
 #' # 1. define some parameters
 #' paramDf <- data.frame(d_1 = 0, d_2 = 2, d_3 = 4,c = .0,
 #' theta_minus.2 = -2, theta_minus.1 = -1, theta_plus.1 = 1, theta_plus.2 = 2,
-#' sigma = 1/2, w = 0.5, nTrials = 500)
+#' sigma = 1/2, w = 0.5, N = 500)
 #' # 2. Simulate dataset
 #' SimulatedData <- simConf(model = "WEV", paramDf)
 #'