diff --git a/DESCRIPTION b/DESCRIPTION index d1af404..b45e8fb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -4,7 +4,7 @@ Description: Use the R console as an interactive learning environment. Users receive immediate feedback as they are guided through self-paced lessons in data science and R programming. URL: http://swirlstats.com -Version: 2.4.4 +Version: 2.4.5 License: MIT + file LICENSE Authors@R: c( person("Sean", "Kross", email = "sean@seankross.com", role = c("aut", "cre")), @@ -29,5 +29,4 @@ Suggests: stringi Encoding: UTF-8 LazyData: true -Roxygen: list(wrap = FALSE) -RoxygenNote: 6.1.1 +RoxygenNote: 7.0.2 diff --git a/NEWS.md b/NEWS.md index ef3c51d..6e53078 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +# swirl 2.4.5 + +* Thank you @HenrikBengtsson for fixing a warning when +`warnPartialMatchArgs=TRUE`. (#779) + # swirl 2.4.4 * Fixed encoding test which was failing on CRAN (debian-clang-devel). diff --git a/R/menu.R b/R/menu.R index 7c4a8e4..6acf560 100644 --- a/R/menu.R +++ b/R/menu.R @@ -186,7 +186,7 @@ mainMenu.default <- function(e){ if(!is(e,"datacamp")) { e$pbar <- txtProgressBar(style=3) } - e$pbar_seq <- seq(0, 1, length=nrow(e$les)) + e$pbar_seq <- seq(0, 1, length.out=nrow(e$les)) # expr, val, ok, and vis should have been set by the callback. # The lesson's current row - could start after 1 if in 'test' mode diff --git a/cran-comments.md b/cran-comments.md index d9f8e06..3d49ce1 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,11 +1,11 @@ ## Release summary -This is the first attempted CRAN release of swirl 2.4.4. +This is the first attempted CRAN release of swirl 2.4.5. ## Test environments -* local macOS Sierra install, R 3.6.0 -* Ubuntu 14.04 (on travis-ci), R 3.6.0, R 3.5.3, R-devel. +* local macOS Sierra install, R 3.6.1 +* Ubuntu 16.04 (on travis-ci), R 3.6.1, R 3.5.3, R-devel. * win-builder (release) ## R CMD check results diff --git a/man/AnswerTests.Rd b/man/AnswerTests.Rd index eda77f4..8cb0d06 100644 --- a/man/AnswerTests.Rd +++ b/man/AnswerTests.Rd @@ -123,13 +123,17 @@ basic rules: } \seealso{ -Other AnswerTests: \code{\link{any_of_exprs}}, - \code{\link{calculates_same_value}}, - \code{\link{expr_creates_var}}, - \code{\link{expr_identical_to}}, \code{\link{expr_is_a}}, - \code{\link{expr_uses_func}}, - \code{\link{func_of_newvar_equals}}, - \code{\link{omnitest}}, \code{\link{val_has_length}}, - \code{\link{val_matches}}, \code{\link{var_is_a}} +Other AnswerTests: +\code{\link{any_of_exprs}()}, +\code{\link{calculates_same_value}()}, +\code{\link{expr_creates_var}()}, +\code{\link{expr_identical_to}()}, +\code{\link{expr_is_a}()}, +\code{\link{expr_uses_func}()}, +\code{\link{func_of_newvar_equals}()}, +\code{\link{omnitest}()}, +\code{\link{val_has_length}()}, +\code{\link{val_matches}()}, +\code{\link{var_is_a}()} } \concept{AnswerTests} diff --git a/man/InstallCourses.Rd b/man/InstallCourses.Rd index e590df9..417c2ac 100644 --- a/man/InstallCourses.Rd +++ b/man/InstallCourses.Rd @@ -23,15 +23,17 @@ Uninstall all courses with \code{\link{uninstall_all_courses}}. } \seealso{ -Other InstallCourses: \code{\link{install_course_directory}}, - \code{\link{install_course_dropbox}}, - \code{\link{install_course_github}}, - \code{\link{install_course_google_drive}}, - \code{\link{install_course_url}}, - \code{\link{install_course_zip}}, - \code{\link{install_course}}, - \code{\link{install_from_swirl}}, - \code{\link{uninstall_all_courses}}, - \code{\link{uninstall_course}}, \code{\link{zip_course}} +Other InstallCourses: +\code{\link{install_course_directory}()}, +\code{\link{install_course_dropbox}()}, +\code{\link{install_course_github}()}, +\code{\link{install_course_google_drive}()}, +\code{\link{install_course_url}()}, +\code{\link{install_course_zip}()}, +\code{\link{install_course}()}, +\code{\link{install_from_swirl}()}, +\code{\link{uninstall_all_courses}()}, +\code{\link{uninstall_course}()}, +\code{\link{zip_course}()} } \concept{InstallCourses} diff --git a/man/any_of_exprs.Rd b/man/any_of_exprs.Rd index d578eac..ce9efc8 100644 --- a/man/any_of_exprs.Rd +++ b/man/any_of_exprs.Rd @@ -25,13 +25,17 @@ any_of_exprs('cor(x, y)', 'cor(y, x)') } } \seealso{ -Other AnswerTests: \code{\link{AnswerTests}}, - \code{\link{calculates_same_value}}, - \code{\link{expr_creates_var}}, - \code{\link{expr_identical_to}}, \code{\link{expr_is_a}}, - \code{\link{expr_uses_func}}, - \code{\link{func_of_newvar_equals}}, - \code{\link{omnitest}}, \code{\link{val_has_length}}, - \code{\link{val_matches}}, \code{\link{var_is_a}} +Other AnswerTests: +\code{\link{AnswerTests}}, +\code{\link{calculates_same_value}()}, +\code{\link{expr_creates_var}()}, +\code{\link{expr_identical_to}()}, +\code{\link{expr_is_a}()}, +\code{\link{expr_uses_func}()}, +\code{\link{func_of_newvar_equals}()}, +\code{\link{omnitest}()}, +\code{\link{val_has_length}()}, +\code{\link{val_matches}()}, +\code{\link{var_is_a}()} } \concept{AnswerTests} diff --git a/man/calculates_same_value.Rd b/man/calculates_same_value.Rd index 36a5ba7..07660ba 100644 --- a/man/calculates_same_value.Rd +++ b/man/calculates_same_value.Rd @@ -25,13 +25,17 @@ value calculated by the given expression. } } \seealso{ -Other AnswerTests: \code{\link{AnswerTests}}, - \code{\link{any_of_exprs}}, - \code{\link{expr_creates_var}}, - \code{\link{expr_identical_to}}, \code{\link{expr_is_a}}, - \code{\link{expr_uses_func}}, - \code{\link{func_of_newvar_equals}}, - \code{\link{omnitest}}, \code{\link{val_has_length}}, - \code{\link{val_matches}}, \code{\link{var_is_a}} +Other AnswerTests: +\code{\link{AnswerTests}}, +\code{\link{any_of_exprs}()}, +\code{\link{expr_creates_var}()}, +\code{\link{expr_identical_to}()}, +\code{\link{expr_is_a}()}, +\code{\link{expr_uses_func}()}, +\code{\link{func_of_newvar_equals}()}, +\code{\link{omnitest}()}, +\code{\link{val_has_length}()}, +\code{\link{val_matches}()}, +\code{\link{var_is_a}()} } \concept{AnswerTests} diff --git a/man/expr_creates_var.Rd b/man/expr_creates_var.Rd index 20380f8..bc94971 100644 --- a/man/expr_creates_var.Rd +++ b/man/expr_creates_var.Rd @@ -29,13 +29,17 @@ expr_creates_var('myNum') } } \seealso{ -Other AnswerTests: \code{\link{AnswerTests}}, - \code{\link{any_of_exprs}}, - \code{\link{calculates_same_value}}, - \code{\link{expr_identical_to}}, \code{\link{expr_is_a}}, - \code{\link{expr_uses_func}}, - \code{\link{func_of_newvar_equals}}, - \code{\link{omnitest}}, \code{\link{val_has_length}}, - \code{\link{val_matches}}, \code{\link{var_is_a}} +Other AnswerTests: +\code{\link{AnswerTests}}, +\code{\link{any_of_exprs}()}, +\code{\link{calculates_same_value}()}, +\code{\link{expr_identical_to}()}, +\code{\link{expr_is_a}()}, +\code{\link{expr_uses_func}()}, +\code{\link{func_of_newvar_equals}()}, +\code{\link{omnitest}()}, +\code{\link{val_has_length}()}, +\code{\link{val_matches}()}, +\code{\link{var_is_a}()} } \concept{AnswerTests} diff --git a/man/expr_identical_to.Rd b/man/expr_identical_to.Rd index d3557f2..b8c9498 100644 --- a/man/expr_identical_to.Rd +++ b/man/expr_identical_to.Rd @@ -24,13 +24,17 @@ given as the first argument. } } \seealso{ -Other AnswerTests: \code{\link{AnswerTests}}, - \code{\link{any_of_exprs}}, - \code{\link{calculates_same_value}}, - \code{\link{expr_creates_var}}, \code{\link{expr_is_a}}, - \code{\link{expr_uses_func}}, - \code{\link{func_of_newvar_equals}}, - \code{\link{omnitest}}, \code{\link{val_has_length}}, - \code{\link{val_matches}}, \code{\link{var_is_a}} +Other AnswerTests: +\code{\link{AnswerTests}}, +\code{\link{any_of_exprs}()}, +\code{\link{calculates_same_value}()}, +\code{\link{expr_creates_var}()}, +\code{\link{expr_is_a}()}, +\code{\link{expr_uses_func}()}, +\code{\link{func_of_newvar_equals}()}, +\code{\link{omnitest}()}, +\code{\link{val_has_length}()}, +\code{\link{val_matches}()}, +\code{\link{var_is_a}()} } \concept{AnswerTests} diff --git a/man/expr_is_a.Rd b/man/expr_is_a.Rd index 99263ea..f0a75bb 100644 --- a/man/expr_is_a.Rd +++ b/man/expr_is_a.Rd @@ -23,14 +23,17 @@ expr_is_a('<-') } } \seealso{ -Other AnswerTests: \code{\link{AnswerTests}}, - \code{\link{any_of_exprs}}, - \code{\link{calculates_same_value}}, - \code{\link{expr_creates_var}}, - \code{\link{expr_identical_to}}, - \code{\link{expr_uses_func}}, - \code{\link{func_of_newvar_equals}}, - \code{\link{omnitest}}, \code{\link{val_has_length}}, - \code{\link{val_matches}}, \code{\link{var_is_a}} +Other AnswerTests: +\code{\link{AnswerTests}}, +\code{\link{any_of_exprs}()}, +\code{\link{calculates_same_value}()}, +\code{\link{expr_creates_var}()}, +\code{\link{expr_identical_to}()}, +\code{\link{expr_uses_func}()}, +\code{\link{func_of_newvar_equals}()}, +\code{\link{omnitest}()}, +\code{\link{val_has_length}()}, +\code{\link{val_matches}()}, +\code{\link{var_is_a}()} } \concept{AnswerTests} diff --git a/man/expr_uses_func.Rd b/man/expr_uses_func.Rd index e772faa..ed3a7aa 100644 --- a/man/expr_uses_func.Rd +++ b/man/expr_uses_func.Rd @@ -24,13 +24,17 @@ expr_uses_func('sd') } } \seealso{ -Other AnswerTests: \code{\link{AnswerTests}}, - \code{\link{any_of_exprs}}, - \code{\link{calculates_same_value}}, - \code{\link{expr_creates_var}}, - \code{\link{expr_identical_to}}, \code{\link{expr_is_a}}, - \code{\link{func_of_newvar_equals}}, - \code{\link{omnitest}}, \code{\link{val_has_length}}, - \code{\link{val_matches}}, \code{\link{var_is_a}} +Other AnswerTests: +\code{\link{AnswerTests}}, +\code{\link{any_of_exprs}()}, +\code{\link{calculates_same_value}()}, +\code{\link{expr_creates_var}()}, +\code{\link{expr_identical_to}()}, +\code{\link{expr_is_a}()}, +\code{\link{func_of_newvar_equals}()}, +\code{\link{omnitest}()}, +\code{\link{val_has_length}()}, +\code{\link{val_matches}()}, +\code{\link{var_is_a}()} } \concept{AnswerTests} diff --git a/man/func_of_newvar_equals.Rd b/man/func_of_newvar_equals.Rd index ba4b23c..a4a96ed 100644 --- a/man/func_of_newvar_equals.Rd +++ b/man/func_of_newvar_equals.Rd @@ -27,13 +27,17 @@ func_of_newvar_equals('mean(newVar)') } } \seealso{ -Other AnswerTests: \code{\link{AnswerTests}}, - \code{\link{any_of_exprs}}, - \code{\link{calculates_same_value}}, - \code{\link{expr_creates_var}}, - \code{\link{expr_identical_to}}, \code{\link{expr_is_a}}, - \code{\link{expr_uses_func}}, \code{\link{omnitest}}, - \code{\link{val_has_length}}, \code{\link{val_matches}}, - \code{\link{var_is_a}} +Other AnswerTests: +\code{\link{AnswerTests}}, +\code{\link{any_of_exprs}()}, +\code{\link{calculates_same_value}()}, +\code{\link{expr_creates_var}()}, +\code{\link{expr_identical_to}()}, +\code{\link{expr_is_a}()}, +\code{\link{expr_uses_func}()}, +\code{\link{omnitest}()}, +\code{\link{val_has_length}()}, +\code{\link{val_matches}()}, +\code{\link{var_is_a}()} } \concept{AnswerTests} diff --git a/man/install_course.Rd b/man/install_course.Rd index 4045a26..a3a2c31 100644 --- a/man/install_course.Rd +++ b/man/install_course.Rd @@ -41,15 +41,17 @@ install_course(swc_path = file.path("~", "Downloads", "R_Programming.swc")) } } \seealso{ -Other InstallCourses: \code{\link{InstallCourses}}, - \code{\link{install_course_directory}}, - \code{\link{install_course_dropbox}}, - \code{\link{install_course_github}}, - \code{\link{install_course_google_drive}}, - \code{\link{install_course_url}}, - \code{\link{install_course_zip}}, - \code{\link{install_from_swirl}}, - \code{\link{uninstall_all_courses}}, - \code{\link{uninstall_course}}, \code{\link{zip_course}} +Other InstallCourses: +\code{\link{InstallCourses}}, +\code{\link{install_course_directory}()}, +\code{\link{install_course_dropbox}()}, +\code{\link{install_course_github}()}, +\code{\link{install_course_google_drive}()}, +\code{\link{install_course_url}()}, +\code{\link{install_course_zip}()}, +\code{\link{install_from_swirl}()}, +\code{\link{uninstall_all_courses}()}, +\code{\link{uninstall_course}()}, +\code{\link{zip_course}()} } \concept{InstallCourses} diff --git a/man/install_course_directory.Rd b/man/install_course_directory.Rd index 0bffd41..8fa8333 100644 --- a/man/install_course_directory.Rd +++ b/man/install_course_directory.Rd @@ -19,15 +19,17 @@ install_course_directory("~/Desktop/my_course") } } \seealso{ -Other InstallCourses: \code{\link{InstallCourses}}, - \code{\link{install_course_dropbox}}, - \code{\link{install_course_github}}, - \code{\link{install_course_google_drive}}, - \code{\link{install_course_url}}, - \code{\link{install_course_zip}}, - \code{\link{install_course}}, - \code{\link{install_from_swirl}}, - \code{\link{uninstall_all_courses}}, - \code{\link{uninstall_course}}, \code{\link{zip_course}} +Other InstallCourses: +\code{\link{InstallCourses}}, +\code{\link{install_course_dropbox}()}, +\code{\link{install_course_github}()}, +\code{\link{install_course_google_drive}()}, +\code{\link{install_course_url}()}, +\code{\link{install_course_zip}()}, +\code{\link{install_course}()}, +\code{\link{install_from_swirl}()}, +\code{\link{uninstall_all_courses}()}, +\code{\link{uninstall_course}()}, +\code{\link{zip_course}()} } \concept{InstallCourses} diff --git a/man/install_course_dropbox.Rd b/man/install_course_dropbox.Rd index 1f09301..05a5927 100644 --- a/man/install_course_dropbox.Rd +++ b/man/install_course_dropbox.Rd @@ -21,15 +21,17 @@ install_course_dropbox("https://www.dropbox.com/s/xttkmuvu7hh72vu/my_course.zip" } } \seealso{ -Other InstallCourses: \code{\link{InstallCourses}}, - \code{\link{install_course_directory}}, - \code{\link{install_course_github}}, - \code{\link{install_course_google_drive}}, - \code{\link{install_course_url}}, - \code{\link{install_course_zip}}, - \code{\link{install_course}}, - \code{\link{install_from_swirl}}, - \code{\link{uninstall_all_courses}}, - \code{\link{uninstall_course}}, \code{\link{zip_course}} +Other InstallCourses: +\code{\link{InstallCourses}}, +\code{\link{install_course_directory}()}, +\code{\link{install_course_github}()}, +\code{\link{install_course_google_drive}()}, +\code{\link{install_course_url}()}, +\code{\link{install_course_zip}()}, +\code{\link{install_course}()}, +\code{\link{install_from_swirl}()}, +\code{\link{uninstall_all_courses}()}, +\code{\link{uninstall_course}()}, +\code{\link{zip_course}()} } \concept{InstallCourses} diff --git a/man/install_course_github.Rd b/man/install_course_github.Rd index bd0b84a..b8b904d 100644 --- a/man/install_course_github.Rd +++ b/man/install_course_github.Rd @@ -4,8 +4,12 @@ \alias{install_course_github} \title{Install a course from a GitHub repository} \usage{ -install_course_github(github_username, course_name, branch = "master", - multi = FALSE) +install_course_github( + github_username, + course_name, + branch = "master", + multi = FALSE +) } \arguments{ \item{github_username}{The username that owns the course repository.} @@ -27,15 +31,17 @@ install_course_github("jtleek", "Twitter_Map", "geojson") } } \seealso{ -Other InstallCourses: \code{\link{InstallCourses}}, - \code{\link{install_course_directory}}, - \code{\link{install_course_dropbox}}, - \code{\link{install_course_google_drive}}, - \code{\link{install_course_url}}, - \code{\link{install_course_zip}}, - \code{\link{install_course}}, - \code{\link{install_from_swirl}}, - \code{\link{uninstall_all_courses}}, - \code{\link{uninstall_course}}, \code{\link{zip_course}} +Other InstallCourses: +\code{\link{InstallCourses}}, +\code{\link{install_course_directory}()}, +\code{\link{install_course_dropbox}()}, +\code{\link{install_course_google_drive}()}, +\code{\link{install_course_url}()}, +\code{\link{install_course_zip}()}, +\code{\link{install_course}()}, +\code{\link{install_from_swirl}()}, +\code{\link{uninstall_all_courses}()}, +\code{\link{uninstall_course}()}, +\code{\link{zip_course}()} } \concept{InstallCourses} diff --git a/man/install_course_google_drive.Rd b/man/install_course_google_drive.Rd index 301d568..de8ed00 100644 --- a/man/install_course_google_drive.Rd +++ b/man/install_course_google_drive.Rd @@ -21,15 +21,17 @@ install_course_google_drive("https://drive.google.com/file/d/F3fveiu873hfjZZj/ed } } \seealso{ -Other InstallCourses: \code{\link{InstallCourses}}, - \code{\link{install_course_directory}}, - \code{\link{install_course_dropbox}}, - \code{\link{install_course_github}}, - \code{\link{install_course_url}}, - \code{\link{install_course_zip}}, - \code{\link{install_course}}, - \code{\link{install_from_swirl}}, - \code{\link{uninstall_all_courses}}, - \code{\link{uninstall_course}}, \code{\link{zip_course}} +Other InstallCourses: +\code{\link{InstallCourses}}, +\code{\link{install_course_directory}()}, +\code{\link{install_course_dropbox}()}, +\code{\link{install_course_github}()}, +\code{\link{install_course_url}()}, +\code{\link{install_course_zip}()}, +\code{\link{install_course}()}, +\code{\link{install_from_swirl}()}, +\code{\link{uninstall_all_courses}()}, +\code{\link{uninstall_course}()}, +\code{\link{zip_course}()} } \concept{InstallCourses} diff --git a/man/install_course_url.Rd b/man/install_course_url.Rd index ccdda1b..4234af1 100644 --- a/man/install_course_url.Rd +++ b/man/install_course_url.Rd @@ -21,15 +21,17 @@ install_course_url("http://www.biostat.jhsph.edu/~rpeng/File_Hash_Course.zip") } } \seealso{ -Other InstallCourses: \code{\link{InstallCourses}}, - \code{\link{install_course_directory}}, - \code{\link{install_course_dropbox}}, - \code{\link{install_course_github}}, - \code{\link{install_course_google_drive}}, - \code{\link{install_course_zip}}, - \code{\link{install_course}}, - \code{\link{install_from_swirl}}, - \code{\link{uninstall_all_courses}}, - \code{\link{uninstall_course}}, \code{\link{zip_course}} +Other InstallCourses: +\code{\link{InstallCourses}}, +\code{\link{install_course_directory}()}, +\code{\link{install_course_dropbox}()}, +\code{\link{install_course_github}()}, +\code{\link{install_course_google_drive}()}, +\code{\link{install_course_zip}()}, +\code{\link{install_course}()}, +\code{\link{install_from_swirl}()}, +\code{\link{uninstall_all_courses}()}, +\code{\link{uninstall_course}()}, +\code{\link{zip_course}()} } \concept{InstallCourses} diff --git a/man/install_course_zip.Rd b/man/install_course_zip.Rd index a92d60e..a6de1d6 100644 --- a/man/install_course_zip.Rd +++ b/man/install_course_zip.Rd @@ -26,15 +26,17 @@ install_course_zip("~/Downloads/swirl_courses-master.zip", multi=TRUE, } } \seealso{ -Other InstallCourses: \code{\link{InstallCourses}}, - \code{\link{install_course_directory}}, - \code{\link{install_course_dropbox}}, - \code{\link{install_course_github}}, - \code{\link{install_course_google_drive}}, - \code{\link{install_course_url}}, - \code{\link{install_course}}, - \code{\link{install_from_swirl}}, - \code{\link{uninstall_all_courses}}, - \code{\link{uninstall_course}}, \code{\link{zip_course}} +Other InstallCourses: +\code{\link{InstallCourses}}, +\code{\link{install_course_directory}()}, +\code{\link{install_course_dropbox}()}, +\code{\link{install_course_github}()}, +\code{\link{install_course_google_drive}()}, +\code{\link{install_course_url}()}, +\code{\link{install_course}()}, +\code{\link{install_from_swirl}()}, +\code{\link{uninstall_all_courses}()}, +\code{\link{uninstall_course}()}, +\code{\link{zip_course}()} } \concept{InstallCourses} diff --git a/man/install_from_swirl.Rd b/man/install_from_swirl.Rd index cf97e3f..37bfc4f 100644 --- a/man/install_from_swirl.Rd +++ b/man/install_from_swirl.Rd @@ -47,15 +47,17 @@ install_from_swirl("R Programming", mirror = "bitbucket") } } \seealso{ -Other InstallCourses: \code{\link{InstallCourses}}, - \code{\link{install_course_directory}}, - \code{\link{install_course_dropbox}}, - \code{\link{install_course_github}}, - \code{\link{install_course_google_drive}}, - \code{\link{install_course_url}}, - \code{\link{install_course_zip}}, - \code{\link{install_course}}, - \code{\link{uninstall_all_courses}}, - \code{\link{uninstall_course}}, \code{\link{zip_course}} +Other InstallCourses: +\code{\link{InstallCourses}}, +\code{\link{install_course_directory}()}, +\code{\link{install_course_dropbox}()}, +\code{\link{install_course_github}()}, +\code{\link{install_course_google_drive}()}, +\code{\link{install_course_url}()}, +\code{\link{install_course_zip}()}, +\code{\link{install_course}()}, +\code{\link{uninstall_all_courses}()}, +\code{\link{uninstall_course}()}, +\code{\link{zip_course}()} } \concept{InstallCourses} diff --git a/man/omnitest.Rd b/man/omnitest.Rd index 03f351c..2cd45a0 100644 --- a/man/omnitest.Rd +++ b/man/omnitest.Rd @@ -4,8 +4,12 @@ \alias{omnitest} \title{Test for a correct expression, a correct value, or both.} \usage{ -omnitest(correctExpr = NULL, correctVal = NULL, strict = FALSE, - eval_for_class = as.logical(NA)) +omnitest( + correctExpr = NULL, + correctVal = NULL, + strict = FALSE, + eval_for_class = as.logical(NA) +) } \arguments{ \item{correctExpr}{the correct or expected expression as a string} @@ -56,14 +60,17 @@ character or numeric vectors of length 1. } } \seealso{ -Other AnswerTests: \code{\link{AnswerTests}}, - \code{\link{any_of_exprs}}, - \code{\link{calculates_same_value}}, - \code{\link{expr_creates_var}}, - \code{\link{expr_identical_to}}, \code{\link{expr_is_a}}, - \code{\link{expr_uses_func}}, - \code{\link{func_of_newvar_equals}}, - \code{\link{val_has_length}}, \code{\link{val_matches}}, - \code{\link{var_is_a}} +Other AnswerTests: +\code{\link{AnswerTests}}, +\code{\link{any_of_exprs}()}, +\code{\link{calculates_same_value}()}, +\code{\link{expr_creates_var}()}, +\code{\link{expr_identical_to}()}, +\code{\link{expr_is_a}()}, +\code{\link{expr_uses_func}()}, +\code{\link{func_of_newvar_equals}()}, +\code{\link{val_has_length}()}, +\code{\link{val_matches}()}, +\code{\link{var_is_a}()} } \concept{AnswerTests} diff --git a/man/swirl.Rd b/man/swirl.Rd index e6f9d90..f0c087b 100644 --- a/man/swirl.Rd +++ b/man/swirl.Rd @@ -25,7 +25,7 @@ may quit at any time and later resume without losing work. There are several ways to exit swirl: by typing \code{bye()} while in the R console, by hitting the Esc key while not in the R console, or by entering 0 from the swirl course menu. swirl will print a goodbye -message whenever it exits. +message whenever it exits. While swirl is in operation, it may be controlled by entering special commands in the R console. One of the special commands is \code{bye()} diff --git a/man/uninstall_all_courses.Rd b/man/uninstall_all_courses.Rd index 3376f63..22dfd64 100644 --- a/man/uninstall_all_courses.Rd +++ b/man/uninstall_all_courses.Rd @@ -21,15 +21,17 @@ uninstall_all_courses() } } \seealso{ -Other InstallCourses: \code{\link{InstallCourses}}, - \code{\link{install_course_directory}}, - \code{\link{install_course_dropbox}}, - \code{\link{install_course_github}}, - \code{\link{install_course_google_drive}}, - \code{\link{install_course_url}}, - \code{\link{install_course_zip}}, - \code{\link{install_course}}, - \code{\link{install_from_swirl}}, - \code{\link{uninstall_course}}, \code{\link{zip_course}} +Other InstallCourses: +\code{\link{InstallCourses}}, +\code{\link{install_course_directory}()}, +\code{\link{install_course_dropbox}()}, +\code{\link{install_course_github}()}, +\code{\link{install_course_google_drive}()}, +\code{\link{install_course_url}()}, +\code{\link{install_course_zip}()}, +\code{\link{install_course}()}, +\code{\link{install_from_swirl}()}, +\code{\link{uninstall_course}()}, +\code{\link{zip_course}()} } \concept{InstallCourses} diff --git a/man/uninstall_course.Rd b/man/uninstall_course.Rd index 500ff78..70eb8fc 100644 --- a/man/uninstall_course.Rd +++ b/man/uninstall_course.Rd @@ -19,16 +19,17 @@ uninstall_course("Linear Regression") } } \seealso{ -Other InstallCourses: \code{\link{InstallCourses}}, - \code{\link{install_course_directory}}, - \code{\link{install_course_dropbox}}, - \code{\link{install_course_github}}, - \code{\link{install_course_google_drive}}, - \code{\link{install_course_url}}, - \code{\link{install_course_zip}}, - \code{\link{install_course}}, - \code{\link{install_from_swirl}}, - \code{\link{uninstall_all_courses}}, - \code{\link{zip_course}} +Other InstallCourses: +\code{\link{InstallCourses}}, +\code{\link{install_course_directory}()}, +\code{\link{install_course_dropbox}()}, +\code{\link{install_course_github}()}, +\code{\link{install_course_google_drive}()}, +\code{\link{install_course_url}()}, +\code{\link{install_course_zip}()}, +\code{\link{install_course}()}, +\code{\link{install_from_swirl}()}, +\code{\link{uninstall_all_courses}()}, +\code{\link{zip_course}()} } \concept{InstallCourses} diff --git a/man/val_has_length.Rd b/man/val_has_length.Rd index 400a2b9..9735492 100644 --- a/man/val_has_length.Rd +++ b/man/val_has_length.Rd @@ -24,14 +24,17 @@ val_has_length(10) } } \seealso{ -Other AnswerTests: \code{\link{AnswerTests}}, - \code{\link{any_of_exprs}}, - \code{\link{calculates_same_value}}, - \code{\link{expr_creates_var}}, - \code{\link{expr_identical_to}}, \code{\link{expr_is_a}}, - \code{\link{expr_uses_func}}, - \code{\link{func_of_newvar_equals}}, - \code{\link{omnitest}}, \code{\link{val_matches}}, - \code{\link{var_is_a}} +Other AnswerTests: +\code{\link{AnswerTests}}, +\code{\link{any_of_exprs}()}, +\code{\link{calculates_same_value}()}, +\code{\link{expr_creates_var}()}, +\code{\link{expr_identical_to}()}, +\code{\link{expr_is_a}()}, +\code{\link{expr_uses_func}()}, +\code{\link{func_of_newvar_equals}()}, +\code{\link{omnitest}()}, +\code{\link{val_matches}()}, +\code{\link{var_is_a}()} } \concept{AnswerTests} diff --git a/man/val_matches.Rd b/man/val_matches.Rd index db2d12c..adec342 100644 --- a/man/val_matches.Rd +++ b/man/val_matches.Rd @@ -26,14 +26,17 @@ expression given as the first argument. } } \seealso{ -Other AnswerTests: \code{\link{AnswerTests}}, - \code{\link{any_of_exprs}}, - \code{\link{calculates_same_value}}, - \code{\link{expr_creates_var}}, - \code{\link{expr_identical_to}}, \code{\link{expr_is_a}}, - \code{\link{expr_uses_func}}, - \code{\link{func_of_newvar_equals}}, - \code{\link{omnitest}}, \code{\link{val_has_length}}, - \code{\link{var_is_a}} +Other AnswerTests: +\code{\link{AnswerTests}}, +\code{\link{any_of_exprs}()}, +\code{\link{calculates_same_value}()}, +\code{\link{expr_creates_var}()}, +\code{\link{expr_identical_to}()}, +\code{\link{expr_is_a}()}, +\code{\link{expr_uses_func}()}, +\code{\link{func_of_newvar_equals}()}, +\code{\link{omnitest}()}, +\code{\link{val_has_length}()}, +\code{\link{var_is_a}()} } \concept{AnswerTests} diff --git a/man/var_is_a.Rd b/man/var_is_a.Rd index 87ee2b3..c4ceb2c 100644 --- a/man/var_is_a.Rd +++ b/man/var_is_a.Rd @@ -25,14 +25,17 @@ var_is_a('numeric', 'x') } } \seealso{ -Other AnswerTests: \code{\link{AnswerTests}}, - \code{\link{any_of_exprs}}, - \code{\link{calculates_same_value}}, - \code{\link{expr_creates_var}}, - \code{\link{expr_identical_to}}, \code{\link{expr_is_a}}, - \code{\link{expr_uses_func}}, - \code{\link{func_of_newvar_equals}}, - \code{\link{omnitest}}, \code{\link{val_has_length}}, - \code{\link{val_matches}} +Other AnswerTests: +\code{\link{AnswerTests}}, +\code{\link{any_of_exprs}()}, +\code{\link{calculates_same_value}()}, +\code{\link{expr_creates_var}()}, +\code{\link{expr_identical_to}()}, +\code{\link{expr_is_a}()}, +\code{\link{expr_uses_func}()}, +\code{\link{func_of_newvar_equals}()}, +\code{\link{omnitest}()}, +\code{\link{val_has_length}()}, +\code{\link{val_matches}()} } \concept{AnswerTests} diff --git a/man/zip_course.Rd b/man/zip_course.Rd index 8edf6dc..ac99401 100644 --- a/man/zip_course.Rd +++ b/man/zip_course.Rd @@ -24,16 +24,17 @@ zip_course("~/Desktop/SNA_Tutorial", "~/tutorials") } } \seealso{ -Other InstallCourses: \code{\link{InstallCourses}}, - \code{\link{install_course_directory}}, - \code{\link{install_course_dropbox}}, - \code{\link{install_course_github}}, - \code{\link{install_course_google_drive}}, - \code{\link{install_course_url}}, - \code{\link{install_course_zip}}, - \code{\link{install_course}}, - \code{\link{install_from_swirl}}, - \code{\link{uninstall_all_courses}}, - \code{\link{uninstall_course}} +Other InstallCourses: +\code{\link{InstallCourses}}, +\code{\link{install_course_directory}()}, +\code{\link{install_course_dropbox}()}, +\code{\link{install_course_github}()}, +\code{\link{install_course_google_drive}()}, +\code{\link{install_course_url}()}, +\code{\link{install_course_zip}()}, +\code{\link{install_course}()}, +\code{\link{install_from_swirl}()}, +\code{\link{uninstall_all_courses}()}, +\code{\link{uninstall_course}()} } \concept{InstallCourses} diff --git a/tests/testthat/test-rmatch_calls.R b/tests/testthat/test-rmatch_calls.R index dc01e7e..6bef7a8 100644 --- a/tests/testthat/test-rmatch_calls.R +++ b/tests/testthat/test-rmatch_calls.R @@ -41,5 +41,5 @@ test_that("With default settings, S3 methods with calls as first arguments raise test_that("With eval_for_class=TRUE, S3 methods with calls as first arguments raise errors.",{ expr <- quote(print(paste("hi", 5))) - expect_that(is(try(rmatch_calls(expr, eval_for_class=TRUE), silent=TRUE),"try-error"), is_false()) + expect_false(is(try(rmatch_calls(expr, eval_for_class=TRUE), silent=TRUE), "try-error")) })