[med-svn] [Git][med-team/iitii][master] use_namespace_iitii_in_test.patch: Address formal part of API break.

[Aaron M. Ucko]

Aaron M. Ucko pushed to branch master at Debian Med / iitii


Commits:
52474065 by Aaron M. Ucko at 2020-06-09T11:48:41-04:00
use_namespace_iitii_in_test.patch: Address formal part of API break.

Prefix tests' references to iit<...> and iitii<...> with the iitii::
namespace qualifier, with the ekg fork in use here introduced.

NB: This fork also gives builders a mandatory backing-file-path
argument, which this patch does not attempt to supply.

- - - - -


2 changed files:

- debian/patches/series
- + debian/patches/use_namespace_iitii_in_test.patch


Changes:

=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 use_debian_packaged_libs.patch
 dynamic_linking.patch
 use_debian_packages_libs_in_test.patch
+use_namespace_iitii_in_test.patch


=====================================
debian/patches/use_namespace_iitii_in_test.patch
=====================================
@@ -0,0 +1,50 @@
+--- 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;
+ 



View it on GitLab: https://salsa.debian.org/med-team/iitii/-/commit/52474065ae2bb050b8b78ee60831143eac395980

-- 
View it on GitLab: https://salsa.debian.org/med-team/iitii/-/commit/52474065ae2bb050b8b78ee60831143eac395980
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200609/823cb436/attachment-0001.html>