@@ -360,45 +360,45 @@ def test_csv2rec_names_with_comments(self):
360360
361361 def test_csv2rec_usdate (self ):
362362 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 ' )
367367 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 )]
372372 self .fd .seek (0 )
373373 array = mlab .csv2rec (self .fd , names = 'a' )
374374 assert_array_equal (array ['a' ].tolist (), expected )
375375
376376 def test_csv2rec_dayfirst (self ):
377377 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 ' )
382382 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 )]
387387 self .fd .seek (0 )
388388 array = mlab .csv2rec (self .fd , names = 'a' , dayfirst = True )
389389 assert_array_equal (array ['a' ].tolist (), expected )
390390
391391 def test_csv2rec_yearfirst (self ):
392392 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 ' )
397397 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 )]
402402 self .fd .seek (0 )
403403 array = mlab .csv2rec (self .fd , names = 'a' , yearfirst = True )
404404 assert_array_equal (array ['a' ].tolist (), expected )
@@ -2543,7 +2543,7 @@ class Test_spectral_nosig_real_onesided_trim(
25432543 Test_spectral_nosig_real_onesided ):
25442544 def setUp (self ):
25452545 self .createStim (fstims = [],
2546- len_x = 256 ,
2546+ len_x = 1024 ,
25472547 NFFT_density = 512 , pad_to_spectrum = 128 ,
25482548 iscomplex = False , sides = 'onesided' , nsides = 1 )
25492549
@@ -2552,7 +2552,7 @@ class Test_spectral_nosig_real_twosided_trim(
25522552 Test_spectral_nosig_real_onesided ):
25532553 def setUp (self ):
25542554 self .createStim (fstims = [],
2555- len_x = 256 ,
2555+ len_x = 1024 ,
25562556 NFFT_density = 512 , pad_to_spectrum = 128 ,
25572557 iscomplex = False , sides = 'twosided' , nsides = 2 )
25582558
@@ -2561,7 +2561,7 @@ class Test_spectral_nosig_real_defaultsided_trim(
25612561 Test_spectral_nosig_real_onesided ):
25622562 def setUp (self ):
25632563 self .createStim (fstims = [],
2564- len_x = 256 ,
2564+ len_x = 1024 ,
25652565 NFFT_density = 512 , pad_to_spectrum = 128 ,
25662566 iscomplex = False , sides = 'default' , nsides = 1 )
25672567
@@ -2570,7 +2570,7 @@ class Test_spectral_nosig_complex_onesided_trim(
25702570 Test_spectral_nosig_real_onesided ):
25712571 def setUp (self ):
25722572 self .createStim (fstims = [],
2573- len_x = 256 ,
2573+ len_x = 1024 ,
25742574 NFFT_density = 512 , pad_to_spectrum = 128 ,
25752575 iscomplex = True , sides = 'onesided' , nsides = 1 )
25762576
@@ -2579,7 +2579,7 @@ class Test_spectral_nosig_complex_twosided_trim(
25792579 Test_spectral_nosig_real_onesided ):
25802580 def setUp (self ):
25812581 self .createStim (fstims = [],
2582- len_x = 256 ,
2582+ len_x = 1024 ,
25832583 NFFT_density = 512 , pad_to_spectrum = 128 ,
25842584 iscomplex = True , sides = 'twosided' , nsides = 2 )
25852585
@@ -2705,7 +2705,7 @@ class Test_spectral_nosig_real_onesided_stretch(
27052705 Test_spectral_nosig_real_onesided ):
27062706 def setUp (self ):
27072707 self .createStim (fstims = [],
2708- len_x = 128 ,
2708+ len_x = 256 ,
27092709 NFFT_density = 128 ,
27102710 pad_to_density = 256 , pad_to_spectrum = 256 ,
27112711 iscomplex = False , sides = 'onesided' , nsides = 1 )
@@ -2715,7 +2715,7 @@ class Test_spectral_nosig_real_twosided_stretch(
27152715 Test_spectral_nosig_real_onesided ):
27162716 def setUp (self ):
27172717 self .createStim (fstims = [],
2718- len_x = 128 ,
2718+ len_x = 256 ,
27192719 NFFT_density = 128 ,
27202720 pad_to_density = 256 , pad_to_spectrum = 256 ,
27212721 iscomplex = False , sides = 'twosided' , nsides = 2 )
@@ -2725,7 +2725,7 @@ class Test_spectral_nosig_real_defaultsided_stretch(
27252725 Test_spectral_nosig_real_onesided ):
27262726 def setUp (self ):
27272727 self .createStim (fstims = [],
2728- len_x = 128 ,
2728+ len_x = 256 ,
27292729 NFFT_density = 128 ,
27302730 pad_to_density = 256 , pad_to_spectrum = 256 ,
27312731 iscomplex = False , sides = 'default' , nsides = 1 )
@@ -2735,7 +2735,7 @@ class Test_spectral_nosig_complex_onesided_stretch(
27352735 Test_spectral_nosig_real_onesided ):
27362736 def setUp (self ):
27372737 self .createStim (fstims = [],
2738- len_x = 128 ,
2738+ len_x = 256 ,
27392739 NFFT_density = 128 ,
27402740 pad_to_density = 256 , pad_to_spectrum = 256 ,
27412741 iscomplex = True , sides = 'onesided' , nsides = 1 )
@@ -2745,7 +2745,7 @@ class Test_spectral_nosig_complex_twosided_stretch(
27452745 Test_spectral_nosig_real_onesided ):
27462746 def setUp (self ):
27472747 self .createStim (fstims = [],
2748- len_x = 128 ,
2748+ len_x = 256 ,
27492749 NFFT_density = 128 ,
27502750 pad_to_density = 256 , pad_to_spectrum = 256 ,
27512751 iscomplex = True , sides = 'twosided' , nsides = 2 )
@@ -2755,7 +2755,7 @@ class Test_spectral_nosig_complex_defaultsided_stretch(
27552755 Test_spectral_nosig_real_onesided ):
27562756 def setUp (self ):
27572757 self .createStim (fstims = [],
2758- len_x = 128 ,
2758+ len_x = 256 ,
27592759 NFFT_density = 128 ,
27602760 pad_to_density = 256 , pad_to_spectrum = 256 ,
27612761 iscomplex = True , sides = 'default' , nsides = 2 )
0 commit comments