Extended character parser for quarters #108
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
earowang
requested changes
Apr 5, 2019
R/period.R
Outdated
| anytime::assertDate(x) | ||
| as_yearquarter(anytime::anydate(x)) | ||
| qtr_regex <- "(?i)(q|qtr|quarter)(?-i) *" | ||
| if(all(grepl(paste0("\\d{4} *", qtr_regex, "\\d|", qtr_regex, "\\d *\\d{4}"), x, perl = TRUE))){ |
There was a problem hiding this comment.
- Can you put space around the
if-elsestatement? - In the condition, can you just do
grepl(qtr_regex, x, perl = TRUE)without checking other things?
There was a problem hiding this comment.
- Fixed
- Why? It's safer to match the whole expression, rather than accept an incomplete expression.
R/period.R
Outdated
| anytime::assertDate(x) | ||
| as_yearquarter(anytime::anydate(x)) | ||
| qtr_regex <- "(?i)(q|qtr|quarter)(?-i) *" | ||
| if(all(grepl(paste0("\\d{4} *", qtr_regex, "\\d|", qtr_regex, "\\d *\\d{4}"), x, perl = TRUE))){ |
There was a problem hiding this comment.
Can you refactor the code to extract digits only without using qtr_regrex for quarter and year?
There was a problem hiding this comment.
You can refactor it - using qtr_regex for both quarter and year is safer than just matching digits.
tests/testthat/test-index-fun.R
Outdated
| @@ -81,6 +81,9 @@ test_that("some S3 methods for yearweek, yearmonth & yearquarter", { | |||
| expect_is(unique(y2), "yearquarter") | |||
| expect_identical(yearquarter(y), y) | |||
| expect_is(y[1:2], "yearquarter") | |||
| expect_equal(yearquarter("2010 Q1"), y[1]) | |||
There was a problem hiding this comment.
Can you make a new test block to include the tests, and refer to the issue in the test_that(..., {})?
earowang
requested changes
Apr 5, 2019
|
I can use branches for the next PR - to change branches would require a new PR. |
earowang
force-pushed
the
master
branch
2 times, most recently
from
8e46fd9 to
678b5b2
Compare
earowang
force-pushed
the
master
branch
3 times, most recently
from
42b1cf4 to
3618415
Compare
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #107
cc @robjhyndman