Merge branch 'master' into saatviks_tfmemleakfix

Author: pervazea

src/brain/kd_tree.cpp

@@ -34,7 +34,7 @@ void KDTree::Update(UNUSED_ATTRIBUTE Cluster *cluster) {
   // to the structure. Will need to change AnnoyIndex to optimize this
   // The update to the centroid is reflected in the cluster. There is no change
   // to the clusters_, so just rebuild the entire index
-  index_.reinitialize();
+  index_.unload();
   Build();
 }
 
@@ -64,7 +64,7 @@ void KDTree::Build() {
 }
 
 void KDTree::Build(std::set<Cluster *> &clusters) {
-  index_.reinitialize();
+  index_.unload();
   clusters_.clear();
   for (auto &cluster : clusters) {
     clusters_.push_back(cluster);

src/include/brain/kd_tree.h

@@ -51,7 +51,7 @@ class KDTree {
    *
    * @param feature - the vector whose nearest neigbor is being searched for
    * @param cluster - return the cluster of the nearest neighbor in this
-   * @param feature - return the similarity to the nearest neighbor in this
+   * @param similarity - return the similarity to the nearest neighbor in this
    */
   void GetNN(std::vector<double> &feature, Cluster *&cluster,
              double &similarity);