Skip to content

Commit 8b05510

Browse files
committed
Fix ascii and axograph ios
1 parent a6c0182 commit 8b05510

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

neo/test/iotest/test_asciisignalio.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ def test_skiprows(self):
166166
self.assertEqual(signal.units, pq.V)
167167
assert_array_equal(signal.times, [0.0, 1.0, 2.0, 3.0] * pq.s)
168168
assert_array_equal(signal.times.magnitude, [0.0, 1.0, 2.0, 3.0])
169-
assert_array_equal(signal[0].magnitude, -64.8)
170-
assert_array_equal(signal[1].magnitude, -64.6)
171-
assert_array_equal(signal[2].magnitude, -64.3)
172-
assert_array_equal(signal[3].magnitude, -66)
169+
assert_array_almost_equal(signal[0].magnitude, -64.8, decimal=5)
170+
assert_array_almost_equal(signal[1].magnitude, -64.6, decimal=5)
171+
assert_array_almost_equal(signal[2].magnitude, -64.3, decimal=5)
172+
assert_array_almost_equal(signal[3].magnitude, -66, decimal=5)
173173
assert_array_almost_equal(np.asarray(signal).flatten(), np.array([-64.8, -64.6, -64.3, -66]), decimal=5)
174174

175175
os.remove(filename)
@@ -195,11 +195,11 @@ def test_usecols(self):
195195
self.assertEqual(signal.units, pq.V)
196196
assert_array_equal(signal.times, [0.0, 1.0, 2.0, 3.0, 4.0] * pq.s)
197197
assert_array_equal(signal.times.magnitude, [0.0, 1.0, 2.0, 3.0, 4.0])
198-
assert_array_equal(signal[0].magnitude, 0.5)
199-
assert_array_equal(signal[1].magnitude, 0.6)
200-
assert_array_equal(signal[2].magnitude, 0.7)
201-
assert_array_equal(signal[3].magnitude, 0.8)
202-
assert_array_equal(signal[4].magnitude, 1.4)
198+
assert_array_almost_equal(signal[0].magnitude, 0.5, decimal=5)
199+
assert_array_almost_equal(signal[1].magnitude, 0.6, decimal=5)
200+
assert_array_almost_equal(signal[2].magnitude, 0.7, decimal=5)
201+
assert_array_almost_equal(signal[3].magnitude, 0.8, decimal=5)
202+
assert_array_almost_equal(signal[4].magnitude, 1.4, decimal=5)
203203
assert_array_almost_equal(np.asarray(signal).flatten(), np.array([0.5, 0.6, 0.7, 0.8, 1.4]), decimal=5)
204204

205205
os.remove(filename)

neo/test/iotest/test_axographio.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from neo.test.iotest.common_io_test import BaseTestIO
1010

1111
import numpy as np
12-
from numpy.testing import assert_equal
12+
from numpy.testing import assert_equal, assert_almost_equal
1313
import quantities as pq
1414
from neo.test.rawiotest.test_axographrawio import TestAxographRawIO
1515

@@ -35,9 +35,9 @@ def test_version_1(self):
3535
target = np.array([[-5.5078130], [-3.1171880], [+1.6640626], [+1.6640626], [+4.0546880]], dtype=np.float32)
3636
assert_equal(arr, target)
3737

38-
assert_equal(sig.t_start, 0.0005000000237487257 * pq.s)
38+
assert_almost_equal(sig.t_start, 0.0005000000237487257 * pq.s, decimal=9)
3939

40-
assert_equal(sig.sampling_period, 0.0005000010132789612 * pq.s)
40+
assert_almost_equal(sig.sampling_period, 0.0005000010132789612 * pq.s, decimal=9)
4141

4242
def test_version_2(self):
4343
"""Test reading a version 2 AxoGraph file"""
@@ -87,9 +87,9 @@ def test_version_2(self):
8787
target = np.array([[0.3125], [9.6875], [9.6875], [9.6875], [9.3750]], dtype=np.float32)
8888
assert_equal(arr, target)
8989

90-
assert_equal(sig.t_start, 0.00009999999747378752 * pq.s)
90+
assert_almost_equal(sig.t_start, 0.00009999999747378752 * pq.s, decimal=9)
9191

92-
assert_equal(sig.sampling_period, 0.00009999999747378750 * pq.s)
92+
assert_almost_equal(sig.sampling_period, 0.00009999999747378750 * pq.s, decimal=9)
9393

9494
def test_version_5(self):
9595
"""Test reading a version 5 AxoGraph file"""
@@ -169,7 +169,7 @@ def test_file_written_by_axographio_package_without_linearsequence(self):
169169

170170
assert_equal(sig.t_start, 0 * pq.s)
171171

172-
assert_equal(sig.sampling_period, 0.009999999999999787 * pq.s)
172+
assert_almost_equal(sig.sampling_period, 0.009999999999999787 * pq.s, decimal=9)
173173

174174
def test_file_with_corrupt_comment(self):
175175
"""Test reading a file with a corrupt comment"""

0 commit comments

Comments
 (0)