Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add isapprox support for dataframes. #2373

Merged
merged 11 commits into from
Aug 23, 2020
Merged

Add isapprox support for dataframes. #2373

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f7a4e17
Update News.md
Sov-trotter Aug 21, 2020
4c6b061
Nit's
Sov-trotter Aug 21, 2020
be183f9
Add docstring
Sov-trotter Aug 21, 2020
2f01176
Refactor docstring
Sov-trotter Aug 21, 2020
15f19f6
Minor nit
Sov-trotter Aug 21, 2020
1161e02
Apply suggestions from code review
bkamins Aug 22, 2020
e055ba3
Add linearalgebra dep
Sov-trotter Aug 23, 2020
2e27d88
Merge remote-tracking branch 'origin/isapprox' into isapprox
Sov-trotter Aug 23, 2020
725c194
Add isapprox to equality section in functions
Sov-trotter Aug 23, 2020
d2f1079
test isapprox
Sov-trotter Aug 23, 2020
98fc557
Update NEWS.md
bkamins Aug 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
* add `rownumber` to `DataFrameRow` ([#2356](https://github.com/JuliaData/DataFrames.jl/pull/2356))
* allow passing column name to specify the position where a new columns should be
inserted in `insertcols!` ([#2365](https://github.com/JuliaData/DataFrames.jl/pull/2365))

* add `isapprox` method to check for approximate equality between two dataframes
([#2373](https://github.com/JuliaData/DataFrames.jl/pull/2373))
bkamins marked this conversation as resolved.
Show resolved Hide resolved
## Deprecated

* `DataFrame!` is now deprecated ([#2338](https://github.com/JuliaData/DataFrames.jl/pull/2338))
Expand Down
1 change: 1 addition & 0 deletions src/DataFrames.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ using Reexport, SortingAlgorithms, Compat, Unicode, PooledArrays
@reexport using CategoricalArrays, Missings, InvertedIndices
using Base.Sort, Base.Order, Base.Iterators
using TableTraits, IteratorInterfaceExtensions
import LinearAlgebra: norm

import DataAPI,
DataAPI.All,
Expand Down
7 changes: 7 additions & 0 deletions src/abstractdataframe/abstractdataframe.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,13 @@ function Base.isequal(df1::AbstractDataFrame, df2::AbstractDataFrame)
return true
end

function Base.isapprox(df1::AbstractDataFrame, df2::AbstractDataFrame;
Sov-trotter marked this conversation as resolved.
Show resolved Hide resolved
atol::Real=0, rtol::Real=atol>0 ? 0 : √eps(),
nans::Bool=false, norm::Function=norm)
size(df1) == size(df2) || throw(DimensionMismatch("dimensions must match: a has dims $(size(df1)), b has dims $(size(df2))"))
isequal(index(df1), index(df2)) || throw(ArgumentError("column names of passed data frames do not match"))
return all(isapprox.(eachcol(df1), eachcol(df2), atol=atol, rtol=rtol, nans=nans, norm=norm))
end
##############################################################################
##
## Description
Expand Down