1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
Author: Aaron M. Ucko
Last-Update: 2020-06-09 11:48:41 -0400
Description: https://lists.debian.org/debian-med/2020/06/msg00077.html
--- a/test/util.h
+++ b/test/util.h
@@ -204,5 +204,5 @@ vector<variant> load_variants_parallel(c
return ans;
}
-using variant_iit = iit<int, variant, variant_beg, variant_end>;
-using variant_iitii = iitii<int, variant, variant_beg, variant_end>;
+using variant_iit = iitii::iit<int, variant, variant_beg, variant_end>;
+using variant_iitii = iitii::iitii<int, variant, variant_beg, variant_end>;
--- a/test/dumb_benchmark.cc
+++ b/test/dumb_benchmark.cc
@@ -10,8 +10,8 @@ struct dumb_item {
uint32_t dumb_beg(const dumb_item& it) { return it.beg; }
uint32_t dumb_end(const dumb_item& it) { return it.end; }
-using dumb_iit = iit<uint32_t, dumb_item, dumb_beg, dumb_end>;
-using dumb_iitii = iitii<uint32_t, dumb_item, dumb_beg, dumb_end>;
+using dumb_iit = iitii::iit<uint32_t, dumb_item, dumb_beg, dumb_end>;
+using dumb_iitii = iitii::iitii<uint32_t, dumb_item, dumb_beg, dumb_end>;
vector<dumb_item> generate(size_t N) {
// each item ranked i has begin position 10*i, with geometrically distributed length mean 20.
--- a/test/test_iitii.cc
+++ b/test/test_iitii.cc
@@ -18,11 +18,11 @@ pos get_end(const pospair& p) {
}
auto build_iit(const vector<pospair>& examples) {
- return iit<pos, pospair, &get_beg, &get_end>::builder(examples.begin(), examples.end()).build();
+ return iitii::iit<pos, pospair, &get_beg, &get_end>::builder(examples.begin(), examples.end()).build();
}
auto build_iitii(const vector<pospair>& examples, size_t domains) {
- return iitii<pos, pospair, &get_beg, &get_end>::builder(examples.begin(), examples.end()).build(domains);
+ return iitii::iitii<pos, pospair, &get_beg, &get_end>::builder(examples.begin(), examples.end()).build(domains);
}
TEST_CASE("cgranges example") {
@@ -182,8 +182,8 @@ TEST_CASE("gnomAD chr2") {
uniform_int_distribution<uint32_t> begD(0, max_end);
const size_t trials = 1000000;
- auto tree = iit<int, variant, variant_beg, variant_end>::builder(variants.begin(), variants.end()).build();
- auto treeii = iitii<int, variant, variant_beg, variant_end>::builder(variants.begin(), variants.end()).build(megabases*10);
+ auto tree = iitii::iit<int, variant, variant_beg, variant_end>::builder(variants.begin(), variants.end()).build();
+ auto treeii = iitii::iitii<int, variant, variant_beg, variant_end>::builder(variants.begin(), variants.end()).build(megabases*10);
size_t cost = 0, costii=0, count=0;
vector<variant> results, resultsii;
|
