@@ -2272,7 +2272,7 @@ def test_remove_where(self):
2272
2272
2273
2273
# try to remove non-table (with crit)
2274
2274
# non-table ok (where = None)
2275
- wp = tm .makePanel ()
2275
+ wp = tm .makePanel (30 )
2276
2276
store .put ('wp' , wp , format = 'table' )
2277
2277
store .remove ('wp' , ["minor_axis=['A', 'D']" ])
2278
2278
rs = store .select ('wp' )
@@ -2303,59 +2303,66 @@ def test_remove_startstop(self):
2303
2303
2304
2304
with ensure_clean_store (self .path ) as store :
2305
2305
2306
- wp = tm .makePanel ()
2306
+ wp = tm .makePanel (30 )
2307
2307
2308
2308
# start
2309
+ _maybe_remove (store , 'wp1' )
2309
2310
store .put ('wp1' , wp , format = 't' )
2310
2311
n = store .remove ('wp1' , start = 32 )
2311
- #assert (n == 120-32)
2312
+ self . assertTrue (n == 120 - 32 )
2312
2313
result = store .select ('wp1' )
2313
2314
expected = wp .reindex (major_axis = wp .major_axis [:32 // 4 ])
2314
2315
assert_panel_equal (result , expected )
2315
2316
2317
+ _maybe_remove (store , 'wp2' )
2316
2318
store .put ('wp2' , wp , format = 't' )
2317
2319
n = store .remove ('wp2' , start = - 32 )
2318
- #assert (n == 32)
2320
+ self . assertTrue (n == 32 )
2319
2321
result = store .select ('wp2' )
2320
2322
expected = wp .reindex (major_axis = wp .major_axis [:- 32 // 4 ])
2321
2323
assert_panel_equal (result , expected )
2322
2324
2323
2325
# stop
2326
+ _maybe_remove (store , 'wp3' )
2324
2327
store .put ('wp3' , wp , format = 't' )
2325
2328
n = store .remove ('wp3' , stop = 32 )
2326
- #assert (n == 32)
2329
+ self . assertTrue (n == 32 )
2327
2330
result = store .select ('wp3' )
2328
2331
expected = wp .reindex (major_axis = wp .major_axis [32 // 4 :])
2329
2332
assert_panel_equal (result , expected )
2330
2333
2334
+ _maybe_remove (store , 'wp4' )
2331
2335
store .put ('wp4' , wp , format = 't' )
2332
2336
n = store .remove ('wp4' , stop = - 32 )
2333
- #assert (n == 120-32)
2337
+ self . assertTrue (n == 120 - 32 )
2334
2338
result = store .select ('wp4' )
2335
2339
expected = wp .reindex (major_axis = wp .major_axis [- 32 // 4 :])
2336
2340
assert_panel_equal (result , expected )
2337
2341
2338
2342
# start n stop
2343
+ _maybe_remove (store , 'wp5' )
2339
2344
store .put ('wp5' , wp , format = 't' )
2340
2345
n = store .remove ('wp5' , start = 16 , stop = - 16 )
2341
- #assert (n == 120-32)
2346
+ self . assertTrue (n == 120 - 32 )
2342
2347
result = store .select ('wp5' )
2343
2348
expected = wp .reindex (major_axis = wp .major_axis [:16 // 4 ]+ wp .major_axis [- 16 // 4 :])
2344
2349
assert_panel_equal (result , expected )
2345
2350
2351
+ _maybe_remove (store , 'wp6' )
2346
2352
store .put ('wp6' , wp , format = 't' )
2347
2353
n = store .remove ('wp6' , start = 16 , stop = 16 )
2348
- #assert (n == 0)
2354
+ self . assertTrue (n == 0 )
2349
2355
result = store .select ('wp6' )
2350
2356
expected = wp .reindex (major_axis = wp .major_axis )
2351
2357
assert_panel_equal (result , expected )
2352
2358
2353
2359
# with where
2360
+ _maybe_remove (store , 'wp7' )
2354
2361
date = wp .major_axis .take (np .arange (0 ,30 ,3 ))
2355
2362
crit = Term ('major_axis=date' )
2356
2363
store .put ('wp7' , wp , format = 't' )
2357
2364
n = store .remove ('wp7' , where = [crit ], stop = 80 )
2358
- #assert (n == 28)
2365
+ self . assertTrue (n == 28 )
2359
2366
result = store .select ('wp7' )
2360
2367
expected = wp .reindex (major_axis = wp .major_axis - wp .major_axis [np .arange (0 ,20 ,3 )])
2361
2368
assert_panel_equal (result , expected )
@@ -2364,9 +2371,10 @@ def test_remove_crit(self):
2364
2371
2365
2372
with ensure_clean_store (self .path ) as store :
2366
2373
2367
- wp = tm .makePanel ()
2374
+ wp = tm .makePanel (30 )
2368
2375
2369
2376
# group row removal
2377
+ _maybe_remove (store , 'wp3' )
2370
2378
date4 = wp .major_axis .take ([0 , 1 , 2 , 4 , 5 , 6 , 8 , 9 , 10 ])
2371
2379
crit4 = Term ('major_axis=date4' )
2372
2380
store .put ('wp3' , wp , format = 't' )
@@ -2377,6 +2385,7 @@ def test_remove_crit(self):
2377
2385
assert_panel_equal (result , expected )
2378
2386
2379
2387
# upper half
2388
+ _maybe_remove (store , 'wp' )
2380
2389
store .put ('wp' , wp , format = 'table' )
2381
2390
date = wp .major_axis [len (wp .major_axis ) // 2 ]
2382
2391
@@ -2394,6 +2403,7 @@ def test_remove_crit(self):
2394
2403
assert_panel_equal (result , expected )
2395
2404
2396
2405
# individual row elements
2406
+ _maybe_remove (store , 'wp2' )
2397
2407
store .put ('wp2' , wp , format = 'table' )
2398
2408
2399
2409
date1 = wp .major_axis [1 :3 ]
@@ -2420,6 +2430,7 @@ def test_remove_crit(self):
2420
2430
assert_panel_equal (result , expected )
2421
2431
2422
2432
# corners
2433
+ _maybe_remove (store , 'wp4' )
2423
2434
store .put ('wp4' , wp , format = 'table' )
2424
2435
n = store .remove (
2425
2436
'wp4' , where = [Term ('major_axis>wp.major_axis[-1]' )])
0 commit comments