Skip to content

Commit 9907c25

Browse files
author
Craig Gower-Page
authored
Release 1.1.0 (#129)
1 parent 896e794 commit 9907c25

12 files changed

Lines changed: 79 additions & 43 deletions

.markdownlintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
cran-comments.md

DESCRIPTION

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: diffdf
22
Type: Package
33
Title: Dataframe Difference Tool
4-
Version: 1.0.4.900
4+
Version: 1.1.0
55
Authors@R: c(
66
person("Craig" ,"Gower-Page" , email = "craig.gower-page@roche.com" , role = c("cre","aut")),
77
person("Kieran", "Martin" , email = "kieran.martin@roche.com" , role = "aut")
@@ -11,7 +11,6 @@ Description: Functions for comparing two data.frames against
1111
between two data.frames as well as providing utility functions to help narrow down the
1212
source of problems and differences.
1313
Encoding: UTF-8
14-
LazyData: true
1514
Language: en-GB
1615
Depends:
1716
R (>= 3.1.2)

NEWS.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
# diffdf 1.0.4.900
1+
# diffdf 1.1.0
22

3-
Development version
3+
## New features
44

5-
- Enhanced table printing so that white space characters are more clearly defined (#87)
6-
- `row_limit` argument now functional again in print method! (#6, @brianrepko)
7-
- Fixed bug that caused an error if either the base or comparison dataset were empty (#44)
8-
- Fixed bug that caused an error if there were no matching keys between the base and comparison dataset (#79)
5+
- Enhanced table printing so that white space characters are more clearly displayed (#87)
6+
- Added `row_limit` argument to print method to limit the number of rows displayed (#6, @brianrepko)
97
- Added check to ensure that the column ordering is the same (#32)
10-
- Added more informative error messaging if a specified key is missing from the base or comparison dataset (#113)
118
- Added check for differences in classes between the base and comparison datasets (#42)
129
- Updated character formatting of datetimes to show time zone to avoid misleading/confusing comparisons (#121)
1310

11+
## Minor improvements and fixes
12+
13+
- Added more informative error messaging if a specified key is missing from the base or comparison dataset (#113)
14+
- Fixed bug that caused an error if either the base or comparison dataset were empty (#44)
15+
- Fixed bug that caused an error if there were no matching keys between the base and comparison dataset (#79)
16+
1417

1518
# diffdf 1.0.4
1619

R/is_different.R

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,15 @@ compare_vectors.factor <- function(target, current, ...) {
139139
#' @param current a vector to compare target to
140140
#' @param tolerance Level of tolerance for differences between two variables
141141
#' @param scale Scale that tolerance should be set on. If NULL assume absolute
142+
#' @param ... Not used
142143
#' @keywords internal
143144
compare_vectors.numeric <- function(
144-
target,
145-
current,
146-
tolerance = sqrt(.Machine$double.eps),
147-
scale = NULL) {
145+
target,
146+
current,
147+
tolerance = sqrt(.Machine$double.eps),
148+
scale = NULL,
149+
...
150+
) {
148151

149152
out <- target == current
150153

@@ -173,11 +176,14 @@ compare_vectors.numeric <- function(
173176
#' @param current a vector to compare target to
174177
#' @param tolerance Level of tolerance for differences between two variables
175178
#' @param scale Scale that tolerance should be set on. If NULL assume absolute
179+
#' @param ... Not used
176180
#' @keywords internal
177181
compare_vectors.integer64 <- function(
178-
target,
179-
current,
180-
tolerance = sqrt(.Machine$double.eps),
181-
scale = NULL) {
182+
target,
183+
current,
184+
tolerance = sqrt(.Machine$double.eps),
185+
scale = NULL,
186+
...
187+
) {
182188
compare_vectors.numeric(target, current, tolerance, scale)
183189
}

R/issues.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ get_print_message <- function(object, ...) {
4646
#'
4747
#' Errors, as this should only ever be given an issue
4848
#' @param object issue
49+
#' @param ... Not used
4950
#' @keywords internal
50-
get_print_message.default <- function(object) {
51+
get_print_message.default <- function(object, ...) {
5152
stop("Error: An issue has not been provided to this function!")
5253
}
5354

README.md

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,33 @@
77
[![Code Coverage 📔](https://raw.githubusercontent.com/gowerc/diffdf/_xml_coverage_reports/data/master/badge.svg)](https://gowerc.github.io/diffdf/master/coverage-report/)
88
<!-- end badges -->
99

10-
The diffdf package is designed to enable detailed comparison of two data.frames. Whilst many packages exist for informing you if there are differences between data.frames, none provide as much detail on what and where those differences are as diffdf does!
10+
`diffdf` compares two `data.frame` objects and provides a detailed summary of any differences that were found between them. The package has it's origins in supporting QC workflows for product development within the pharmaceutical industry aiming at being a light weight alternative to SAS's `PROC COMPARE`.
1111

1212
Currently diffdf supports the following:
1313

14-
- Checking for differences in values
15-
- Checking for differences in attributes
16-
- Checking for differences in classes
17-
- Checking for differences in column names
18-
- Checking for differences in the number of observations
14+
- Checking for differences in:
15+
- Values
16+
- Attributes
17+
- Classes
18+
- Column names
19+
- Number of observations
20+
- Column ordering
1921
- Matching rows by key/id variables
2022
- Fuzzy comparisons (i.e. treating doubles and integers as the same)
2123
- Extracting datasets of different rows
2224

2325
For more information on features please consult the vignette and man pages.
2426

27+
## Alternatives
28+
29+
If `diffdf` isn't quite right for your use case then the following are other packages that provide similar functionality that may be more appropriate:
30+
31+
- [`daff`](https://CRAN.R-project.org/package=daff)
32+
- [`compareDF`](https://CRAN.R-project.org/package=compareDF)
33+
- [`waldo`](https://CRAN.R-project.org/package=waldo)
34+
- [`diffobj`](https://CRAN.R-project.org/package=diffobj)
35+
- [`arsenal`](https://CRAN.R-project.org/package=arsenal)
36+
2537
## Installation
2638

2739
You can install the released version of diffdf from [CRAN](https://CRAN.R-project.org/package=diffdf) with:

cran-comments.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
## Release summary
2-
In this version I have:
3-
- Updated the package to fix errors introduced by the most recent version of tibble (2.99.99.9014 which will become 3.0.0 upon release)
4-
- Updated my email in the maintainers list from craig.gower@roche.com to craig.gower-page@roche.com as I have changed my name after getting married and work updated my email address. I no longer have access or the ability to send emails from the old email address however emails to the old email address are forwarded to the new one (that is if you wish to confirm this change).
5-
6-
## Test environments
7-
- local Mac OS Mojave R 3.6.2
8-
- Windows Server 2008 R2 SP1, R-devel, 32/64 bit (Rhub)
9-
- Debian Linux, R-release, GCC (Rhub)
10-
111
## R CMD check results
2+
123
R CMD check results
13-
0 errors | 0 warnings | 0 notes
4+
0 errors ✔ | 0 warnings ✔ | 0 notes ✔
5+
6+
## revdepcheck results
7+
8+
We checked the following reverse dependencies, all passed with no issues:
149

15-
## Downstream dependencies
16-
There are currently no downstream dependencies for this package
10+
- admiral
11+
- admiraldev
12+
- admiralonco
13+
- admiralophtha
14+
- admiralvaccine
15+
- pharmaverseadam
16+
- random.cdisc.data

inst/WORDLIST

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,8 @@ int64
77
int
88
datetimes
99
datetime
10+
SAS's
11+
compareDF
12+
daff
13+
diffobj
14+
waldo

man/compare_vectors.integer64.Rd

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/compare_vectors.numeric.Rd

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)