diff --git a/benchmarks/IndexStd/IndexStd.cpp b/benchmarks/IndexStd/IndexStd.cpp index c29caa4e3..b6dc73578 100644 --- a/benchmarks/IndexStd/IndexStd.cpp +++ b/benchmarks/IndexStd/IndexStd.cpp @@ -72,6 +72,7 @@ CONSOLE_APP_MAIN RDUMP(hst.size()); } } + return; w = AliceLines(); diff --git a/benchmarks/TestData/Data.cpp b/benchmarks/TestData/Data.cpp index 5255cc750..406b8acee 100644 --- a/benchmarks/TestData/Data.cpp +++ b/benchmarks/TestData/Data.cpp @@ -2,7 +2,20 @@ Vector AliceWords() { - return Split(alice_text, [](int c) { return c > 32 ? 0 : c; }); + Vector w = Split(alice_text, [](int c) { return c > 32 ? 0 : c; }); + Vector r; + for(String s : w) { + s = ToLower(s); + int q = 0; + while(!IsAlNum(s[q]) && q < s.GetCount()) + q++; + s = s.Mid(q); + while(s.GetCount() && !IsAlNum(*s.Last())) + s.TrimLast(); + if(s.GetCount()) + r.Add(s); + } + return r; } Vector AliceLines() diff --git a/benchmarks/Vector/Vector.cpp b/benchmarks/Vector/Vector.cpp index e393f8f27..6109ab797 100644 --- a/benchmarks/Vector/Vector.cpp +++ b/benchmarks/Vector/Vector.cpp @@ -6,7 +6,7 @@ using namespace Upp; CONSOLE_APP_MAIN { - const int N = 200; + const int N = 2000; Vector data; Buffer sdata(N); @@ -19,7 +19,7 @@ CONSOLE_APP_MAIN RDUMP(sizeof(std::string)); RDUMP(sizeof(String)); - for(int q = 100000; q--;) { + for(int q = 1000; q--;) { { RTIMING("vector::push_back"); std::vector v;