Commit 0dda479e authored by Bednárek David RNDr. Ph.D.'s avatar Bednárek David RNDr. Ph.D.
Browse files

bsearch: complexity and ranges set to match 2018-2

parent 9a906365
......@@ -208,9 +208,9 @@ namespace bsearchmain {
return fmwkng::logarithmic(
0x40,
#ifdef NDEBUG
0x10000,
0x100000,
#else
0x40000,
0x4000,
#endif
#ifdef NDEBUG
0x4
......@@ -227,11 +227,11 @@ namespace bsearchmain {
static auto code_name() { return "bsearchmain::osize"; }
static auto enumerator() {
return fmwkng::logarithmic(
0x1000,
0x400,
#ifdef NDEBUG
0x100000,
0x40000,
#else
0x10000,
0x4000,
#endif
0x10
);
......@@ -268,7 +268,7 @@ namespace bsearchmain {
template< typename CTX>
static auto complexity(CTX&& ctx)
{
return (std::uint_fast64_t)log2(fmwkng::get<isize>(ctx)) * fmwkng::get<osize>(ctx);
return (std::uint_fast64_t)log2(fmwkng::get<isize>(ctx)) * fmwkng::get<osize>(ctx) + fmwkng::get<isize>(ctx);
}
static constexpr fmwkng::average_t minimum_count =
#ifdef NDEBUG
......
......@@ -66,11 +66,11 @@ namespace bsearchmain {
get<isize>(ctx3));
bsearchsol::bsearch_inner<policy> idata(igen.inner_data(), igen.inner_size());
//#ifdef NDEBUG
#ifdef NDEBUG
for_parallel(ctx3, run_thread_ftor<policy>(igen, idata));
//#else
// run_thread_ftor<policy>(igen, idata)(ctx3);
//#endif
#else
run_thread_ftor<policy>(igen, idata)(ctx3);
#endif
}
}
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment