Commit for release 1.7.0

Author: pvanlaake

.Rbuildignore

@@ -7,3 +7,4 @@
 ^cran-comments\.md$
 ^CRAN-SUBMISSION$
 ^revdep$
+^LocalStuff$

.gitignore

@@ -7,3 +7,4 @@ TODO
 inst/doc
 .quarto
 revdep/
+LocalStuff/

DESCRIPTION

@@ -21,7 +21,7 @@ Imports:
 Suggests: 
     knitr,
     rmarkdown,
-    ncdfCF,
+    ncdfCF (<= 0.6.1),
     testthat (>= 3.0.0),
     stringr
 URL: https://github.com/R-CF/CFtime

NAMESPACE

@@ -10,15 +10,10 @@ S3method(str,CFTime)
 export("bounds<-")
 export(CFClimatology)
 export(CFTime)
-export(CFcomplete)
 export(CFfactor)
 export(CFfactor_coverage)
 export(CFfactor_units)
-export(CFmonth_days)
-export(CFparse)
-export(CFsubset)
 export(CFtime)
-export(CFtimestamp)
 export(as_timestamp)
 export(bounds)
 export(calendar)

NEWS.md

@@ -1,6 +1,9 @@
 # CFtime (development version)
 
 * CFtime is now hosted on Github through the R-CF organization: all things related to the CF Metadata Conventions in R.
+* New sequence-like method to create `CFTime` instances.
+* New methods `CFTime$copy()` and `CFTime$subset()` to create copies of the entire `CFTime` instance or a subset thereof, including boundary values if they are set.
+* Fixed error on year 0 timestamps.
 
 # CFtime 1.6.2
 

R/CFCalendar360.R

@@ -29,7 +29,7 @@ CFCalendar360 <- R6::R6Class("CFCalendar360",
     #'   with `TRUE` for valid days and `FALSE` for invalid days, or `NA` where
     #'   the row in argument `ymd` has `NA` values.
     valid_days = function(ymd) {
-      ymd$year & ymd$month >= 1L & ymd$month <= 12L & ymd$day >= 1L & ymd$day <= 30L
+      !is.na(ymd$year) & ymd$month >= 1L & ymd$month <= 12L & ymd$day >= 1L & ymd$day <= 30L
     },
 
     #' @description Determine the number of days in the month of the calendar.

R/CFCalendar365.R

@@ -34,7 +34,7 @@ CFCalendar365 <- R6::R6Class("CFCalendar365",
     #'   with `TRUE` for valid days and `FALSE` for invalid days, or `NA` where
     #'   the row in argument `ymd` has `NA` values.
     valid_days = function(ymd) {
-      ymd$year & ymd$month >= 1L & ymd$month <= 12L & ymd$day >= 1L &
+      !is.na(ymd$year) & ymd$month >= 1L & ymd$month <= 12L & ymd$day >= 1L &
       ymd$day <= c(31L, 28L, 31L, 30L, 31L, 30L, 31L, 31L, 30L, 31L, 30L, 31L)[ymd$month]
     },
 

R/CFCalendar366.R

@@ -34,7 +34,7 @@ CFCalendar366 <- R6::R6Class("CFCalendar366",
     #'   with `TRUE` for valid days and `FALSE` for invalid days, or `NA` where
     #'   the row in argument `ymd` has `NA` values.
     valid_days = function(ymd) {
-      ymd$year & ymd$month >= 1L & ymd$month <= 12L & ymd$day >= 1L &
+      !is.na(ymd$year) & ymd$month >= 1L & ymd$month <= 12L & ymd$day >= 1L &
       ymd$day <= c(31L, 29L, 31L, 30L, 31L, 30L, 31L, 31L, 30L, 31L, 30L, 31L)[ymd$month]
     },
 

R/CFCalendarNone.R

@@ -30,7 +30,6 @@ CFCalendarNone <- R6::R6Class("CFCalendarNone",
     valid_days = function(ymd) {
       if (!nrow(self$origin)) TRUE
       else
-        ymd$year &
         ymd$year == self$origin$year &
         ymd$month == self$origin$month &
         ymd$day == self$origin$day

R/CFCalendarProleptic.R

@@ -39,7 +39,7 @@ CFCalendarProleptic <- R6::R6Class("CFCalendarProleptic",
     #'   with `TRUE` for valid days and `FALSE` for invalid days, or `NA` where
     #'   the row in argument `ymd` has `NA` values.
     valid_days = function(ymd) {
-      ymd$year & ymd$month >= 1L & ymd$month <= 12L & ymd$day >= 1L &
+      !is.na(ymd$year) & ymd$month >= 1L & ymd$month <= 12L & ymd$day >= 1L &
       ifelse(self$leap_year(ymd$year),
         ymd$day <= c(31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)[ymd$month],
         ymd$day <= c(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)[ymd$month])