Merge branch 'dev'

LudvigOlsen · Feb 7, 2024 · bdfe560 · bdfe560
2 parents 40d150b + 441ca42
commit bdfe560
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 26 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: rearrr
 Title: Rearranging Data
-Version: 0.3.3.9000
+Version: 0.3.4
 Authors@R: 
     c(person(given = "Ludvig Renbo",
              family = "Olsen",
@@ -33,9 +33,9 @@ Suggests:
     knitr,
     testthat,
     tidyr,
-    xpectr (>= 0.4.1)
+    xpectr (>= 0.4.3)
 RdMacros: 
     lifecycle
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 
-# rearrr 0.3.3.9000
+# rearrr 0.3.4
+
+* Updated documentation per CRAN requirements.
 
 # rearrr 0.3.3
 

diff --git a/R/rearrangers.R b/R/rearrangers.R
@@ -486,7 +486,6 @@ extreme_triplet_grouping_rearranger_ <- function(data,
 #'
 #' @inheritParams rearranger_
 #' @param window_size Size of the windows. (Logical)
-#' @param keep_windows Whether to keep the factor with window identifiers. (Logical)
 #' @param factor_name Name of the factor with window identifiers.
 #'  If \code{`NULL`}, no column is added.
 #' @keywords internal

diff --git a/R/rearrr_fn_docs.R b/R/rearrr_fn_docs.R
@@ -28,7 +28,7 @@
 #'  setting \code{`min_dims`} to \code{2} will use both the index and the values as columns.
 #' @param overwrite Whether to allow overwriting of existing columns. (Logical)
 #' @keywords internal
-rearrr_fn_ <- function(data, origin_fn, check_fn, allowed_types, force_df, min_dims){
+rearrr_fn_ <- function(data, origin_fn, check_fn, allowed_types, force_df, min_dims, overwrite){
   stop("'rearrr_fn' should not be called. Is used for documentation only.")
 }
 

diff --git a/man/apply_transformation_matrix.Rd b/man/apply_transformation_matrix.Rd
diff --git a/man/closest_to.Rd b/man/closest_to.Rd
diff --git a/man/cluster_groups.Rd b/man/cluster_groups.Rd
diff --git a/man/dim_values.Rd b/man/dim_values.Rd
diff --git a/man/distance.Rd b/man/distance.Rd
diff --git a/man/flip_values.Rd b/man/flip_values.Rd
diff --git a/man/furthest_from.Rd b/man/furthest_from.Rd
diff --git a/man/rearrr_fn_.Rd b/man/rearrr_fn_.Rd
diff --git a/man/rev_windows_rearranger_.Rd b/man/rev_windows_rearranger_.Rd
diff --git a/man/roll_values.Rd b/man/roll_values.Rd
diff --git a/man/rotate_2d.Rd b/man/rotate_2d.Rd
diff --git a/man/rotate_3d.Rd b/man/rotate_3d.Rd
diff --git a/man/shear_2d.Rd b/man/shear_2d.Rd
diff --git a/man/shear_3d.Rd b/man/shear_3d.Rd
diff --git a/man/swirl_2d.Rd b/man/swirl_2d.Rd
diff --git a/man/swirl_3d.Rd b/man/swirl_3d.Rd