Fix typos (#47)

* Fix typos. * Use Mambaforge.
jtilly · Feb 11, 2023 · 8ca4820 · 8ca4820
1 parent d0bb8d0
commit 8ca4820
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,13 +5,12 @@ jobs:
     name: CI
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v2
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: actions/checkout@v3
+      - uses: conda-incubator/setup-miniconda@v2.2.0
         with:
-          python-version: 3.9
-          mamba-version: "*"
-          channels: conda-forge,r,defaults
-          channel-priority: true
+          miniforge-version: latest
+          miniforge-variant: Mambaforge
+          channels: conda-forge
       - shell: bash -l {0}
         run: |
           conda info

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -29,7 +29,7 @@
 #'    listed as being matched to \code{m}.}
 #'    \item{\code{engagements} is a vector of length \code{m} whose \code{j}th
 #'    element contains the number of the proposer that reviewer \code{j} is
-#'    matched to using C++ indexing. Reviwers that remain unmatched will be
+#'    matched to using C++ indexing. Reviewers that remain unmatched will be
 #'    listed as being matched to \code{n}.}
 #'  }
 #' @export

diff --git a/R/galeshapley.R b/R/galeshapley.R
@@ -82,7 +82,7 @@
 #'    matched to \code{NA}.}
 #'    \item{\code{engagements} is a vector of length \code{m} whose \code{j}th
 #'    element contains the number of the proposer that reviewer \code{j} is
-#'    matched to. Reviwers that remain unmatched will be listed as being matched
+#'    matched to. Reviewers that remain unmatched will be listed as being matched
 #'    to \code{NA}.}
 #'    \item{\code{single.proposers} is a vector that lists the remaining single
 #'    proposers. This vector will be empty whenever \code{n<=m}}.

diff --git a/environment.yml b/environment.yml
@@ -1,10 +1,9 @@
 name: matchingR
 channels:
   - conda-forge
-  - r
-  - nodefaults
 dependencies:
-  - r-rcpp 
+  - r-base=4.2
+  - r-rcpp
   - r-rcpparmadillo
   - r-testthat
   - r-knitr

diff --git a/man/cpp_wrapper_galeshapley.Rd b/man/cpp_wrapper_galeshapley.Rd
diff --git a/man/galeShapley.marriageMarket.Rd b/man/galeShapley.marriageMarket.Rd
diff --git a/src/galeshapley.cpp b/src/galeshapley.cpp
@@ -51,7 +51,7 @@
 //'    listed as being matched to \code{m}.}
 //'    \item{\code{engagements} is a vector of length \code{m} whose \code{j}th
 //'    element contains the number of the proposer that reviewer \code{j} is
-//'    matched to using C++ indexing. Reviwers that remain unmatched will be
+//'    matched to using C++ indexing. Reviewers that remain unmatched will be
 //'    listed as being matched to \code{n}.}
 //'  }
 //' @export

diff --git a/tests/testthat/test_galeshapley.R b/tests/testthat/test_galeshapley.R
@@ -234,7 +234,7 @@ test_that("Check if galeShapley.collegeAdmissions matching returns the same resu
   expect_true(identical(matching1, matching2))
 })
 
-test_that("Check student-optimal galeShapley.collegeAdmissions with differnet numbers of slots", {
+test_that("Check student-optimal galeShapley.collegeAdmissions with different numbers of slots", {
 
   # four students, two colleges, slots c(1,2)
   uStudents <- matrix(runif(8), nrow = 2, ncol = 4)
@@ -257,7 +257,7 @@ test_that("Check student-optimal galeShapley.collegeAdmissions with differnet nu
   expect_equal(matching1$matched.students, matching2$proposals)
 })
 
-test_that("Check college-optimal galeShapley.collegeAdmissions with differnet numbers of slots", {
+test_that("Check college-optimal galeShapley.collegeAdmissions with different numbers of slots", {
 
   # four students, two colleges, slots c(1,2)
   uStudents <- matrix(runif(8), nrow = 2, ncol = 4)