@@ -51,36 +51,38 @@ namespace py = pybind11;
5151template <class T >
5252using vec = std::vector<T>;
5353
54- template <typename Sequence >
55- inline py::array_t <typename Sequence::value_type> as_pyarray (Sequence& seq) {
54+ template <typename Sequence>
55+ inline py::array_t <typename Sequence::value_type> as_pyarray (Sequence &seq)
56+ {
5657
5758 auto size = seq.size ();
5859 auto data = seq.data ();
5960 std::unique_ptr<Sequence> seq_ptr = std::make_unique<Sequence>(std::move (seq));
60- auto capsule = py::capsule (seq_ptr.get (), [](void *p) { std::unique_ptr<Sequence>(reinterpret_cast <Sequence*>(p)); });
61+ auto capsule = py::capsule (seq_ptr.get (), [](void *p)
62+ { std::unique_ptr<Sequence>(reinterpret_cast <Sequence *>(p)); });
6163 seq_ptr.release ();
6264 return py::array (size, data, capsule);
6365}
6466
6567template <typename T>
66- auto list_list_to_arrays (vec<vec<T>> out_ll){
68+ auto list_list_to_arrays (vec<vec<T>> out_ll)
69+ {
6770 vec<T> out_s;
6871 out_s.reserve (out_ll.size ());
6972 std::size_t sum = 0 ;
70- for (auto &&i : out_ll) {
73+ for (auto &&i : out_ll)
74+ {
7175 out_s.push_back (i.size ());
7276 sum += i.size ();
7377 }
7478 vec<T> out;
7579 out.reserve (sum);
76- for (const auto &v: out_ll)
80+ for (const auto &v : out_ll)
7781 out.insert (out.end (), v.begin (), v.end ());
7882
7983 return make_tuple (
80- std::move (as_pyarray (out_s))
81- ,
82- std::move (as_pyarray (out))
83- );
84+ std::move (as_pyarray (out_s)),
85+ std::move (as_pyarray (out)));
8486}
8587
8688template <class T , size_t StaticCapacity>
@@ -242,7 +244,7 @@ class BB
242244 }
243245 for (int i = 0 ; i < D; ++i)
244246 {
245- flags[i] = -minima[i] < maxima[i];
247+ flags[i] = -minima[i] <= maxima[i];
246248 }
247249 for (int i = 0 ; i < D; ++i)
248250 {
@@ -1291,7 +1293,8 @@ class PRTree
12911293 return out;
12921294 }
12931295
1294- auto find_all_array (const py::array_t <float > &x){
1296+ auto find_all_array (const py::array_t <float > &x)
1297+ {
12951298 return list_list_to_arrays (std::move (find_all (x)));
12961299 }
12971300
@@ -1334,6 +1337,7 @@ class PRTree
13341337 };
13351338
13361339 bfs<T, B, D>(std::move (find_func), flat_tree, target);
1340+ std::sort (out.begin (), out.end ());
13371341 return out;
13381342 }
13391343
0 commit comments