Misc fixes

Makefile.dist

-VER=1.6.10
+VER=1.7.0
 
 
 dist-src:

examples/flann_example_mpi.cpp

 
+#include <flann/mpi/queries.h>
 #include <flann/mpi/index.h>
 
 #include <stdio.h>
@@ -46,23 +47,6 @@ float compute_precision(const flann::Matrix<int>& match, const flann::Matrix<int
 }
 
 
-namespace boost {
-namespace serialization {
-
-template<class Archive, class T>
-void serialize(Archive & ar, flann::Matrix<T> & matrix, const unsigned int version)
-{
-	ar & matrix.rows & matrix.cols & matrix.stride;
-    if (Archive::is_loading::value) {
-    	matrix.data = new T[matrix.rows*matrix.cols];
-    }
-    ar & boost::serialization::make_array(matrix.data, matrix.rows*matrix.cols);
-}
-
-}
-}
-
-
 
 void search(flann::mpi::Index<flann::L2<float> >* index)
 {
@@ -101,12 +85,12 @@ void search(flann::mpi::Index<flann::L2<float> >* index)
 			float precision = compute_precision(match, indices);
 			printf("Precision is: %g\n", precision);
 		}
-		delete[] query.data;
-		delete[] match.data;
+		delete[] query.ptr();
+		delete[] match.ptr();
 
 		IF_RANK0 {
-			delete[] indices.data;
-			delete[] dists.data;
+			delete[] indices.ptr();
+			delete[] dists.ptr();
 		}
 
 }

src/cpp/flann/flann.cpp

@@ -80,6 +80,13 @@ flann::IndexParams create_parameters(FLANNParameters* p)
         params["sample_fraction"] = p->sample_fraction;
     }
 
+    if (p->algorithm == FLANN_INDEX_HIERARCHICAL) {
+        params["branching"] = p->branching;
+        params["centers_init"] = p->centers_init;
+        params["trees"] = p->trees;
+        params["leaf_size"] = p->leaf_max_size;
+    }
+
     if (p->algorithm == FLANN_INDEX_LSH) {
         params["table_number"] = p->table_number_;
         params["key_size"] = p->key_size_;

src/cpp/flann/mpi/queries.h

@@ -30,26 +30,10 @@
 #ifndef MPI_QUERIES_H_
 #define MPI_QUERIES_H_
 
-#include <flann/util/matrix.h>
+#include <flann/mpi/matrix.h>
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
-
-
-namespace boost {
-namespace serialization {
-
-template<class Archive, class T>
-void serialize(Archive & ar, flann::Matrix<T> & matrix, const unsigned int version)
-{
-	ar & matrix.rows & matrix.cols & matrix.stride;
-    if (Archive::is_loading::value) {
-        matrix = flann::Matrix<T>(new T[matrix.rows*matrix.cols], matrix.rows, matrix.cols, matrix.stride);
-    }
-    ar & boost::serialization::make_array(matrix.ptr(), matrix.rows*matrix.cols);
-}
-
-}
-}
+#include <boost/asio.hpp>
 
 namespace flann
 {