Changeset 1517
- Timestamp:
- 09/29/08 15:02:19 (2 months ago)
- Files:
-
- trunk/timeseries/scikits/timeseries/lib/tests/test_moving_funcs.py (modified) (8 diffs)
- trunk/timeseries/scikits/timeseries/lib/tests/test_tstables.py (modified) (4 diffs)
- trunk/timeseries/scikits/timeseries/tests/test_dates.py (modified) (7 diffs)
- trunk/timeseries/scikits/timeseries/tests/test_timeseries.py (modified) (39 diffs)
- trunk/timeseries/scikits/timeseries/tests/test_trecords.py (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/timeseries/scikits/timeseries/lib/tests/test_moving_funcs.py
r1396 r1517 38 38 k = (width-1)/2 39 39 ravg = mf.cmov_average(data,width) 40 assert(isinstance(ravg, MaskedArray))40 self.failUnless(isinstance(ravg, MaskedArray)) 41 41 assert_equal(ravg, data) 42 42 assert_equal(ravg._mask, [1]*k+[0]*(len(data)-2*k)+[1]*k) … … 47 47 k = (width-1)/2 48 48 ravg = mf.cmov_average(data,width) 49 assert(isinstance(ravg, MaskedArray))49 self.failUnless(isinstance(ravg, MaskedArray)) 50 50 assert_equal(ravg, data) 51 51 m = np.zeros(len(data), bool) … … 58 58 k = (width-1)/2 59 59 ravg = mf.cmov_average(data,width) 60 assert(isinstance(ravg, MaskedArray))60 self.failUnless(isinstance(ravg, MaskedArray)) 61 61 assert_equal(ravg, data) 62 62 m = np.zeros(len(data), bool) … … 72 72 k = (width-1)/2 73 73 ravg = mf.cmov_average(data,width) 74 assert(isinstance(ravg, MaskedArray))74 self.failUnless(isinstance(ravg, MaskedArray)) 75 75 #!!!: __getitem__[int] used to return a TimeSeries, now returns an array 76 76 # assert_almost_equal(ravg[18]._series.squeeze(), … … 103 103 for k in [3,4,5]: 104 104 result = mfunc(data, k) 105 assert(isinstance(result, MaskedArray))105 self.failUnless(isinstance(result, MaskedArray)) 106 106 for x in range(len(data)-k+1): 107 107 assert_almost_equal(result[x+k-1], nfunc(data[x:x+k])) … … 115 115 for k in [3,4,5]: 116 116 result = Mfunc(data, k) 117 assert(isinstance(result, MaskedArray))117 self.failUnless(isinstance(result, MaskedArray)) 118 118 for x in range(len(data)-k+1): 119 119 if result[x+k-1] is not ma.masked: … … 129 129 for k in [3,4,5]: 130 130 result = Mfunc(data, k) 131 assert(isinstance(result, MaskedArray))131 self.failUnless(isinstance(result, MaskedArray)) 132 132 for x in range(len(data)-k+1): 133 133 if result[x+k-1] is not ma.masked: … … 154 154 for k in [3,4,5]: 155 155 result = mfunc(data, k) 156 assert(isinstance(result, MaskedArray))156 self.failUnless(isinstance(result, MaskedArray)) 157 157 for x in range(len(data)-k+1): 158 158 assert_almost_equal(result[x+k-1], nfunc(data[x:x+k])) trunk/timeseries/scikits/timeseries/lib/tests/test_tstables.py
r1506 r1517 375 375 # 376 376 test = table.read() 377 assert(isinstance(test, TimeSeries))377 self.failUnless(isinstance(test, TimeSeries)) 378 378 assert_equal_records(test, series) 379 379 # 380 380 test = table.read(field='a') 381 assert(isinstance(test, TimeSeries))381 self.failUnless(isinstance(test, TimeSeries)) 382 382 assert_equal(test, series['a']) 383 383 # 384 384 test = table.read(step=2) 385 assert(isinstance(test, TimeSeries))385 self.failUnless(isinstance(test, TimeSeries)) 386 386 assert_equal(test, series[::2]) 387 387 # 388 388 test = table.readCoordinates([1,2,3]) 389 assert(isinstance(test, TimeSeries))389 self.failUnless(isinstance(test, TimeSeries)) 390 390 assert_equal(test, series[[1,2,3]]) 391 391 # 392 392 test = table.readCoordinates([1,2,3], field='a') 393 assert(isinstance(test, TimeSeries))393 self.failUnless(isinstance(test, TimeSeries)) 394 394 assert_equal(test, series['a'][[1,2,3]]) 395 395 # … … 400 400 # 401 401 test = table.read() 402 assert(isinstance(test, MaskedArray))402 self.failUnless(isinstance(test, MaskedArray)) 403 403 assert_equal_records(test, data) 404 404 # 405 405 test = table.read(field='a') 406 assert(isinstance(test, MaskedArray))406 self.failUnless(isinstance(test, MaskedArray)) 407 407 assert_equal(test, data['a']) 408 408 # 409 409 test = table.read(step=2) 410 assert(isinstance(test, MaskedArray))410 self.failUnless(isinstance(test, MaskedArray)) 411 411 assert_equal(test, data[::2]) 412 412 # 413 413 test = table.readCoordinates([1,2,3]) 414 assert(isinstance(test, MaskedArray))414 self.failUnless(isinstance(test, MaskedArray)) 415 415 assert_equal(test, data[[1,2,3]]) 416 416 # 417 417 test = table.readCoordinates([1,2,3], field='a') 418 assert(isinstance(test, MaskedArray))418 self.failUnless(isinstance(test, MaskedArray)) 419 419 assert_equal(test, data['a'][[1,2,3]]) 420 420 # … … 428 428 table.append(newdata) 429 429 test = table.read() 430 assert(isinstance(test, MaskedArray))430 self.failUnless(isinstance(test, MaskedArray)) 431 431 assert_equal_records(test, ma.mr_[data,newdata]) 432 432 # … … 441 441 table.append(newdata) 442 442 test = table.read() 443 assert(isinstance(test, TimeSeries))443 self.failUnless(isinstance(test, TimeSeries)) 444 444 assert_equal_records(test, ts.concatenate((tseries,newdata))) 445 445 # 446 446 447 447 ############################################################################### trunk/timeseries/scikits/timeseries/tests/test_dates.py
r1502 r1517 34 34 def test_fromstrings(self): 35 35 "Tests creation from list of strings" 36 print "starting test_fromstrings..."37 38 36 # A simple case: daily data 39 37 dlist = ['2007-01-%02i' % i for i in range(1,15)] 40 38 dates = date_array(dlist, freq='D') 41 39 assert_equal(dates.freqstr,'D') 42 assert(dates.isfull())43 assert(not dates.has_duplicated_dates())40 self.failUnless(dates.isfull()) 41 self.failUnless(not dates.has_duplicated_dates()) 44 42 assert_equal(dates, 732677+np.arange(len(dlist))) 45 43 … … 47 45 dates = date_array(dlist, freq='M') 48 46 assert_equal(dates.freqstr,'M') 49 assert(not dates.isfull())50 assert(dates.has_duplicated_dates())47 self.failUnless(not dates.isfull()) 48 self.failUnless(dates.has_duplicated_dates()) 51 49 assert_equal(dates, [24073]*len(dlist)) 52 50 … … 55 53 dates = date_array(dlist, freq='M') 56 54 assert_equal(dates.freqstr,'M') 57 assert(dates.isfull())58 assert(not dates.has_duplicated_dates())55 self.failUnless(dates.isfull()) 56 self.failUnless(not dates.has_duplicated_dates()) 59 57 assert_equal(dates, 24073 + np.arange(12)) 60 print "finished test_fromstrings"61 58 62 59 # quarterly date … … 85 82 dates = date_array(dlist) 86 83 assert_equal(dates.freqstr,'U') 87 assert(not dates.isfull())88 assert(not dates.has_duplicated_dates())84 self.failUnless(not dates.isfull()) 85 self.failUnless(not dates.has_duplicated_dates()) 89 86 assert_equal(dates.tovalue(), 732676 + np.array([1,2,4,5,7,8,10,11,13])) 90 87 # 91 88 ddates = date_array(dlist, freq='D') 92 89 assert_equal(ddates.freqstr,'D') 93 assert(not ddates.isfull())94 assert(not ddates.has_duplicated_dates())90 self.failUnless(not ddates.isfull()) 91 self.failUnless(not ddates.has_duplicated_dates()) 95 92 # 96 93 mdates = date_array(dlist, freq='M') 97 94 assert_equal(mdates.freqstr,'M') 98 assert(not mdates.isfull())99 assert(mdates.has_duplicated_dates())95 self.failUnless(not mdates.isfull()) 96 self.failUnless(mdates.has_duplicated_dates()) 100 97 101 98 … … 1018 1015 chosen = dates.date_to_index(choices[0]) 1019 1016 assert_equal(chosen, 2) 1020 assert(isinstance(chosen, int))1017 self.failUnless(isinstance(chosen, int)) 1021 1018 # 1022 1019 chosen = dates.date_to_index(choices[:-1]) 1023 1020 assert_equal(chosen, [2, 4, 6, 8]) 1024 assert(isinstance(chosen, np.ndarray))1021 self.failUnless(isinstance(chosen, np.ndarray)) 1025 1022 # 1026 1023 try: … … 1039 1036 dt = ts.now('d') 1040 1037 darr = date_array(start_date=dt, length=5) 1041 assert(dt in darr)1042 assert(dt-1 not in darr)1043 assert(dt.value in darr)1044 assert((dt-1).value not in darr)1038 self.failUnless(dt in darr) 1039 self.failUnless(dt-1 not in darr) 1040 self.failUnless(dt.value in darr) 1041 self.failUnless((dt-1).value not in darr) 1045 1042 # 1046 1043 try: … … 1062 1059 chosen = dates_invalid.date_to_index(choices[0]) 1063 1060 assert_equal(chosen, 2) 1064 assert(isinstance(chosen, int))1061 self.failUnless(isinstance(chosen, int)) 1065 1062 # 1066 1063 chosen = dates_invalid.date_to_index(choices[:-1]) 1067 1064 assert_equal(chosen, [2, 4, 6, 8]) 1068 assert(isinstance(chosen, np.ndarray))1065 self.failUnless(isinstance(chosen, np.ndarray)) 1069 1066 # 1070 1067 try: trunk/timeseries/scikits/timeseries/tests/test_timeseries.py
r1418 r1517 47 47 (dlist, dates, data) = self.d 48 48 series = time_series(data, dlist, freq='D') 49 assert(isinstance(series, TimeSeries))49 self.failUnless(isinstance(series, TimeSeries)) 50 50 assert_equal(series._mask, [1,0,0,0,0]*3) 51 51 assert_equal(series._series, data) … … 58 58 (dlist, dates, data) = self.d 59 59 series = time_series(data, start_date=dates[0]) 60 assert(isinstance(series, TimeSeries))60 self.failUnless(isinstance(series, TimeSeries)) 61 61 assert_equal(series._mask, [1,0,0,0,0]*3) 62 62 assert_equal(series._series, data) … … 70 70 dates = dates+15 71 71 series = time_series(series, dates) 72 assert(isinstance(series, TimeSeries))72 self.failUnless(isinstance(series, TimeSeries)) 73 73 assert_equal(series._mask, [1,0,0,0,0]*3) 74 74 assert_equal(series._series, data) … … 83 83 # 84 84 series = time_series(data, dates) 85 assert(isinstance(series, TimeSeries))85 self.failUnless(isinstance(series, TimeSeries)) 86 86 assert_equal(series._dates, dates) 87 87 assert_equal(series._data, data) … … 186 186 # 187 187 nseries = series+1 188 assert(isinstance(nseries, TimeSeries))188 self.failUnless(isinstance(nseries, TimeSeries)) 189 189 assert_equal(nseries._mask, [1,0,0,0,0]*3) 190 190 assert_equal(nseries._series, data+1) … … 192 192 # 193 193 nseries = series-1 194 assert(isinstance(nseries, TimeSeries))194 self.failUnless(isinstance(nseries, TimeSeries)) 195 195 assert_equal(nseries._mask, [1,0,0,0,0]*3) 196 196 assert_equal(nseries._series, data-1) … … 198 198 # 199 199 nseries = series*1 200 assert(isinstance(nseries, TimeSeries))200 self.failUnless(isinstance(nseries, TimeSeries)) 201 201 assert_equal(nseries._mask, [1,0,0,0,0]*3) 202 202 assert_equal(nseries._series, data*1) … … 204 204 # 205 205 nseries = series/1. 206 assert(isinstance(nseries, TimeSeries))206 self.failUnless(isinstance(nseries, TimeSeries)) 207 207 assert_equal(nseries._mask, [1,0,0,0,0]*3) 208 208 assert_equal(nseries._series, data/1.) … … 217 217 # 218 218 nseries += 1. 219 assert(isinstance(nseries, TimeSeries))219 self.failUnless(isinstance(nseries, TimeSeries)) 220 220 assert_equal(nseries._mask, [1,0,0,0,0]*3) 221 221 assert_equal(nseries._series, data+1.) … … 224 224 # 225 225 nseries -= 1. 226 assert(isinstance(nseries, TimeSeries))226 self.failUnless(isinstance(nseries, TimeSeries)) 227 227 assert_equal(nseries._mask, [1,0,0,0,0]*3) 228 228 assert_equal(nseries._series, data) … … 231 231 # 232 232 nseries *= 2. 233 assert(isinstance(nseries, TimeSeries))233 self.failUnless(isinstance(nseries, TimeSeries)) 234 234 assert_equal(nseries._mask, [1,0,0,0,0]*3) 235 235 assert_equal(nseries._series, data*2.) … … 238 238 # 239 239 nseries /= 2. 240 assert(isinstance(nseries, TimeSeries))240 self.failUnless(isinstance(nseries, TimeSeries)) 241 241 assert_equal(nseries._mask, [1,0,0,0,0]*3) 242 242 assert_equal(nseries._series, data) … … 249 249 assert_equal(series._mask, [1,0,0,0,0]*3) 250 250 series.mask = nomask 251 assert(not series._mask.any())252 assert(not series._series._mask.any())251 self.failUnless(not series._mask.any()) 252 self.failUnless(not series._series._mask.any()) 253 253 #series._series.mask = [1,0,0]*5 254 254 series.mask = [1,0,0]*5 … … 262 262 "Checks checks on masked" 263 263 (series, data) =self.d 264 assert(series._series[0] is masked)264 self.failUnless(series._series[0] is masked) 265 265 #!!!:... and of course, masked doesn't have a _series attribute 266 # assert(series[0]._series is masked)266 # self.failUnless(series[0]._series is masked) 267 267 268 268 … … 273 273 a, b = series[1:], series[:-1] 274 274 result = a + b 275 assert(not isinstance(result, TimeSeries))275 self.failUnless(not isinstance(result, TimeSeries)) 276 276 assert_equal(result.ndim, a.ndim) 277 277 assert_equal(result.size, a.size) … … 303 303 # 1D series ............................. 304 304 (series1D, data1D) = (self.series1D, self.data1D) 305 assert(series1D[0] is masked)305 self.failUnless(series1D[0] is masked) 306 306 test = series1D[-1] 307 307 assert_equal(test, data1D[-1]) 308 assert(not isinstance(test, TimeSeries))308 self.failUnless(not isinstance(test, TimeSeries)) 309 309 # nV series .............................. 310 310 (series3V, data3V) = (self.series3V, self.data3V) … … 312 312 assert_equal(test, data3V[-1]) 313 313 assert_equal(test.mask, [0,0,1]) 314 assert(not isinstance(test, TimeSeries))314 self.failUnless(not isinstance(test, TimeSeries)) 315 315 # 2D series .............................. 316 316 (series2D, data2D) = (self.series2D, self.data2D) 317 317 test = series2D[-1] 318 318 assert_equal(test, data2D[-1].squeeze()) 319 assert(not isinstance(test, TimeSeries))319 self.failUnless(not isinstance(test, TimeSeries)) 320 320 321 321 … … 324 324 def _wslice(series, data, dates): 325 325 test = series[1:2] 326 assert(isinstance(test, TimeSeries))326 self.failUnless(isinstance(test, TimeSeries)) 327 327 assert_equal(test._varshape, series._varshape) 328 328 assert_equal(test._series, data[1:2]) … … 332 332 # 333 333 test = series[:3] 334 assert(isinstance(test, TimeSeries))334 self.failUnless(isinstance(test, TimeSeries)) 335 335 test_series = test._series 336 336 assert_equal(test_series._data, data[:3]._data) … … 350 350 # 351 351 test = series3V[0,:] 352 assert(not isinstance(test, TimeSeries))352 self.failUnless(not isinstance(test, TimeSeries)) 353 353 assert_equal(test, data3V[0,:]) 354 354 assert_equal(test._mask, data3V[0,:]._mask) 355 355 # 356 356 test = series3V[:,0] 357 assert(isinstance(test, TimeSeries))357 self.failUnless(isinstance(test, TimeSeries)) 358 358 assert_equal(test, data3V[:,0]) 359 359 assert_equal(test._mask, data3V[:,0]._mask) … … 363 363 (series2D, data2D) = (self.series2D, self.data2D) 364 364 test = series2D[0] 365 assert(not isinstance(test,TimeSeries))365 self.failUnless(not isinstance(test,TimeSeries)) 366 366 assert_equal(test.shape, (4,5)) 367 367 assert_equal(test, data2D[0]) 368 368 # 369 369 test = series2D[:,:,0] 370 assert(isinstance(test,TimeSeries))370 self.failUnless(isinstance(test,TimeSeries)) 371 371 assert_equal(test, series2D._data[:,:,0]) 372 372 assert_equal(test._dates, series2D._dates) … … 377 377 def _wlist(series, data, dates): 378 378 test = series[[0,1,-1]] 379 assert(isinstance(test, TimeSeries))379 self.failUnless(isinstance(test, TimeSeries)) 380 380 assert_equal(test._series, data[[0,1,-1]]) 381 381 assert_equal(test._mask, data[[0,1,-1]]._mask) … … 398 398 assert_equal(test, data[0]) 399 399 assert_equal(test._mask, data[0]._mask) 400 assert(not isinstance(test, TimeSeries))400 self.failUnless(not isinstance(test, TimeSeries)) 401 401 # Multiple dates as a date_array 402 402 test = series[dates[[0,-1]]] 403 403 assert_equal(test, data[[0,-1]]) 404 assert(isinstance(test, TimeSeries))404 self.failUnless(isinstance(test, TimeSeries)) 405 405 assert_equal(test.dates, dates[[0,-1]]) 406 406 # Multiple dates as a list 407 407 test = series[[dates[0], dates[-1]]] 408 408 assert_equal(test, data[[0,-1]]) 409 assert(isinstance(test, TimeSeries))409 self.failUnless(isinstance(test, TimeSeries)) 410 410 # Multiple dates as a slice 411 411 dslice = slice(dates[1], None, None) 412 412 test = series[dslice] 413 413 assert_equal(test, data[1:]) 414 assert(isinstance(test, TimeSeries))414 self.failUnless(isinstance(test, TimeSeries)) 415 415 #........................................ 416 416 dates = self.dates … … 451 451 assert_equal(test, data[0]) 452 452 assert_equal(test._mask, data[0]._mask) 453 assert(not isinstance(test, TimeSeries))453 self.failUnless(not isinstance(test, TimeSeries)) 454 454 #........................................ 455 455 (series1D, data1D) = (self.series1D, self.data1D) … … 467 467 dates=self.dates.reshape(3,5), freq='D') 468 468 test = trick[0,0] 469 assert(not isinstance(test, TimeSeries))470 assert(test is masked)469 self.failUnless(not isinstance(test, TimeSeries)) 470 self.failUnless(test is masked) 471 471 # 472 472 test = trick[-1,-1] 473 assert(not isinstance(test, TimeSeries))473 self.failUnless(not isinstance(test, TimeSeries)) 474 474 assert_equal(test,14) 475 475 # 476 476 test = trick[0] 477 assert(isinstance(test, TimeSeries))477 self.failUnless(isinstance(test, TimeSeries)) 478 478 assert_equal(test._varshape, ()) 479 479 assert_equal(test,trick._series[0]) … … 777 777 assert_equal(filled_ser.start_date, _start) 778 778 assert_equal(filled_ser.end_date, _end) 779 assert(filled_ser.isfull())780 assert(not filled_ser.has_duplicated_dates())779 self.failUnless(filled_ser.isfull()) 780 self.failUnless(not filled_ser.has_duplicated_dates()) 781 781 assert_equal(filled_ser.size, _end - _start + 1) 782 782 # … … 816 816 assert_equal(series_pickled._data, series._data) 817 817 assert_equal(series_pickled._mask, series._mask) 818 assert(isinstance(series_pickled._data, np.matrix))818 self.failUnless(isinstance(series_pickled._data, np.matrix)) 819 819 820 820 … … 842 842 date_array(start_date=aprilsfool, length=5)) 843 843 844 assert(tseries._timeseriescompat_multiple(seriesM_10, seriesM_10, seriesM_10))844 self.failUnless(tseries._timeseriescompat_multiple(seriesM_10, seriesM_10, seriesM_10)) 845 845 846 846 try: … … 849 849 except: 850 850 exception = True 851 assert(exception)851 self.failUnless(exception) 852 852 853 853 try: … … 856 856 except: 857 857 exception = True 858 assert(exception)858 self.failUnless(exception) 859 859 860 860 try: … … 863 863 except: 864 864 exception = True 865 assert(exception)865 self.failUnless(exception) 866 866 867 867 def test_compressed(self): … … 919 919 smax = series.max() 920 920 #!!!: Used to be a TimeSeries, now is only a scalar 921 # assert(isinstance(smax, TimeSeries))921 # self.failUnless(isinstance(smax, TimeSeries)) 922 922 # assert_equal(smax._dates, date_array(series._dates[-1])) 923 assert(not isinstance(smax, TimeSeries))923 self.failUnless(not isinstance(smax, TimeSeries)) 924 924 assert_equal(smax, 9) 925 925 # 926 926 smin = series.min() 927 927 #!!!: Used to be a TimeSeries, now is only a scalar 928 # assert(isinstance(smin, TimeSeries))928 # self.failUnless(isinstance(smin, TimeSeries)) 929 929 # assert_equal(smin._dates, date_array(series._dates[0])) 930 930 assert_equal(smin, 0) … … 948 948 assert_equal(series.start_date, _pct.start_date) 949 949 assert_equal(series.end_date, _pct.end_date) 950 assert(_pct[0] is masked)950 self.failUnless(_pct[0] is masked) 951 951 assert_equal(_pct[1], 1.0) 952 952 assert_equal(_pct[2], 0.5) … … 960 960 a = time_series([-2,-1,0,1,2], start_date=now('D')) 961 961 z = ma.sqrt(a) 962 assert(isinstance(z,TimeSeries))962 self.failUnless(isinstance(z,TimeSeries)) 963 963 assert_equal(z, [1,1,0,1,np.sqrt(2)]) 964 964 assert_equal(z._mask, [1,1,0,0,0]) … … 1059 1059 test = fseries.view((float,3)) 1060 1060 assert_equal(test._series, dseries) 1061 assert(test._varshape == (3,))1062 # 1063 assert(dseries._varshape == (3,))1061 self.failUnless(test._varshape == (3,)) 1062 # 1063 self.failUnless(dseries._varshape == (3,)) 1064 1064 test = dseries.view(ndtype).squeeze() 1065 1065 assert_equal(test, fseries) 1066 assert(test._varshape == ())1066 self.failUnless(test._varshape == ()) 1067 1067 1068 1068 … … 1084 1084 for method in self.methodlist: 1085 1085 test = getattr(series, method).__call__() 1086 assert(isinstance(test,ts.TimeSeries))1086 self.failUnless(isinstance(test,ts.TimeSeries)) 1087 1087 assert_equal(test, getattr(series._series, method).__call__()) 1088 1088 assert_equal(test._dates, series._dates) … … 1092 1092 for method in self.methodlist: 1093 1093 test = getattr(subseries, method).__call__() 1094 assert(isinstance(test, self.SubTimeSeries))1094 self.failUnless(isinstance(test, self.SubTimeSeries)) 1095 1095 assert_equal(test, getattr(subseries._series, method).__call__()) 1096 1096 assert_equal(test._dates, subseries._dates) … … 1115 1115 (data, series) = self.data 1116 1116 test = series[0] 1117 assert(isinstance(test, MaskedArray))1117 self.failUnless(isinstance(test, MaskedArray)) 1118 1118 assert_equal(test, data[0]) 1119 1119 test = series[1] 1120 assert(isinstance(test, MaskedArray))1120 self.failUnless(isinstance(test, MaskedArray)) 1121 1121 assert_equal(test, data[1]) 1122 1122 test = series[2] 1123 assert(isinstance(test, np.void))1123 self.failUnless(isinstance(test, np.void)) 1124 1124 assert_equal(test, data[2]) 1125 1125 # … … 1127 1127 (data, series) = self.data 1128 1128 test = series['2007-01'] 1129 assert(isinstance(test, MaskedArray))1129 self.failUnless(isinstance(test, MaskedArray)) 1130 1130 assert_equal(test, data[0]) 1131 1131 test = series['2007-02'] 1132 assert(isinstance(test, MaskedArray))1132 self.failUnless(isinstance(test, MaskedArray)) 1133 1133 assert_equal(test, data[1]) 1134 1134 test = series['2007-03'] 1135 assert(isinstance(test, np.void))1135 self.failUnless(isinstance(test, np.void)) 1136 1136 assert_equal(test, data[2]) 1137 1137 trunk/timeseries/scikits/timeseries/tests/test_trecords.py
r1418 r1517 53 53 "Tests fields retrieval" 54 54 [d, m, mrec, dlist, dates, mts, rts] = self.data 55 assert(isinstance(rts['f0'], TimeSeries))56 assert(not isinstance(rts['f0'], TimeSeriesRecords))55 self.failUnless(isinstance(rts['f0'], TimeSeries)) 56 self.failUnless(not isinstance(rts['f0'], TimeSeriesRecords)) 57 57 assert_equal(rts['f0']._dates, dates) 58 58 assert_equal(rts['f0']._data, d) … … 63 63 [d, m, mrec, dlist, dates, mts, rts] = self.data 64 64 test = rts[0] 65 assert(not (isinstance(test, TimeSeriesRecords)))65 self.failUnless(not (isinstance(test, TimeSeriesRecords))) 66 66 assert_equal_records(test, rts._data[0]) 67 67 assert_equal_records(test, mrec._data[0]) 68 68 # We can't use assert_equal here, as it tries to convert the tuple into a singleton 69 # assert(rts[0]._data.view(numpyndarray) == mrec[0])69 # self.failUnless(rts[0]._data.view(numpyndarray) == mrec[0]) 70 70 assert_equal_records(rts._data[0], mrec[0]) 71 71 assert_equal(rts.mask[0], mrec.mask[0]) … … 77 77 # Get item by dates w/ masked values 78 78 test = rts['2007-01'] 79 assert(isinstance(test, ma.MaskedArray))80 assert(not isinstance(test, TimeSeries))79 self.failUnless(isinstance(test, ma.MaskedArray)) 80 self.failUnless(not isinstance(test, TimeSeries)) 81 81 assert_equal_records(test, mrec[0]) 82 82 # Get item by dates w/o masked values 83 83 test = rts['2007-03'] 84 assert(isinstance(test, np.void))84 self.failUnless(isinstance(test, np.void)) 85 85 assert_equal_records(test, mrec[2]) 86 86 … … 88 88 "Tests item retrieval" 89 89 [d, m, mrec, dlist, dates, mts, rts] = self.data 90 assert(isinstance(rts.f0, TimeSeries))91 assert(not isinstance(rts[0], TimeSeriesRecords))90 self.failUnless(isinstance(rts.f0, TimeSeries)) 91 self.failUnless(not isinstance(rts[0], TimeSeriesRecords)) 92 92 assert_equal(rts.f0, time_series(d, dates=dates, mask=m)) 93 93 assert_equal(rts.f1, time_series(d[::-1], dates=dates, mask=m[::-1])) 94 assert((rts._fieldmask == nr.fromarrays([m, m[::-1]])).all())94 self.failUnless((rts._fieldmask == nr.fromarrays([m, m[::-1]])).all()) 95 95 # Was _mask, now is recordmask 96 96 assert_equal(rts.recordmask, np.r_[[m,m[::-1]]].all(0)) … … 100 100 "Tests item retrieval" 101 101 [d, m, mrec, dlist, dates, mts, rts] = self.data 102 assert(isinstance(rts[:2], TimeSeriesRecords))102 self.failUnless(isinstance(rts[:2], TimeSeriesRecords)) 103 103 assert_equal(rts[:2]._data.f0, mrec[:2].f0) 104 104 assert_equal(rts[:2]._data.f1, mrec[:2].f1) … … 164 164 [d, m, mrec, dlist, dates, mts, rts] = self.data 165 165 rts.harden_mask() 166 assert(rts._hardmask)166 self.failUnless(rts._hardmask) 167 167 rts._mask = nomask 168 168 # Was _mask, now is recordmask 169 169 assert_equal(rts.recordmask, np.r_[[m,m[::-1]]].all(0)) 170 170 rts.soften_mask() 171 assert(not rts._hardmask)171 self.failUnless(not rts._hardmask) 172 172 rts._mask = nomask 173 assert(rts['f1']._mask is nomask)173 self.failUnless(rts['f1']._mask is nomask) 174 174 assert_equal(rts['f0']._mask,rts['f1']._mask) 175 175 … … 220 220 # 221 221 dlist = ['2007-%02i' % i for i in (1,2,3,5)] 222 assert(isinstance(mrectxt, TimeSeriesRecords))222 self.failUnless(isinstance(mrectxt, TimeSeriesRecords)) 223 223 assert_equal(mrectxt._dates, date_array(dlist,'M')) 224 224 assert_equal(mrectxt.dtype.names, ['B','C','D','E','F','G'])
