Skip to content

Commit ad297ec

Browse files
committed
Fix in Deletion tests
1 parent 33f9da4 commit ad297ec

9 files changed

+615
-566
lines changed

images/delete_fix-scale.png

-6.47 KB
Loading

images/delete_scale-free.png

173 Bytes
Loading

images/insert.png

-5.34 KB
Loading

images/search_fix-scale.png

-16 Bytes
Loading

images/search_scale-free.png

-220 Bytes
Loading

results/plots.ipynb

Lines changed: 448 additions & 408 deletions
Large diffs are not rendered by default.

results/testDelete.csv

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
11
column,n,mean_time
2-
id,100000,0.00654949460710798
3-
owner_id,100000,0.057452058792114256
4-
creation_date,100000,0.11360363960266114
5-
count,100000,0.04698448181152344
6-
name,100000,0.10896615982055664
7-
content,100000,0.06907668113708496
8-
id,300000,1.8051692417689732e-06
9-
owner_id,300000,0.16179838180541992
10-
creation_date,300000,0.33612542152404784
11-
count,300000,0.14981613159179688
12-
name,300000,0.35507969856262206
13-
content,300000,0.21655702590942383
14-
id,500000,1.7370496477399553e-06
15-
owner_id,500000,0.28446297645568847
16-
creation_date,500000,0.5821346759796142
17-
count,500000,0.25850615501403806
18-
name,500000,0.5756109714508056
19-
content,500000,0.36986145973205564
20-
id,20000,0.0008565698351178851
21-
owner_id,20000,0.009790802001953125
22-
creation_date,20000,0.025079345703125
23-
count,20000,0.009049415588378906
24-
name,20000,0.021918392181396483
25-
content,20000,0.016382169723510743
26-
id,100,2.6226043701171875e-06
27-
owner_id,100,2.541542053222656e-05
28-
creation_date,100,8.740425109863282e-05
29-
count,100,2.226829528808594e-05
30-
name,100,7.996559143066406e-05
31-
content,100,5.3501129150390626e-05
32-
id,200000,1.7370496477399553e-06
33-
owner_id,200000,0.10990662574768066
34-
creation_date,200000,0.22489848136901855
35-
count,200000,0.09971284866333008
36-
name,200000,0.22649974822998048
37-
content,200000,0.14309382438659668
38-
id,400000,1.7370496477399553e-06
39-
owner_id,400000,0.2121037006378174
40-
creation_date,400000,0.44585084915161133
41-
count,400000,0.19271159172058105
42-
name,400000,0.44535346031188966
43-
content,400000,0.28740711212158204
44-
id,1000,7.459095546177455e-06
45-
owner_id,1000,0.00021991729736328124
46-
creation_date,1000,0.0008813381195068359
47-
count,1000,0.00024857521057128904
48-
name,1000,0.0008059024810791015
49-
content,1000,0.0005761146545410156
50-
id,10,1.3623918805803572e-06
51-
owner_id,10,3.337860107421875e-06
52-
creation_date,10,9.107589721679688e-06
53-
count,10,2.765655517578125e-06
54-
name,10,1.0442733764648437e-05
55-
content,10,2.86102294921875e-06
56-
id,10000,0.0002948556627546038
57-
owner_id,10000,0.0036975860595703123
58-
creation_date,10000,0.011717844009399413
59-
count,10000,0.004136991500854492
60-
name,10000,0.01058053970336914
61-
content,10000,0.006476783752441406
62-
id,30000,0.0016283307756696428
63-
owner_id,30000,0.014776086807250977
64-
creation_date,30000,0.032513093948364255
65-
count,30000,0.013608646392822266
66-
name,30000,0.03260383605957031
67-
content,30000,0.019941329956054688
68-
id,50000,0.0028246470860072543
69-
owner_id,50000,0.02672152519226074
70-
creation_date,50000,0.05542078018188477
71-
count,50000,0.024345254898071288
72-
name,50000,0.05539026260375977
73-
content,50000,0.03476495742797851
74-
id,70000,0.00424647331237793
75-
owner_id,70000,0.04093155860900879
76-
creation_date,70000,0.07757434844970704
77-
count,70000,0.033124542236328124
78-
name,70000,0.0811187744140625
79-
content,70000,0.05188398361206055
2+
id,100000,0.006721087864467076
3+
owner_id,100000,0.048990058898925784
4+
creation_date,100000,0.11972846984863281
5+
count,100000,0.04916701316833496
6+
name,100000,0.12057833671569824
7+
content,100000,1.0480459690093995
8+
id,300000,5.517687116350446e-06
9+
owner_id,300000,0.16023082733154298
10+
creation_date,300000,0.34013981819152833
11+
count,300000,0.14931068420410157
12+
name,300000,0.36661782264709475
13+
content,300000,3.1818165302276613
14+
id,500000,4.495893205915179e-06
15+
owner_id,500000,0.2773750782012939
16+
creation_date,500000,0.5747802257537842
17+
count,500000,0.27118191719055174
18+
name,500000,0.6368760108947754
19+
content,500000,5.1766037940979
20+
id,20000,0.0009121554238455636
21+
owner_id,20000,0.008413362503051757
22+
creation_date,20000,0.02013082504272461
23+
count,20000,0.008737659454345703
24+
name,20000,0.023009443283081056
25+
content,20000,0.20256481170654297
26+
id,100,2.792903355189732e-06
27+
owner_id,100,2.2602081298828124e-05
28+
creation_date,100,8.878707885742187e-05
29+
count,100,2.7799606323242186e-05
30+
name,100,0.00011968612670898438
31+
content,100,0.0009763717651367187
32+
id,200000,4.700251988002232e-06
33+
owner_id,200000,0.10815467834472656
34+
creation_date,200000,0.24538545608520507
35+
count,200000,0.10716791152954101
36+
name,200000,0.24146099090576173
37+
content,200000,2.08095121383667
38+
id,400000,8.174351283482143e-06
39+
owner_id,400000,0.21315584182739258
40+
creation_date,400000,0.44944324493408205
41+
count,400000,0.1967994213104248
42+
name,400000,0.4949758052825928
43+
content,400000,4.184220218658448
44+
id,1000,8.54900905064174e-06
45+
owner_id,1000,0.0002666473388671875
46+
creation_date,1000,0.0009359359741210937
47+
count,1000,0.00039353370666503904
48+
name,1000,0.0012720108032226562
49+
content,1000,0.01262679100036621
50+
id,10,1.3283320835658482e-06
51+
owner_id,10,3.147125244140625e-06
52+
creation_date,10,9.918212890625e-06
53+
count,10,4.243850708007813e-06
54+
name,10,1.2063980102539063e-05
55+
content,10,8.27789306640625e-05
56+
id,10000,0.00026914051600864956
57+
owner_id,10000,0.0036082744598388674
58+
creation_date,10000,0.010260534286499024
59+
count,10000,0.003492403030395508
60+
name,10000,0.010916948318481445
61+
content,10000,0.10212554931640624
62+
id,30000,0.0016270365033830916
63+
owner_id,30000,0.013409137725830078
64+
creation_date,30000,0.030630159378051757
65+
count,30000,0.013579177856445312
66+
name,30000,0.03463292121887207
67+
content,30000,0.3050230026245117
68+
id,50000,0.0026151112147739957
69+
owner_id,50000,0.02377662658691406
70+
creation_date,50000,0.05246171951293945
71+
count,50000,0.023035812377929687
72+
name,50000,0.06306900978088378
73+
content,50000,0.5271435737609863
74+
id,70000,0.003913709095546177
75+
owner_id,70000,0.034581995010375975
76+
creation_date,70000,0.07730116844177246
77+
count,70000,0.03211817741394043
78+
name,70000,0.084373140335083
79+
content,70000,0.7216861248016357

results/testSearch.csv

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
11
column,n,mean_time
2-
id,100000,0.006455080849783761
3-
owner_id,100000,0.051258516311645505
4-
creation_date,100000,0.11292042732238769
5-
count,100000,0.04733939170837402
6-
name,100000,0.1253389835357666
7-
content,100000,1.0994341373443604
8-
id,300000,1.6008104596819197e-06
9-
owner_id,300000,0.15957717895507811
10-
creation_date,300000,0.37113542556762696
11-
count,300000,0.1515415668487549
12-
name,300000,0.37494649887084963
13-
content,300000,3.310653734207153
14-
id,500000,1.464571271623884e-06
15-
owner_id,500000,0.28829183578491213
16-
creation_date,500000,0.5887864112854004
17-
count,500000,0.26134538650512695
18-
name,500000,0.6586446762084961
19-
content,500000,5.493100881576538
20-
id,20000,0.0008778231484549386
21-
owner_id,20000,0.013036823272705078
22-
creation_date,20000,0.026267480850219727
23-
count,20000,0.010844564437866211
24-
name,20000,0.02614560127258301
25-
content,20000,0.2155996322631836
26-
id,100,2.1117074148995537e-06
27-
owner_id,100,2.2172927856445312e-05
28-
creation_date,100,0.00011429786682128906
29-
count,100,4.601478576660156e-05
30-
name,100,0.00010008811950683594
31-
content,100,0.001196908950805664
2+
id,100000,0.005770206451416016
3+
owner_id,100000,0.0470736026763916
4+
creation_date,100000,0.10545578002929687
5+
count,100000,0.04377865791320801
6+
name,100000,0.12106904983520508
7+
content,100000,1.1050135612487793
8+
id,300000,1.4986310686383928e-06
9+
owner_id,300000,0.16964759826660156
10+
creation_date,300000,0.3462372779846191
11+
count,300000,0.1439657211303711
12+
name,300000,0.3670407772064209
13+
content,300000,3.400286817550659
14+
id,500000,1.6008104596819197e-06
15+
owner_id,500000,0.2642504692077637
16+
creation_date,500000,0.6296487331390381
17+
count,500000,0.2717846393585205
18+
name,500000,0.7065763950347901
19+
content,500000,5.8313642024993895
20+
id,20000,0.0009464536394391741
21+
owner_id,20000,0.011556196212768554
22+
creation_date,20000,0.023891115188598634
23+
count,20000,0.01156148910522461
24+
name,20000,0.029230690002441405
25+
content,20000,0.22883892059326172
26+
id,100,2.0776476178850445e-06
27+
owner_id,100,2.193450927734375e-05
28+
creation_date,100,8.215904235839844e-05
29+
count,100,2.3317337036132812e-05
30+
name,100,9.322166442871094e-05
31+
content,100,0.0010436058044433593
3232
id,200000,1.430511474609375e-06
33-
owner_id,200000,0.110359525680542
34-
creation_date,200000,0.2269960403442383
35-
count,200000,0.1008213996887207
36-
name,200000,0.24417924880981445
37-
content,200000,2.100443410873413
38-
id,400000,1.7711094447544643e-06
39-
owner_id,400000,0.21619963645935059
40-
creation_date,400000,0.4486344337463379
41-
count,400000,0.19620509147644044
42-
name,400000,0.48758783340454104
43-
content,400000,4.233028554916382
44-
id,1000,7.527215140206474e-06
45-
owner_id,1000,0.00023045539855957032
46-
creation_date,1000,0.0008696556091308594
47-
count,1000,0.00025634765625
48-
name,1000,0.0009286880493164062
49-
content,1000,0.01448369026184082
50-
id,10,1.0899135044642857e-06
51-
owner_id,10,2.8133392333984377e-06
52-
creation_date,10,1.850128173828125e-05
53-
count,10,5.4836273193359375e-06
54-
name,10,1.683235168457031e-05
55-
content,10,0.00011510848999023438
56-
id,10000,0.00032097952706473213
57-
owner_id,10000,0.0042116641998291016
58-
creation_date,10000,0.012520074844360352
59-
count,10000,0.004501819610595703
60-
name,10000,0.013375997543334961
61-
content,10000,0.10860114097595215
62-
id,30000,0.0015824181692940848
63-
owner_id,30000,0.014638185501098633
64-
creation_date,30000,0.032704830169677734
65-
count,30000,0.013803672790527344
66-
name,30000,0.03599767684936524
67-
content,30000,0.32141571044921874
68-
id,50000,0.0028460706983293805
69-
owner_id,50000,0.02648649215698242
70-
creation_date,50000,0.056369686126708986
71-
count,50000,0.02480759620666504
72-
name,50000,0.061040830612182614
73-
content,50000,0.5247663021087646
74-
id,70000,0.004266432353428432
75-
owner_id,70000,0.03673543930053711
76-
creation_date,70000,0.0781977653503418
77-
count,70000,0.03402528762817383
78-
name,70000,0.08449106216430664
79-
content,70000,0.7480119228363037
33+
owner_id,200000,0.10898423194885254
34+
creation_date,200000,0.23556933403015137
35+
count,200000,0.11566371917724609
36+
name,200000,0.2512155532836914
37+
content,200000,2.268191623687744
38+
id,400000,1.873288835797991e-06
39+
owner_id,400000,0.21696820259094238
40+
creation_date,400000,0.4754892349243164
41+
count,400000,0.1935953140258789
42+
name,400000,0.5081057071685791
43+
content,400000,4.575881290435791
44+
id,1000,8.480889456612723e-06
45+
owner_id,1000,0.00024080276489257812
46+
creation_date,1000,0.001108837127685547
47+
count,1000,0.00026268959045410155
48+
name,1000,0.001164388656616211
49+
content,1000,0.01578965187072754
50+
id,10,9.87734113420759e-07
51+
owner_id,10,2.765655517578125e-06
52+
creation_date,10,1.3399124145507813e-05
53+
count,10,5.245208740234375e-06
54+
name,10,1.749992370605469e-05
55+
content,10,0.00016379356384277344
56+
id,10000,0.0003441401890345982
57+
owner_id,10000,0.003775358200073242
58+
creation_date,10000,0.010958003997802734
59+
count,10000,0.004416275024414063
60+
name,10000,0.01277608871459961
61+
content,10000,0.11694650650024414
62+
id,30000,0.00152414185660226
63+
owner_id,30000,0.015152549743652344
64+
creation_date,30000,0.03380451202392578
65+
count,30000,0.015039300918579102
66+
name,30000,0.04058027267456055
67+
content,30000,0.3316699981689453
68+
id,50000,0.003354242869785854
69+
owner_id,50000,0.03157243728637695
70+
creation_date,50000,0.06164078712463379
71+
count,50000,0.029285764694213866
72+
name,50000,0.06628870964050293
73+
content,50000,0.5587380409240723
74+
id,70000,0.004652500152587891
75+
owner_id,70000,0.03904666900634766
76+
creation_date,70000,0.08145556449890137
77+
count,70000,0.03491196632385254
78+
name,70000,0.08651137351989746
79+
content,70000,0.7962223052978515

tests/testDelete.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@
2525
f.write('column,n,mean_time\n')
2626

2727
for i in n:
28-
datagrid = DataGrid()
29-
datagrid.read_csv(f'../data/fake_data{i}.csv')
30-
3128
for column in columns:
3229
if column == 'id':
3330
times = []
3431
for id in ids:
32+
datagrid = DataGrid()
33+
datagrid.read_csv(f'../data/fake_data{i}.csv')
3534
start_time = time.time()
3635

3736
datagrid.delete_row(column, id)
@@ -47,6 +46,8 @@
4746
elif column == 'owner_id':
4847
times = []
4948
for owner_id in owner_ids:
49+
datagrid = DataGrid()
50+
datagrid.read_csv(f'../data/fake_data{i}.csv')
5051
start_time = time.time()
5152

5253
datagrid.delete_row(column, owner_id)
@@ -62,6 +63,8 @@
6263
elif column == 'creation_date':
6364
times = []
6465
for creation_date in creation_dates:
66+
datagrid = DataGrid()
67+
datagrid.read_csv(f'../data/fake_data{i}.csv')
6568
start_time = time.time()
6669

6770
datagrid.delete_row(column, creation_date)
@@ -77,6 +80,8 @@
7780
elif column == 'count':
7881
times = []
7982
for count in counts:
83+
datagrid = DataGrid()
84+
datagrid.read_csv(f'../data/fake_data{i}.csv')
8085
start_time = time.time()
8186

8287
datagrid.delete_row(column, count)
@@ -92,6 +97,8 @@
9297
elif column == 'name':
9398
times = []
9499
for name in names:
100+
datagrid = DataGrid()
101+
datagrid.read_csv(f'../data/fake_data{i}.csv')
95102
start_time = time.time()
96103

97104
datagrid.delete_row(column, name)
@@ -107,6 +114,8 @@
107114
elif column == 'content':
108115
times = []
109116
for content in contents:
117+
datagrid = DataGrid()
118+
datagrid.read_csv(f'../data/fake_data{i}.csv')
110119
start_time = time.time()
111120

112121
datagrid.delete_row(column, content)

0 commit comments

Comments
 (0)