Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve CellArray.

Browse Source
This commit is contained in:
Arkshine
2014-07-25 00:25:31 +02:00
parent 0b7bc23a30
commit 42fa547cb4
9 changed files with 1299 additions and 1166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

679
plugins/testsuite/arraytest.sma
View File

@ -24,39 +24,39 @@ new TestWords[6][] = {
"!="
};
stock test(any:A,any:B=0,TestType:Type=TT_Equal)
stock test(any:A, any:B = 0, TestType:Type = TT_Equal)
{
++__testnumber;
new passed=0;
switch (Type)
{
case TT_Equal: if (A==B) passed=1;
case TT_LessThan: if (A<B) passed=1;
case TT_GreaterThan: if (A>B) passed=1;
case TT_LessThanEqual: if (A<=B) passed=1;
case TT_GreaterThanEqual: if (A>=B) passed=1;
case TT_NotEqual: if (A!=B) passed=1;
case TT_Equal: if (A == B) passed = 1;
case TT_LessThan: if (A < B) passed = 1;
case TT_GreaterThan: if (A > B) passed = 1;
case TT_LessThanEqual: if (A <= B) passed = 1;
case TT_GreaterThanEqual: if (A >= B) passed = 1;
case TT_NotEqual: if (A != B) passed =1;
}
if (!passed)
{
log_amx("Failed test #%d (%d %s %d)",__testnumber,A,TestWords[_:Type],B);
log_amx("Failed test #%d (%d %s %d)", __testnumber, A, TestWords[_:Type], B);
errcount++;
}
}
stock starttests(const startfunc[])
{
__testnumber=0;
errcount=0;
__testfuncnum=1;
__testnumber = 0;
errcount = 0;
__testfuncnum = 1;
server_print("Starting tests...");
formatex(__testfunc,sizeof(__testfunc)-1,"%s",startfunc);
formatex(__testfunc, charsmax(__testfunc), "%s", startfunc);
new func[32];
formatex(func,sizeof(func)-1,"%s%d",__testfunc,__testfuncnum++);
set_task(0.1,func);
formatex(func, charsmax(func), "%s%d", __testfunc, __testfuncnum++);
set_task(0.1, func);
}
stock showres()
@ -64,16 +64,16 @@ stock showres()
if (errcount==0)
{
new func[32];
formatex(func,sizeof(func)-1,"%s%d",__testfunc,__testfuncnum++);
if (get_func_id(func)==-1)
formatex(func, charsmax(func), "%s%d", __testfunc, __testfuncnum++);
if (get_func_id(func) == -1)
{
server_print("All tests ok!");
}
else
{
server_print("Test ok, moving on...");
set_task(0.1,func);
set_task(0.1, func);
}
}
else
@ -96,134 +96,128 @@ public arraytest()
public arraytest1()
{
server_print("Testing 1000 iterations of 1-cell arrays...");
new Float:f;
new Array:a=ArrayCreate(1);
new Array:a = ArrayCreate(1);
if (a == Invalid_Array)
{
}
for (new i=0; i<1000; i++)
for (new i = 0; i < 1000; i++)
{
f=float(i);
f = float(i);
ArrayPushCell(a,f);
}
new Float:r;
for (new i=0; i<1000; i++)
for (new i = 0; i < 1000; i++)
{
f=float(i);
r=Float:ArrayGetCell(a, i);
f = float(i);
r = Float:ArrayGetCell(a, i);
// This is normally bad for float "casting", but in this case it should be fine.
test(_:f, _:r);
// Reset with inversed values
new g=_:f;
g=~g;
ArraySetCell(a, i, g);
r=Float:ArrayGetCell(a,i);
r = Float:ArrayGetCell(a,i);
test(g, _:r);
}
ArrayDestroy(a);
showres();
}
stock bool:checkarray(const a[], const b[], size)
{
while (size--)
{
if (a[size]!=b[size])
if (a[size] != b[size])
{
return false;
}
}
return true;
}
stock invarray(a[],size)
{
while (size--)
{
a[size] = ~a[size];
}
}
public arraytest2()
{
server_print("Testing 1000 iterations of 40-cell arrays...");
new Array:a=ArrayCreate(40);
new Array:a = ArrayCreate(40);
new buff[40];
new buffb[40];
for (new i=0; i<1000; i++)
{
arrayset(buff,i,sizeof(buff));
ArrayPushArray(a, buff);
}
for (new i=0; i<1000; i++)
for (new i = 0; i < 1000; i++)
{
arrayset(buff, i, sizeof(buff));
ArrayGetArray(a, i, buffb);
test(_:checkarray(buff,buffb,sizeof(buff)),1);
// Now overwrite the array with inversed value
invarray(buff,sizeof(buff));
ArraySetArray(a, i, buff);
ArrayGetArray(a, i, buffb);
test(_:checkarray(buff,buffb,sizeof(buff)),1);
ArrayPushArray(a, buff);
}
for (new i = 0; i < 1000; i++)
{
arrayset(buff, i, sizeof(buff));
ArrayGetArray(a, i, buffb);
test(_:checkarray(buff, buffb, sizeof(buff)), 1);
// Now overwrite the array with inversed value
invarray(buff, sizeof(buff));
ArraySetArray(a, i, buff);
ArrayGetArray(a, i, buffb);
test(_:checkarray(buff, buffb, sizeof(buff)), 1);
}
ArrayDestroy(a);
showres();
}
public arraytest3()
{
server_print("Testing 1000 iterations of strings...");
// The string is 10 long, the string we're trying to pass is 20 long.
new Array:a=ArrayCreate(10);
new buff[20]="1234567890abcdefghi";
new Array:a = ArrayCreate(10);
new buff[20] = "1234567890abcdefghi";
new buffb[20];
for (new i=0; i<1000; i++)
for (new i = 0; i < 1000; i++)
{
ArrayPushString(a, buff);
}
for (new i=0; i<1000; i++)
for (new i = 0; i < 1000; i++)
{
ArrayGetString(a, i, buffb, sizeof(buffb)-1);
ArrayGetString(a, i, buffb, charsmax(buffb));
test(strcmp(buffb,"123456789"),0);
ArraySetString(a, i, "9876543210");
ArrayGetString(a, i, buffb, sizeof(buffb)-1);
ArrayGetString(a, i, buffb, charsmax(buffb));
test(strcmp(buffb,"987654321"),0);
buffb[0]=0;
formatex(buffb,sizeof(buffb)-1,"%a", ArrayGetStringHandle(a, i));
buffb[0] = EOS;
formatex(buffb, charsmax(buffb),"%a", ArrayGetStringHandle(a, i));
test(strcmp(buffb, "987654321"),0);
}
ArrayDestroy(a);
showres();
}
@ -231,17 +225,19 @@ public sortcallback(Array:a, b, c)
{
static stra[40];
static strb[40];
ArrayGetString(a, b, stra, sizeof(stra)-1);
ArrayGetString(a, c, strb, sizeof(strb)-1);
ArrayGetString(a, b, stra, charsmax(stra));
ArrayGetString(a, c, strb, charsmax(strb));
return strcmp(stra,strb);
}
public arraytest4()
{
server_print("Testing sorting function...");
new Array:a=ArrayCreate(40);
new Array:a = ArrayCreate(40);
ArrayPushString(a, "z");
ArrayPushString(a, "yz");
ArrayPushString(a, "xyz");
@ -268,203 +264,286 @@ public arraytest4()
ArrayPushString(a, "cdefghijklmnopqrstuvwxyz");
ArrayPushString(a, "bcdefghijklmnopqrstuvwxyz");
ArrayPushString(a, "abcdefghijklmnopqrstuvwxyz");
new OldSize=ArraySize(a);
new OldSize = ArraySize(a);
ArraySort(a, "sortcallback");
test(ArraySize(a),OldSize);
test(ArraySize(a), OldSize);
new buff[40];
ArrayGetString(a,0,buff,sizeof(buff)-1);
ArrayGetString(a, 0, buff, charsmax(buff));
test(strcmp(buff,"abcdefghijklmnopqrstuvwxyz"),0);
ArrayGetString(a,25,buff,sizeof(buff)-1);
test(strcmp(buff,"z"),0);
new start='a';
for (new i=0;i<OldSize;i++)
ArrayGetString(a, 25, buff, charsmax(buff));
test(strcmp(buff, "z"), 0);
new start = 'a';
for (new i = 0; i < OldSize; i++)
{
ArrayGetString(a,i,buff,sizeof(buff)-1)
test(buff[0],start++);
ArrayGetString(a, i, buff, charsmax(buff));
test(buff[0], start++);
}
showres();
}
public arraytest5()
{
server_print("Testing ArrayDeleteItem()...");
new Array:a=ArrayCreate(1);
new Array:a = ArrayCreate(1);
new v;
for (new i=0; i<1000; i++)
for (new i = 0; i < 1000; i++)
{
ArrayPushCell(a, i);
}
for (new i=ArraySize(a) - 1; i>=0 ; i--)
for (new i = ArraySize(a) - 1; i >= 0; i--)
{
if (i % 2 == 0)
{
ArrayDeleteItem(a, i);
}
}
test(ArraySize(a), 500);
for (new i=0; i< 500; i++)
for (new i = 0; i < 500; i++)
{
v=ArrayGetCell(a, i);
v = ArrayGetCell(a, i);
// All items should be incrementing odd numbers
test(((i + 1) * 2) - 1, v);
// All remaining entries should be odd
test((v & 1), 1);
}
ArrayDestroy(a);
a=ArrayCreate(1);
a = ArrayCreate(1);
// Repeat the same test, but check even numbers
for (new i=0; i<1000; i++)
for (new i = 0; i < 1000; i++)
{
ArrayPushCell(a, i);
}
for (new i=ArraySize(a) - 1; i>=0 ; i--)
for (new i = ArraySize(a) - 1; i >= 0 ; i--)
{
if (i % 2 == 1)
{
ArrayDeleteItem(a, i);
}
}
test(ArraySize(a), 500);
for (new i=0; i< 500; i++)
for (new i = 0; i < 500; i++)
{
v=ArrayGetCell(a, i);
v = ArrayGetCell(a, i);
// All items should be incrementing even numbers
test(((i + 1) * 2) - 2, v);
// All remaining entries should be even
test((v & 1), 0);
}
ArrayDestroy(a);
showres();
}
public arraytest6()
{
server_print("Testing ArrayInsertCellAfter()...");
new Array:a=ArrayCreate(1);
for (new i=0; i<10;i++)
new Array:a = ArrayCreate(1);
for (new i = 0; i < 10;i++)
{
ArrayPushCell(a, i);
new item=ArraySize(a)-1;
for (new j=0; j<10; j++)
new item = ArraySize(a) - 1;
for (new j = 0; j < 10; j++)
{
ArrayInsertCellAfter(a, item + j, j);
}
}
test(ArraySize(a), 110);
new v;
for (new i=0; i<110; i++)
for (new i = 0; i < 110; i++)
{
v=ArrayGetCell(a, i);
v = ArrayGetCell(a, i);
test(v, i / 10);
for (new j=0; j<10; j++)
for (new j = 0; j < 10; j++)
{
v=ArrayGetCell(a, ++i);
v = ArrayGetCell(a, ++i);
test(v, j);
}
}
ArrayDestroy(a);
showres();
}
public arraytest7()
{
server_print("Testing ArrayInsertCellBefore()...");
server_print("Testing ArrayInsertStringAfter()...");
new Array:a = ArrayCreate(4);
new buffer[4];
new Array:a=ArrayCreate(1);
for (new i=0; i<10;i++)
for (new i = 0; i < 10;i++)
{
ArrayPushCell(a, i);
new item=ArraySize(a)-1;
for (new j=0; j<10; j++)
formatex(buffer, charsmax(buffer), "%d", i);
ArrayPushString(a, buffer);
new item = ArraySize(a) - 1;
for (new j = 0; j < 10; j++)
{
formatex(buffer, charsmax(buffer), "%d", j);
ArrayInsertStringAfter(a, item + j, buffer);
}
}
test(ArraySize(a), 110);
for (new i = 0; i < 110; i++)
{
ArrayGetString(a, i, buffer, charsmax(buffer));
test(str_to_num(buffer), i / 10);
for (new j = 0; j < 10; j++)
{
ArrayGetString(a, ++i, buffer, charsmax(buffer));
test(str_to_num(buffer), j);
}
}
ArrayDestroy(a);
showres();
}
public arraytest8()
{
server_print("Testing ArrayInsertCellBefore()...");
new Array:a = ArrayCreate(1);
for (new i = 0; i < 10; i++)
{
new item = ArrayPushCell(a, i);
for (new j = 0; j < 10; j++)
{
ArrayInsertCellBefore(a, item, j);
}
}
test(ArraySize(a), 110);
new v;
for (new i=0; i<110; i++)
for (new i = 0; i < 110; i++)
{
for (new j=9; j>=0; j--)
for (new j = 9; j >= 0; j--)
{
v=ArrayGetCell(a, i++);
test(v, j);
test(ArrayGetCell(a, i++), j);
}
v=ArrayGetCell(a, i);
test(v, (i - 10) / 10);
test(ArrayGetCell(a, i), (i - 10) / 10);
}
ArrayDestroy(a);
showres();
}
public arraytest8()
{
server_print("Testing ArraySwap()...");
new Array:a=ArrayCreate(1);
for (new i=0; i<10; i++)
{
ArrayPushCell(a, i);
}
for (new i=0; i<5; i++)
{
ArraySwap(a, i, (10 - (i + 1)));
}
new v;
for (new i=0; i<5; i++)
{
v=ArrayGetCell(a, i);
test(v, (10 - (i + 1)));
}
ArrayDestroy(a);
showres();
}
public sortcallbackex_string(Array:a, const b[], const c[], d)
{
return strcmp(b,c);
}
public arraytest9()
{
server_print("Testing ArrayInsertStringBefore()...");
new buffer[4];
new Array:a = ArrayCreate(4);
for (new i = 0; i < 10; i++)
{
formatex(buffer, charsmax(buffer), "%d", i);
new item = ArrayPushString(a, buffer);
for (new j = 0; j < 10; j++)
{
formatex(buffer, charsmax(buffer), "%d", j);
ArrayInsertStringBefore(a, item, buffer);
}
}
test(ArraySize(a), 110);
for (new i = 0; i < 110; i++)
{
for (new j = 9; j >= 0; j--)
{
ArrayGetString(a, i++, buffer, charsmax(buffer));
test(str_to_num(buffer), j);
}
ArrayGetString(a, i, buffer, charsmax(buffer));
test(str_to_num(buffer), (i - 10) / 10);
}
ArrayDestroy(a);
showres();
}
public arraytest10()
{
server_print("Testing ArraySwap()...");
new Array:a = ArrayCreate(1);
for (new i = 0; i < 10; i++)
{
ArrayPushCell(a, i);
}
for (new i = 0; i < 5; i++)
{
ArraySwap(a, i, (10 - (i + 1)));
}
new v;
for (new i = 0; i < 5; i++)
{
v = ArrayGetCell(a, i);
test(v, (10 - (i + 1)));
}
ArrayDestroy(a);
showres();
}
public Sortcallbackex_string(Array:a, const b[], const c[], d)
{
return strcmp(b, c);
}
public arraytest11()
{
server_print("Testing (new) sorting function with string...");
new Array:a=ArrayCreate(40);
new Array:a = ArrayCreate(40);
ArrayPushString(a, "z");
ArrayPushString(a, "yz");
ArrayPushString(a, "xyz");
@ -491,48 +570,44 @@ public arraytest9()
ArrayPushString(a, "cdefghijklmnopqrstuvwxyz");
ArrayPushString(a, "bcdefghijklmnopqrstuvwxyz");
ArrayPushString(a, "abcdefghijklmnopqrstuvwxyz");
new OldSize=ArraySize(a);
ArraySortEx(a, "sortcallbackex_string");
test(ArraySize(a),OldSize);
new OldSize = ArraySize(a);
ArraySortEx(a, "Sortcallbackex_string");
test(ArraySize(a), OldSize);
new buff[40];
ArrayGetString(a,0,buff,sizeof(buff)-1);
ArrayGetString(a, 0, buff, charsmax(buff));
test(strcmp(buff, "abcdefghijklmnopqrstuvwxyz"), 0);
test(strcmp(buff,"abcdefghijklmnopqrstuvwxyz"),0);
ArrayGetString(a,25,buff,sizeof(buff)-1);
test(strcmp(buff,"z"),0);
ArrayGetString(a, 25, buff, charsmax(buff));
test(strcmp(buff, "z"),0);
new start='a';
for (new i=0;i<OldSize;i++)
new start = 'a';
for (new i = 0; i < OldSize; i++)
{
ArrayGetString(a,i,buff,sizeof(buff)-1)
test(buff[0],start++);
ArrayGetString(a, i, buff, charsmax(buff))
test(buff[0], start++);
}
ArrayDestroy(a);
showres();
}
public sortcallbackex_int(Array:a, const b, const c, d)
public Sortcallbackex_int(Array:a, const b, const c, d)
{
return b < c ? -1 : 1;
}
public arraytest10()
public arraytest12()
{
server_print("Testing (new) sorting function with integer...");
new Array:a=ArrayCreate(1);
new Array:a = ArrayCreate(1);
ArrayPushCell(a, 8);
ArrayPushCell(a, 1);
ArrayPushCell(a, 3);
@ -543,76 +618,19 @@ public arraytest10()
ArrayPushCell(a, 4);
ArrayPushCell(a, 10);
ArrayPushCell(a, 6);
new OldSize=ArraySize(a);
ArraySortEx(a, "sortcallbackex_int");
test(ArraySize(a),OldSize);
test(ArrayGetCell(a, 0),1);
test(ArrayGetCell(a, 9),10);
new OldSize = ArraySize(a);
for (new i=0;i<OldSize;i++)
ArraySortEx(a, "Sortcallbackex_int");
test(ArraySize(a), OldSize);
test(ArrayGetCell(a, 0), 1);
test(ArrayGetCell(a, 9), 10);
for (new i = 0; i < OldSize; i++)
{
test(ArrayGetCell(a, i),i+1);
test(ArrayGetCell(a, i), i+1);
}
ArrayDestroy(a);
showres();
}
public arraytest11()
{
server_print("Testing cloning function...");
new Array:a = ArrayCreate(1);
ArrayPushCell(a, 42);
ArrayPushCell(a, 9);
ArrayPushCell(a, -1);
ArrayPushCell(a, 0);
ArrayPushCell(a, 5);
ArrayPushCell(a, 10);
ArrayPushCell(a, 15);
ArrayPushCell(a, 6.5);
new Array:b = ArrayClone(a);
ArrayPushCell(b, 48);
ArrayPushCell(b, 3.14);
test(a, b, TT_NotEqual);
test(ArraySize(a), ArraySize(b) - 2);
test(ArrayGetCell(b, 0), 42);
test(ArrayGetCell(b, 2), -1);
test(ArrayGetCell(b, 7), 6.5);
test(ArrayGetCell(b, 9), 3.14);
ArrayDestroy(a);
ArrayDestroy(b);
showres();
}
public arraytest12()
{
server_print("Testing resizing function...");
new Array:a = ArrayCreate(16);
ArrayPushString(a, "egg");
ArrayResize(a, 50);
ArrayPushString(a, "boileregg");
ArraySetString(a, 50, "no more egg v2");
new buffer[16];
ArrayGetString(a, 50, buffer, charsmax(buffer));
test(ArraySize(a), 50 + 1);
test(strcmp(buffer, "no more egg v2"), 0);
ArrayDestroy(a);
@ -621,10 +639,67 @@ public arraytest12()
public arraytest13()
{
server_print("Testing finding string in array...");
server_print("Testing cloning function...");
new Array:a = ArrayCreate(1);
ArrayPushCell(a, 42);
ArrayPushCell(a, 9);
ArrayPushCell(a, -1);
ArrayPushCell(a, 0);
ArrayPushCell(a, 5);
ArrayPushCell(a, 10);
ArrayPushCell(a, 15);
ArrayPushCell(a, 6.5);
new Array:b = ArrayClone(a);
ArrayPushCell(b, 48);
ArrayPushCell(b, 3.14);
test(a, b, TT_NotEqual);
test(ArraySize(a), ArraySize(b) - 2);
test(ArrayGetCell(b, 0), 42);
test(ArrayGetCell(b, 2), -1);
test(ArrayGetCell(b, 7), 6.5);
test(ArrayGetCell(b, 9), 3.14);
ArrayDestroy(a);
ArrayDestroy(b);
showres();
}
public arraytest14()
{
server_print("Testing resizing function...");
new Array:a = ArrayCreate(16);
ArrayPushString(a, "egg");
ArrayResize(a, 50);
ArrayPushString(a, "boileregg");
ArraySetString(a, 50, "no more egg v2");
new buffer[16];
ArrayGetString(a, 50, buffer, charsmax(buffer));
test(ArraySize(a), 50 + 1);
test(strcmp(buffer, "no more egg v2"), 0);
ArrayDestroy(a);
showres();
}
public arraytest15()
{
server_print("Testing finding string in array...");
new Array:a = ArrayCreate(16);
ArrayPushString(a, "z");
ArrayPushString(a, "egg");
ArrayPushString(a, "boilerplate");
@ -632,36 +707,36 @@ public arraytest13()
ArrayPushString(a, "something");
ArrayPushString(a, "");
ArrayPushString(a, "eggeggeggeggeggeggegg");
test(ArrayFindString(a, "egg"), 1);
test(ArrayFindString(a, "doh"), -1);
test(ArrayFindString(a, "something"), 4);
test(ArrayFindString(a, "eggeggeggeggegg"), 6);
test(ArrayFindString(a, ""), 5);
test(ArrayFindString(a, "zz"), -1);
ArrayDestroy(a);
showres();
}
public arraytest14()
public arraytest16()
{
server_print("Testing finding value in array...");
new Array:a = ArrayCreate(1);
ArrayPushCell(a, 2);
ArrayPushCell(a, 1);
ArrayPushCell(a, 5);
ArrayPushCell(a, 3.14);
ArrayPushCell(a, -1);
test(ArrayFindValue(a, -1), 4);
test(ArrayFindValue(a, 2), 0);
test(ArrayFindValue(a, 3), -1);
test(ArrayFindValue(a, 3.14), 3);
ArrayDestroy(a);
showres();