Skip to content

Commit 9974e63

Browse files
author
y-p
committed
Merge pull request #3173 from y-p/less_precise
ENH: assert_X_equal with check_less_precise should apply to index/cols too
2 parents 4a7dbbe + 51d00fd commit 9974e63

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

pandas/util/testing.py

+12-5
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,10 @@ def assert_series_equal(left, right, check_dtype=True,
183183
assert_almost_equal(left.values, right.values, check_less_precise)
184184
if check_dtype:
185185
assert(left.dtype == right.dtype)
186-
assert(left.index.equals(right.index))
186+
if check_less_precise:
187+
assert_almost_equal(left.index.values, right.index.values, check_less_precise)
188+
else:
189+
assert(left.index.equals(right.index))
187190
if check_index_type:
188191
assert(type(left.index) == type(right.index))
189192
assert(left.index.dtype == right.index.dtype)
@@ -193,7 +196,7 @@ def assert_series_equal(left, right, check_dtype=True,
193196
getattr(right, 'freqstr', None))
194197

195198

196-
def assert_frame_equal(left, right, check_dtype=True,
199+
def assert_frame_equal(left, right, check_dtype=True,
197200
check_index_type=False,
198201
check_column_type=False,
199202
check_frame_type=False,
@@ -204,14 +207,18 @@ def assert_frame_equal(left, right, check_dtype=True,
204207
assert(isinstance(left, DataFrame))
205208
assert(isinstance(right, DataFrame))
206209

207-
assert(left.columns.equals(right.columns))
208-
assert(left.index.equals(right.index))
210+
if check_less_precise:
211+
assert_almost_equal(left.columns,right.columns)
212+
assert_almost_equal(left.index,right.index)
213+
else:
214+
assert(left.columns.equals(right.columns))
215+
assert(left.index.equals(right.index))
209216

210217
for i, col in enumerate(left.columns):
211218
assert(col in right)
212219
lcol = left.icol(i)
213220
rcol = right.icol(i)
214-
assert_series_equal(lcol, rcol,
221+
assert_series_equal(lcol, rcol,
215222
check_dtype=check_dtype,
216223
check_index_type=check_index_type,
217224
check_less_precise=check_less_precise)

0 commit comments

Comments
 (0)