Merge branch 'v1.0-prep' of https://github.com/zsteinmetz/OpenSpecy i…

…nto v1.0-prep
wincowgerDEV · Jul 26, 2023 · 4032906 · 4032906
2 parents 7a8742d + 3cc307a
commit 4032906
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/R/collapse_particles.R b/R/collapse_particles.R
@@ -4,7 +4,7 @@
 #' Functions for analyzing particles in spectral map oriented OpenSpecy object.
 #'
 #' @details
-#' `characterize_particles()` accepts an OpenSpecy object and a logical or character vector desribing which pixels correspond to particles.
+#' `characterize_particles()` accepts an OpenSpecy object and a logical or character vector describing which pixels correspond to particles.
 #' `collapse_spectra()` takes an OpenSpecy object with particle-specific metadata
 #' (from `characterize_particles()`) and collapses the spectra to median intensities for each unique particle.
 #' It also updates the metadata with centroid coordinates, while preserving the particle information on area and Feret max.

diff --git a/R/data_norm.R b/R/data_norm.R
@@ -15,7 +15,7 @@
 #'
 #' @details
 #' \code{adj_res()} and \code{conform_res()} are used in Open Specy to
-#' faciliate comparisons of spectra with different resolutions.
+#' facilitate comparisons of spectra with different resolutions.
 #' \code{adj_neg()} is used to avoid errors that could arise from log
 #' transforming spectra when using \code{\link{adj_intens}()} and other
 #' functions.

diff --git a/tests/testthat/test-as_OpenSpecy.R b/tests/testthat/test-as_OpenSpecy.R
@@ -71,7 +71,7 @@ test_that("OpenSpecy objects are read correctly", {
 
 test_that("OpenSpecy objects are transcribed to and from hyperSpec objects", {
     os <- as_OpenSpecy(df)
-    hyperOpenSpecy <- to_hyperspec(os)
+    hyperOpenSpecy <- to_hyperSpec(os)
     expect_true(is(hyperOpenSpecy, "hyperSpec"))
     OpenHyper <- as_OpenSpecy(hyperOpenSpecy)
     expect_true(is_OpenSpecy(OpenHyper))