diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dynamic_extension_tests.cpp | 12 | ||||
| -rw-r--r-- | tests/wirs_tests.cpp | 10 |
2 files changed, 13 insertions, 9 deletions
diff --git a/tests/dynamic_extension_tests.cpp b/tests/dynamic_extension_tests.cpp index 9fdd5f9..518801a 100644 --- a/tests/dynamic_extension_tests.cpp +++ b/tests/dynamic_extension_tests.cpp @@ -149,7 +149,6 @@ START_TEST(t_range_sample_memlevels) END_TEST */ -/* START_TEST(t_range_sample_weighted) { auto ext_wirs = new DE(100, 2, 1); @@ -196,6 +195,7 @@ START_TEST(t_range_sample_weighted) uint64_t upper_key = 5; size_t cnt[3] = {0}; + size_t total_samples = 0; for (size_t i=0; i<1000; i++) { wirs_query_parms<WRec> p; p.lower_bound = lower_key; @@ -203,20 +203,20 @@ START_TEST(t_range_sample_weighted) p.sample_size = k; auto result = ext_wirs->query(&p); + total_samples += result.size(); - for (size_t j=0; j<k; j++) { + for (size_t j=0; j<result.size(); j++) { cnt[result[j].key - 1]++; } } - ck_assert(roughly_equal(cnt[0] / 1000, (double) k/4.0, k, .05)); - ck_assert(roughly_equal(cnt[1] / 1000, (double) k/4.0, k, .05)); - ck_assert(roughly_equal(cnt[2] / 1000, (double) k/2.0, k, .05)); + ck_assert(roughly_equal(cnt[0] / total_samples, (double) k/4.0, k, .05)); + ck_assert(roughly_equal(cnt[1] / total_samples, (double) k/4.0, k, .05)); + ck_assert(roughly_equal(cnt[2] / total_samples, (double) k/2.0, k, .05)); delete ext_wirs; } END_TEST -*/ START_TEST(t_tombstone_merging_01) diff --git a/tests/wirs_tests.cpp b/tests/wirs_tests.cpp index 0a9b1d0..32cb863 100644 --- a/tests/wirs_tests.cpp +++ b/tests/wirs_tests.cpp @@ -268,10 +268,14 @@ START_TEST(t_wirs_buffer_query_rejection) wirs_query_parms<WRec> parms = {lower_key, upper_key, k}; parms.rng = gsl_rng_alloc(gsl_rng_mt19937); + size_t total_samples = 0; + for (size_t i=0; i<1000; i++) { auto state = WIRSQuery<WRec>::get_buffer_query_state(buffer, &parms); auto result = WIRSQuery<WRec>::buffer_query(buffer, state, &parms); + total_samples += result.size(); + for (size_t j=0; j<result.size(); j++) { cnt[result[j].rec.key - 1]++; } @@ -279,9 +283,9 @@ START_TEST(t_wirs_buffer_query_rejection) WIRSQuery<WRec>::delete_buffer_query_state(state); } - ck_assert(roughly_equal(cnt[0] / 1000, (double) k/4.0, k, .05)); - ck_assert(roughly_equal(cnt[1] / 1000, (double) k/4.0, k, .05)); - ck_assert(roughly_equal(cnt[2] / 1000, (double) k/2.0, k, .05)); + ck_assert(roughly_equal(cnt[0] / total_samples, (double) k/4.0, k, .05)); + ck_assert(roughly_equal(cnt[1] / total_samples, (double) k/4.0, k, .05)); + ck_assert(roughly_equal(cnt[2] / total_samples, (double) k/2.0, k, .05)); gsl_rng_free(parms.rng); delete buffer; |