Fixing a memory leak + shutting up warnings

mldrugdiscovery · Jul 20, 2017 · 090e6f7 · 090e6f7
1 parent 4d9d86d
commit 090e6f7
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 894 deletions.
diff --git a/similarity_search/include/factory/init_methods.h b/similarity_search/include/factory/init_methods.h
@@ -157,10 +157,6 @@ inline void initMethods() {
   REGISTER_METHOD_CREATOR(double, METH_HNSW, CreateHnsw)
   REGISTER_METHOD_CREATOR(int,    METH_HNSW, CreateHnsw)
 
-  REGISTER_METHOD_CREATOR(float,  METH_SMALL_WORLD_RAND_SPLIT, CreateSmallWorldRandSplit)
-  REGISTER_METHOD_CREATOR(double, METH_SMALL_WORLD_RAND_SPLIT, CreateSmallWorldRandSplit)
-  REGISTER_METHOD_CREATOR(int,    METH_SMALL_WORLD_RAND_SPLIT, CreateSmallWorldRandSplit)
-
   // SA-tree
   REGISTER_METHOD_CREATOR(float,  METH_SATREE, CreateSATree)
   REGISTER_METHOD_CREATOR(double, METH_SATREE, CreateSATree)

diff --git a/similarity_search/include/factory/method/small_world_rand.h b/similarity_search/include/factory/method/small_world_rand.h
@@ -18,7 +18,6 @@
 #define _FACTORY_SMALL_WORLD_RAND_H_
 
 #include <method/small_world_rand.h>
-#include <method/small_world_rand_split.h>
 
 namespace similarity {
 
@@ -34,14 +33,6 @@ Index<dist_t>* CreateSmallWorldRand(bool PrintProgress,
     return new SmallWorldRand<dist_t>(PrintProgress, space, DataObjects);
 }
 
-template <typename dist_t>
-Index<dist_t>* CreateSmallWorldRandSplit(bool PrintProgress,
-                                        const string& SpaceType,
-                                        Space<dist_t>& space,
-                                        const ObjectVector& DataObjects) {
-    return new SmallWorldRandSplit<dist_t>(PrintProgress, space, DataObjects);
-}
-
 /*
  * End of creating functions.
  */

diff --git a/similarity_search/include/method/small_world_rand.h b/similarity_search/include/method/small_world_rand.h
@@ -292,7 +292,7 @@ class SmallWorldRand : public Index<dist_t> {
 
   mutable mutex   ElListGuard_;
   ElementMap      ElList_;
-  size_t          NextNodeId_ = 0; // This is internal node id
+  IdType          NextNodeId_ = 0; // This is internal node id
   bool            changedAfterCreateIndex_ = false;
   MSWNode*        pEntryPoint_ = nullptr;
 

diff --git a/similarity_search/include/method/small_world_rand_split.h b/similarity_search/include/method/small_world_rand_split.h