fix cran bug

huizezhang-sherry · Jul 1, 2024 · cbf819b · cbf819b
1 parent b142934
commit cbf819b
Show file tree

Hide file tree

Showing 9 changed files with 133 additions and 67 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -14,7 +14,7 @@ Language: en-US
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2
 Imports:
  cli,
  dplyr,

diff --git a/NAMESPACE b/NAMESPACE
@@ -30,6 +30,7 @@ S3method(key,cubble_df)
 S3method(key_data,cubble_df)
 S3method(key_vars,cubble_df)
 S3method(mutate,spatial_cubble_df)
+S3method(mutate,temporal_cubble_df)
 S3method(print,cubble_df)
 S3method(rename,spatial_cubble_df)
 S3method(rename,temporal_cubble_df)

diff --git a/R/dplyr.R b/R/dplyr.R
@@ -43,11 +43,11 @@
 #' cb_long |> arrange(prcp)
 #'
 #' # summarise - summarise.spatial_cubble_df, summarise.temporal_cubble_df
-#' cb_long |> 
-#' group_by(first_5 = ifelse(lubridate::day(date) <=5, 1, 2 )) |> 
+#' cb_long |>
+#' group_by(first_5 = ifelse(lubridate::day(date) <=5, 1, 2 )) |>
 #' summarise(tmax = mean(tmax))
-#' cb_long |> 
-#' mutate(first_5 = ifelse(lubridate::day(date) <=5, 1, 2)) |> 
+#' cb_long |>
+#' mutate(first_5 = ifelse(lubridate::day(date) <=5, 1, 2)) |>
 #' summarise(t = mean(tmax), .by = first_5)
 #'
 #' # select - select.spatial_cubble_df, select.temporal_cubble_df
@@ -99,11 +99,10 @@
 #' # group_by & ungroup -
 #' (res <- cb_nested |> mutate(group1 = c(1, 1, 2)) |> group_by(group1))
 #' res |> ungroup()
-#' (res2 <- res |> face_temporal() |> unfold(group1) |> group_by(group1))
+#' (res2 <- res |> face_temporal())
 #' res2 |> ungroup()
-#' res2 |> mutate(first_5 = ifelse(lubridate::day(date) <= 5, 1, 6)) |> 
-#' group_by(first_5) |> 
-#' ungroup(group1)
+#' res2 |> mutate(first_5 = ifelse(lubridate::day(date) <= 5, 1, 6)) |>
+#' group_by(first_5)
 arrange.temporal_cubble_df <- function(.data, ...){
  out <- NextMethod()
  dplyr_reconstruct(out, .data)
@@ -427,6 +426,15 @@ mutate.spatial_cubble_df <- function(.data, ...){
  dplyr_reconstruct(res, data)
 }
 
+#' @export
+#' @rdname dplyr
+mutate.temporal_cubble_df <- function(.data, ...){
+ data <- .data
+ class(.data) <- setdiff(class(.data), cb_temporal_cls)
+ res <- NextMethod()
+ dplyr_reconstruct(res, data)
+}
+
 
 #' @export
 #' @rdname dplyr

diff --git a/man/cubble-package.Rd b/man/cubble-package.Rd
diff --git a/man/dplyr.Rd b/man/dplyr.Rd
diff --git a/man/glyph.Rd b/man/glyph.Rd
diff --git a/tests/testthat/_snaps/dplyr.md b/tests/testthat/_snaps/dplyr.md
@@ -606,24 +606,26 @@
 ---
 
  Code
-  (res2 <- group_by(unfold(face_temporal(res), group1), group1))
+  (res2 <- face_temporal(res))
+ Message
+  Adding missing grouping variables: `group1`
  Output
   # cubble: key: id [3], index: date, long form, groups: group1 [2]
   # temporal: 2020-01-01 -- 2020-01-10 [1D], no gaps
   # spatial: long [dbl], lat [dbl], elev [dbl], name [chr], wmo_id [dbl], group1
   # [dbl]
-  id date prcp tmax tmin group1
-  <chr> <date> <dbl> <dbl> <dbl>  <dbl>
-  1 ASN00086038 2020-01-01 0 26.8 11  1
-  2 ASN00086038 2020-01-02 0 26.3 12.2 1
-  3 ASN00086038 2020-01-03 0 34.5 12.7 1
-  4 ASN00086038 2020-01-04 0 29.3 18.8 1
-  5 ASN00086038 2020-01-05 18 16.1 12.5 1
-  6 ASN00086038 2020-01-06 104 17.5 11.1 1
-  7 ASN00086038 2020-01-07 14 20.7 12.1 1
-  8 ASN00086038 2020-01-08 0 26.4 16.4 1
-  9 ASN00086038 2020-01-09 0 33.1 17.4 1
-  10 ASN00086038 2020-01-10 0 34 19.6 1
+  group1 id date prcp tmax tmin
+   <dbl> <chr> <date> <dbl> <dbl> <dbl>
+  1  1 ASN00086038 2020-01-01 0 26.8 11 
+  2  1 ASN00086038 2020-01-02 0 26.3 12.2
+  3  1 ASN00086038 2020-01-03 0 34.5 12.7
+  4  1 ASN00086038 2020-01-04 0 29.3 18.8
+  5  1 ASN00086038 2020-01-05 18 16.1 12.5
+  6  1 ASN00086038 2020-01-06 104 17.5 11.1
+  7  1 ASN00086038 2020-01-07 14 20.7 12.1
+  8  1 ASN00086038 2020-01-08 0 26.4 16.4
+  9  1 ASN00086038 2020-01-09 0 33.1 17.4
+  10  1 ASN00086038 2020-01-10 0 34 19.6
   # i 20 more rows
 
 ---
@@ -635,17 +637,17 @@
   # temporal: 2020-01-01 -- 2020-01-10 [1D], no gaps
   # spatial: long [dbl], lat [dbl], elev [dbl], name [chr], wmo_id [dbl], group1
   # [dbl]
-  id date prcp tmax tmin group1
-  <chr> <date> <dbl> <dbl> <dbl>  <dbl>
-  1 ASN00086038 2020-01-01 0 26.8 11  1
-  2 ASN00086038 2020-01-02 0 26.3 12.2 1
-  3 ASN00086038 2020-01-03 0 34.5 12.7 1
-  4 ASN00086038 2020-01-04 0 29.3 18.8 1
-  5 ASN00086038 2020-01-05 18 16.1 12.5 1
-  6 ASN00086038 2020-01-06 104 17.5 11.1 1
-  7 ASN00086038 2020-01-07 14 20.7 12.1 1
-  8 ASN00086038 2020-01-08 0 26.4 16.4 1
-  9 ASN00086038 2020-01-09 0 33.1 17.4 1
-  10 ASN00086038 2020-01-10 0 34 19.6 1
+  group1 id date prcp tmax tmin
+   <dbl> <chr> <date> <dbl> <dbl> <dbl>
+  1  1 ASN00086038 2020-01-01 0 26.8 11 
+  2  1 ASN00086038 2020-01-02 0 26.3 12.2
+  3  1 ASN00086038 2020-01-03 0 34.5 12.7
+  4  1 ASN00086038 2020-01-04 0 29.3 18.8
+  5  1 ASN00086038 2020-01-05 18 16.1 12.5
+  6  1 ASN00086038 2020-01-06 104 17.5 11.1
+  7  1 ASN00086038 2020-01-07 14 20.7 12.1
+  8  1 ASN00086038 2020-01-08 0 26.4 16.4
+  9  1 ASN00086038 2020-01-09 0 33.1 17.4
+  10  1 ASN00086038 2020-01-10 0 34 19.6
   # i 20 more rows
 
diff --git a/tests/testthat/_snaps/sf.md b/tests/testthat/_snaps/sf.md
@@ -14,3 +14,19 @@
   2 ASN00086077 145. -38.0 12.1 moora~ 94870 <tibble> (145.0964 -37.98)
   3 ASN00086282 145. -37.7 113. melbo~ 94866 <tibble> (144.8321 -37.6655)
 
+---
+
+ Code
+  make_spatial_sf(rename(climate_mel, x = long, y = lat))
+ Message
+  CRS missing: using OGC:CRS84 (WGS84) as default
+ Output
+  # cubble: key: id [3], index: date, nested form, [sf]
+  # spatial: [144.8321, -37.98, 145.0964, -37.6655], WGS 84
+  # temporal: date [date], prcp [dbl], tmax [dbl], tmin [dbl]
+  id x y elev name wmo_id ts geometry
+  <chr> <dbl> <dbl> <dbl> <chr> <dbl> <list> <POINT [°]>
+  1 ASN00086038 145. -37.7 78.4 essen~ 95866 <tibble> (144.9066 -37.7276)
+  2 ASN00086077 145. -38.0 12.1 moora~ 94870 <tibble> (145.0964 -37.98)
+  3 ASN00086282 145. -37.7 113. melbo~ 94866 <tibble> (144.8321 -37.6655)
+
diff --git a/tests/testthat/test-dplyr.R b/tests/testthat/test-dplyr.R
@@ -17,13 +17,13 @@ test_that("dplyr verbs work", {
 
  # summarise - summarise.spatial_cubble_df, summarise.temporal_cubble_df
  expect_snapshot(
- cb_long |> 
- group_by(first_5 = ifelse(lubridate::day(date) <=5, 1, 2 )) |> 
+ cb_long |>
+ group_by(first_5 = ifelse(lubridate::day(date) <=5, 1, 2 )) |>
  summarise(tmax = mean(tmax))
  )
  expect_snapshot(
- cb_long |> 
- mutate(first_5 = ifelse(lubridate::day(date) <=5, 1, 2)) |> 
+ cb_long |>
+ mutate(first_5 = ifelse(lubridate::day(date) <=5, 1, 2)) |>
  summarise(t = mean(tmax), .by = first_5)
  )
 
@@ -77,9 +77,8 @@ test_that("dplyr verbs work", {
  # group_by & ungroup -
  expect_snapshot((res <- cb_nested |> mutate(group1 = c(1, 1, 2)) |> group_by(group1)))
  expect_snapshot(res |> ungroup())
- expect_snapshot((res2 <- res |> face_temporal() |> unfold(group1) |> group_by(group1)))
+ expect_snapshot((res2 <- res |> face_temporal()))
  expect_snapshot(res2 |> ungroup())
- res2 |> mutate(first_5 = ifelse(lubridate::day(date) <= 5, 1, 6)) |> 
- group_by(first_5) |> 
- ungroup(group1)
+ res2 |> mutate(first_5 = ifelse(lubridate::day(date) <= 5, 1, 6)) |>
+ group_by(first_5)
 })