urls

R/assertions.R

@@ -7,8 +7,7 @@
         return("RW1972")
       } else {
         if (!(given %in% supported_models())) {
-          stop("Model is not supported. Must be one returned by
-           supported_models()")
+          stop("Model is not supported. Must be one returned by supported_models()")
         }
         return(given)
       }
@@ -36,8 +35,7 @@
         return("optim")
       } else {
         if (!given %in% supported_optimizers()) {
-          stop("Optimizer is not supported. Must be one
-          returned by supported_optimizers()")
+          stop("Optimizer is not supported. Must be one returned by supported_optimizers()")
         } else {
           return(given)
         }
@@ -49,17 +47,15 @@
         return("identity")
       } else {
         if (!(given %in% supported_families())) {
-          stop("Family is not supported. Must be one
-          returned by supported_families()")
+          stop("Family is not supported. Must be one returned by supported_families()")
         } else {
           return(given)
         }
       }
     },
     "limits_OK" = {
       if (any(is.na(given$ll)) | any(is.na(given$ul))) {
-        stop("Did not supply limits for all parameters estimated.
-        Count your parameters. Please see ?fit_model")
+        stop("Did not supply limits for all parameters estimated. Count your parameters. Please see ?fit_model")
       }
     },
     "filepath_OK" = {
@@ -72,20 +68,17 @@
         length(given$unique_nominal_stimuli) >
           length(given$unique_functional_stimuli)
       ) {
-        stop("The model does not support functional/nominal
-          stimuli specifications.")
+        stop("The model does not support functional/nominal stimuli specifications.")
       }
     },
     "supported_plot" = {
       if (!(given %in% nargs$supported)) {
-        stop(sprintf("Plot not supported. The model does
-        not contain '%s' in model results.", given))
+        stop(sprintf("Plot not supported. The model does not contain '%s' in model results.", given))
       }
     },
     "good_experiment" = {
       if (length(given@design@mapping$unique_nominal_stimuli) == 1) {
-        stop("Experiment is too simple to run for one or more groups.
-        Please check your design.")
+        stop("Experiment is too simple to run for one or more groups. Please check your design.")
       }
     },
     "length" = {

README.md

@@ -4,7 +4,7 @@ Canonical Associative Learning Models and their Representations
 
 <!-- badges: start -->
 [![R-CMD-check](https://github.com/victor-navarro/calmr/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/victor-navarro/calmr/actions/workflows/R-CMD-check.yaml)
-[![codecov](https://codecov.io/gh/victor-navarro/calmr/graph/badge.svg?token=8VTS3MQX51)](https://codecov.io/gh/victor-navarro/calmr)
+[![codecov](https://app.codecov.io/gh/victor-navarro/calmr/graph/badge.svg?token=8VTS3MQX51)](https://app.codecov.io/gh/victor-navarro/calmr)
 <!-- badges: end -->
 
 ## Installing the latest stable version
@@ -24,7 +24,7 @@ install.packages("devtools")
 devtools::install_github("victor-navarro/calmr")
 ```
 
-If you managed to build the vignettes, there's a vignette showing the basics of the package. (Worry not, the package's [website](https://www.victornavarro.org/calmr) also has it).
+If you managed to build the vignettes, there's a vignette showing the basics of the package. (Worry not, the package's [website](https://victornavarro.org/calmr/) also has it).
 
 ```
 vignette("calmr_basics", package = "calmr")

cran-comments.md

@@ -1,18 +1,6 @@
 ## Comments
 
-### Third submission
-
->Thanks, we see:
-Found the following (possibly) invalid file URI:
-     URI: www.victornavarro.org/calmr
-       From: README.md
-Pls specify the URL completely and start with the protocol, e.g. https://...
-Please fix and resubmit.
-
-Fixed to include the protocol. Apologies for the inconvenience.
-
-
-### Second submission (calmr 0.6.0 -> 0.6.1)
+### Resubmission (calmr 0.6.0 -> 0.6.1)
 
 Thank you very much for the feedback and my apologies for the oversights. See my comments below.
 

inst/WORDLIST

@@ -3,6 +3,7 @@ ABAB
 ALC
 ANCCR
 Bugfix
+CMD
 CalmrDesign
 CalmrExperiment
 CalmrFit
@@ -42,6 +43,7 @@ asymptote
 attentional
 behaviour
 cardiff
+codecov
 colour
 comparator
 containign

vignettes/calmr_fits.Rmd

@@ -83,7 +83,7 @@ we simply address this issue by running several iterations of the experiment
 (with random trial orders) and averaging all experiments before evaluating the 
 likelihood of the parameters.
 
-So what do we have to design? The experiment presented by Patittuci 
+So what do we have to design? The experiment presented by Patitucci 
 et al. (2016) was fairly simple, and it can be reduced to the 
 presentations of two levers, each followed by a different appetitive 
 outcome. Here, we will assume that the two outcomes are independent