Skip to content

Commit f349743

Browse files
authored
Update test_asciisignalio.py
1 parent ee57aad commit f349743

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

neo/test/iotest/test_asciisignalio.py

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ def test_skiprows(self):
157157
assert_array_equal(signal[1].magnitude, -64.6)
158158
assert_array_equal(signal[2].magnitude, -64.3)
159159
assert_array_equal(signal[3].magnitude, -66)
160-
assert_array_almost_equal(np.asarray(signal).flatten(), np.array([-64.8, -64.6, -64.3, -66]), decimal=5)
160+
assert_array_almost_equal(np.asarray(signal).flatten(),
161+
np.array([-64.8, -64.6, -64.3, -66]), decimal=5)
161162

162163
os.remove(filename)
163164

@@ -187,7 +188,8 @@ def test_usecols(self):
187188
assert_array_equal(signal[2].magnitude, 0.7)
188189
assert_array_equal(signal[3].magnitude, 0.8)
189190
assert_array_equal(signal[4].magnitude, 1.4)
190-
assert_array_almost_equal(np.asarray(signal).flatten(), np.array([0.5, 0.6, 0.7, 0.8, 1.4]), decimal=5)
191+
assert_array_almost_equal(np.asarray(signal).flatten(),
192+
np.array([0.5, 0.6, 0.7, 0.8, 1.4]), decimal=5)
191193

192194
os.remove(filename)
193195

@@ -206,7 +208,7 @@ def test_skip_comments(self):
206208
("Waveform"),
207209
("Unit"),
208210
(),
209-
(-0.02121),
211+
(-0.02121),
210212
(-0.01740),
211213
(-0.00671),
212214
(-0.00885),
@@ -224,7 +226,7 @@ def test_skip_comments(self):
224226
(""),
225227
]
226228
sampling_rate = 1 * pq.kHz
227-
filename='test_skip_comments.txt'
229+
filename = 'test_skip_comments.txt'
228230
with open(filename, 'w') as datafile:
229231
for row in sample_data:
230232
datafile.write(str(float))
@@ -346,16 +348,15 @@ def test_write_without_timecolumn(self):
346348
iow = AsciiSignalIO(filename,
347349
method='genfromtxt',
348350
time_units='ms',
349-
signal_group_mode='all-in-one'
350-
)
351+
signal_group_mode='all-in-one')
351352
iow.write_block(block1)
352353

353354
ior = AsciiSignalIO(filename)
354355
block2 = ior.read_block()
355-
356+
356357
assert len(block2.segments[0].analogsignals) == 3
357358
signal2 = block2.segments[0].analogsignals[1]
358-
359+
359360
assert_array_almost_equal(signal1.magnitude[:, 1], signal2.magnitude.reshape(-1),
360361
decimal=7)
361362
self.assertEqual(signal1.units, signal2.units)
@@ -364,7 +365,7 @@ def test_write_without_timecolumn(self):
364365

365366
assert_array_almost_equal(signal2.magnitude.reshape(-1), sample_data[:, 1],
366367
decimal=6)
367-
368+
368369
self.assertEqual(signal2.sampling_period, sampling_period * pq.s)
369370
self.assertEqual(len(block2.segments[0].analogsignals), 3)
370371
self.assertEqual(signal2.t_stop, sample_data.shape[0] * sampling_period * pq.s)
@@ -392,13 +393,12 @@ def test_write_with_timecolumn(self):
392393
method='genfromtxt',
393394
timecolumn=0,
394395
time_units='ms',
395-
signal_group_mode='all-in-one'
396-
)
396+
signal_group_mode='all-in-one')
397397
iow.write_block(block1)
398398

399399
ior = AsciiSignalIO(filename)
400400
block2 = ior.read_block()
401-
401+
402402
assert len(block2.segments[0].analogsignals) == 4
403403
signal2 = block2.segments[0].analogsignals[1]
404404

@@ -425,7 +425,7 @@ def test_write_with_timeunits_different_from_those_of_signal(self):
425425
filename = "test_write_with_timeunits_different_from_those_of_signal.txt"
426426
np.savetxt(filename, combined_data, delimiter=' ')
427427

428-
signal1 = AnalogSignal(sample_data, units="A", sampling_rate=2 * pq.Hz, sampling_period=0.5)
428+
signal1 = AnalogSignal(sample_data, units="A", sampling_rate=2*pq.Hz, sampling_period=0.5)
429429
seg1 = Segment()
430430
block1 = Block()
431431
seg1.analogsignals.append(signal1)
@@ -437,8 +437,7 @@ def test_write_with_timeunits_different_from_those_of_signal(self):
437437
timecolumn=0,
438438
units='mV',
439439
time_units='ms',
440-
signal_group_mode='all-in-one'
441-
)
440+
signal_group_mode='all-in-one')
442441
def_units = iow.units
443442
def_time_units = iow.time_units
444443
iow.write_block(block1)
@@ -448,18 +447,18 @@ def test_write_with_timeunits_different_from_those_of_signal(self):
448447

449448
assert len(block2.segments[0].analogsignals) == 4
450449
signal2 = block2.segments[0].analogsignals[1]
451-
450+
452451
self.assertTrue(signal1.units, def_units)
453452
self.assertEqual(signal1.units, pq.A)
454453
self.assertEqual(iow.units, pq.A)
455454
self.assertEqual(signal1.units, iow.units)
456455
self.assertTrue(def_units, iow.units)
457456

458-
self.assertTrue(signal1.units, ior.time_units)
457+
self.assertTrue(signal1.units, ior.time_units)
459458
self.assertEqual(iow.time_units, ior.time_units)
460459
self.assertTrue(def_time_units, iow.time_units)
461460
self.assertEqual(iow.time_units, pq.s)
462-
self.assertEqual(ior.time_units, pq.s)
461+
self.assertEqual(ior.time_units, pq.s)
463462

464463
os.remove(filename)
465464

0 commit comments

Comments
 (0)