@@ -360,45 +360,45 @@ def test_csv2rec_names_with_comments(self):
360
360
361
361
def test_csv2rec_usdate (self ):
362
362
self .fd .write ('01/11/14\n ' +
363
- '03/05/76 12:00:01 AM\n ' +
364
- '07/09/83 5:17:34 PM\n ' +
365
- '06/20/2054 2:31:45 PM\n ' +
366
- '10/31/00 11:50:23 AM\n ' )
363
+ '03/05/76 12:00:01 AM\n ' +
364
+ '07/09/83 5:17:34 PM\n ' +
365
+ '06/20/2054 2:31:45 PM\n ' +
366
+ '10/31/00 11:50:23 AM\n ' )
367
367
expected = [datetime .datetime (2014 , 1 , 11 , 0 , 0 ),
368
- datetime .datetime (1976 , 3 , 5 , 0 , 0 , 1 ),
369
- datetime .datetime (1983 , 7 , 9 , 17 , 17 , 34 ),
370
- datetime .datetime (2054 , 6 , 20 , 14 , 31 , 45 ),
371
- datetime .datetime (2000 , 10 , 31 , 11 , 50 , 23 )]
368
+ datetime .datetime (1976 , 3 , 5 , 0 , 0 , 1 ),
369
+ datetime .datetime (1983 , 7 , 9 , 17 , 17 , 34 ),
370
+ datetime .datetime (2054 , 6 , 20 , 14 , 31 , 45 ),
371
+ datetime .datetime (2000 , 10 , 31 , 11 , 50 , 23 )]
372
372
self .fd .seek (0 )
373
373
array = mlab .csv2rec (self .fd , names = 'a' )
374
374
assert_array_equal (array ['a' ].tolist (), expected )
375
375
376
376
def test_csv2rec_dayfirst (self ):
377
377
self .fd .write ('11/01/14\n ' +
378
- '05/03/76 12:00:01 AM\n ' +
379
- '09/07/83 5:17:34 PM\n ' +
380
- '20/06/2054 2:31:45 PM\n ' +
381
- '31/10/00 11:50:23 AM\n ' )
378
+ '05/03/76 12:00:01 AM\n ' +
379
+ '09/07/83 5:17:34 PM\n ' +
380
+ '20/06/2054 2:31:45 PM\n ' +
381
+ '31/10/00 11:50:23 AM\n ' )
382
382
expected = [datetime .datetime (2014 , 1 , 11 , 0 , 0 ),
383
- datetime .datetime (1976 , 3 , 5 , 0 , 0 , 1 ),
384
- datetime .datetime (1983 , 7 , 9 , 17 , 17 , 34 ),
385
- datetime .datetime (2054 , 6 , 20 , 14 , 31 , 45 ),
386
- datetime .datetime (2000 , 10 , 31 , 11 , 50 , 23 )]
383
+ datetime .datetime (1976 , 3 , 5 , 0 , 0 , 1 ),
384
+ datetime .datetime (1983 , 7 , 9 , 17 , 17 , 34 ),
385
+ datetime .datetime (2054 , 6 , 20 , 14 , 31 , 45 ),
386
+ datetime .datetime (2000 , 10 , 31 , 11 , 50 , 23 )]
387
387
self .fd .seek (0 )
388
388
array = mlab .csv2rec (self .fd , names = 'a' , dayfirst = True )
389
389
assert_array_equal (array ['a' ].tolist (), expected )
390
390
391
391
def test_csv2rec_yearfirst (self ):
392
392
self .fd .write ('14/01/11\n ' +
393
- '76/03/05 12:00:01 AM\n ' +
394
- '83/07/09 5:17:34 PM\n ' +
395
- '2054/06/20 2:31:45 PM\n ' +
396
- '00/10/31 11:50:23 AM\n ' )
393
+ '76/03/05 12:00:01 AM\n ' +
394
+ '83/07/09 5:17:34 PM\n ' +
395
+ '2054/06/20 2:31:45 PM\n ' +
396
+ '00/10/31 11:50:23 AM\n ' )
397
397
expected = [datetime .datetime (2014 , 1 , 11 , 0 , 0 ),
398
- datetime .datetime (1976 , 3 , 5 , 0 , 0 , 1 ),
399
- datetime .datetime (1983 , 7 , 9 , 17 , 17 , 34 ),
400
- datetime .datetime (2054 , 6 , 20 , 14 , 31 , 45 ),
401
- datetime .datetime (2000 , 10 , 31 , 11 , 50 , 23 )]
398
+ datetime .datetime (1976 , 3 , 5 , 0 , 0 , 1 ),
399
+ datetime .datetime (1983 , 7 , 9 , 17 , 17 , 34 ),
400
+ datetime .datetime (2054 , 6 , 20 , 14 , 31 , 45 ),
401
+ datetime .datetime (2000 , 10 , 31 , 11 , 50 , 23 )]
402
402
self .fd .seek (0 )
403
403
array = mlab .csv2rec (self .fd , names = 'a' , yearfirst = True )
404
404
assert_array_equal (array ['a' ].tolist (), expected )
@@ -2543,7 +2543,7 @@ class Test_spectral_nosig_real_onesided_trim(
2543
2543
Test_spectral_nosig_real_onesided ):
2544
2544
def setUp (self ):
2545
2545
self .createStim (fstims = [],
2546
- len_x = 256 ,
2546
+ len_x = 1024 ,
2547
2547
NFFT_density = 512 , pad_to_spectrum = 128 ,
2548
2548
iscomplex = False , sides = 'onesided' , nsides = 1 )
2549
2549
@@ -2552,7 +2552,7 @@ class Test_spectral_nosig_real_twosided_trim(
2552
2552
Test_spectral_nosig_real_onesided ):
2553
2553
def setUp (self ):
2554
2554
self .createStim (fstims = [],
2555
- len_x = 256 ,
2555
+ len_x = 1024 ,
2556
2556
NFFT_density = 512 , pad_to_spectrum = 128 ,
2557
2557
iscomplex = False , sides = 'twosided' , nsides = 2 )
2558
2558
@@ -2561,7 +2561,7 @@ class Test_spectral_nosig_real_defaultsided_trim(
2561
2561
Test_spectral_nosig_real_onesided ):
2562
2562
def setUp (self ):
2563
2563
self .createStim (fstims = [],
2564
- len_x = 256 ,
2564
+ len_x = 1024 ,
2565
2565
NFFT_density = 512 , pad_to_spectrum = 128 ,
2566
2566
iscomplex = False , sides = 'default' , nsides = 1 )
2567
2567
@@ -2570,7 +2570,7 @@ class Test_spectral_nosig_complex_onesided_trim(
2570
2570
Test_spectral_nosig_real_onesided ):
2571
2571
def setUp (self ):
2572
2572
self .createStim (fstims = [],
2573
- len_x = 256 ,
2573
+ len_x = 1024 ,
2574
2574
NFFT_density = 512 , pad_to_spectrum = 128 ,
2575
2575
iscomplex = True , sides = 'onesided' , nsides = 1 )
2576
2576
@@ -2579,7 +2579,7 @@ class Test_spectral_nosig_complex_twosided_trim(
2579
2579
Test_spectral_nosig_real_onesided ):
2580
2580
def setUp (self ):
2581
2581
self .createStim (fstims = [],
2582
- len_x = 256 ,
2582
+ len_x = 1024 ,
2583
2583
NFFT_density = 512 , pad_to_spectrum = 128 ,
2584
2584
iscomplex = True , sides = 'twosided' , nsides = 2 )
2585
2585
@@ -2705,7 +2705,7 @@ class Test_spectral_nosig_real_onesided_stretch(
2705
2705
Test_spectral_nosig_real_onesided ):
2706
2706
def setUp (self ):
2707
2707
self .createStim (fstims = [],
2708
- len_x = 128 ,
2708
+ len_x = 256 ,
2709
2709
NFFT_density = 128 ,
2710
2710
pad_to_density = 256 , pad_to_spectrum = 256 ,
2711
2711
iscomplex = False , sides = 'onesided' , nsides = 1 )
@@ -2715,7 +2715,7 @@ class Test_spectral_nosig_real_twosided_stretch(
2715
2715
Test_spectral_nosig_real_onesided ):
2716
2716
def setUp (self ):
2717
2717
self .createStim (fstims = [],
2718
- len_x = 128 ,
2718
+ len_x = 256 ,
2719
2719
NFFT_density = 128 ,
2720
2720
pad_to_density = 256 , pad_to_spectrum = 256 ,
2721
2721
iscomplex = False , sides = 'twosided' , nsides = 2 )
@@ -2725,7 +2725,7 @@ class Test_spectral_nosig_real_defaultsided_stretch(
2725
2725
Test_spectral_nosig_real_onesided ):
2726
2726
def setUp (self ):
2727
2727
self .createStim (fstims = [],
2728
- len_x = 128 ,
2728
+ len_x = 256 ,
2729
2729
NFFT_density = 128 ,
2730
2730
pad_to_density = 256 , pad_to_spectrum = 256 ,
2731
2731
iscomplex = False , sides = 'default' , nsides = 1 )
@@ -2735,7 +2735,7 @@ class Test_spectral_nosig_complex_onesided_stretch(
2735
2735
Test_spectral_nosig_real_onesided ):
2736
2736
def setUp (self ):
2737
2737
self .createStim (fstims = [],
2738
- len_x = 128 ,
2738
+ len_x = 256 ,
2739
2739
NFFT_density = 128 ,
2740
2740
pad_to_density = 256 , pad_to_spectrum = 256 ,
2741
2741
iscomplex = True , sides = 'onesided' , nsides = 1 )
@@ -2745,7 +2745,7 @@ class Test_spectral_nosig_complex_twosided_stretch(
2745
2745
Test_spectral_nosig_real_onesided ):
2746
2746
def setUp (self ):
2747
2747
self .createStim (fstims = [],
2748
- len_x = 128 ,
2748
+ len_x = 256 ,
2749
2749
NFFT_density = 128 ,
2750
2750
pad_to_density = 256 , pad_to_spectrum = 256 ,
2751
2751
iscomplex = True , sides = 'twosided' , nsides = 2 )
@@ -2755,7 +2755,7 @@ class Test_spectral_nosig_complex_defaultsided_stretch(
2755
2755
Test_spectral_nosig_real_onesided ):
2756
2756
def setUp (self ):
2757
2757
self .createStim (fstims = [],
2758
- len_x = 128 ,
2758
+ len_x = 256 ,
2759
2759
NFFT_density = 128 ,
2760
2760
pad_to_density = 256 , pad_to_spectrum = 256 ,
2761
2761
iscomplex = True , sides = 'default' , nsides = 2 )
0 commit comments