Adding checks and refactoring

Author: Dmitry Yashunin

hnswlib/hnswalg.h

@@ -28,7 +28,7 @@ namespace hnswlib {
                 link_list_locks_(max_elements), link_list_update_locks_(max_update_element_locks), element_levels_(max_elements) {
             max_elements_ = max_elements;
 
-            num_deleted_ = false;
+            num_deleted_ = 0;
             data_size_ = s->get_data_size();
             fstdistfunc_ = s->get_dist_func();
             dist_func_param_ = s->get_dist_func_param();
@@ -768,12 +768,17 @@ namespace hnswlib {
          * @param internalId
          */
         void markDeletedInternal(tableint internalId) {
+            assert(internalId < max_elements_);
             if (!isMarkedDeleted(internalId))
             {
                 unsigned char *ll_cur = ((unsigned char *)get_linklist0(internalId))+2;
                 *ll_cur |= DELETE_MARK;
                 num_deleted_ += 1;
             }
+            else
+            {
+                throw std::runtime_error("Element is deleted");
+            }
         }
 
         /**
@@ -795,12 +800,17 @@ namespace hnswlib {
          * @param internalId
          */
         void unmarkDeletedInternal(tableint internalId) {
+            assert(internalId < max_elements_);
             if (isMarkedDeleted(internalId))
             {
                 unsigned char *ll_cur = ((unsigned char *)get_linklist0(internalId))+2;
                 *ll_cur &= ~DELETE_MARK;
                 num_deleted_ -= 1;
             }
+            else
+            {
+                throw std::runtime_error("Element is not deleted");
+            }
         }
 
         /**

python_bindings/bindings.cpp

@@ -74,12 +74,12 @@ inline void ParallelFor(size_t start, size_t end, size_t numThreads, Function fn
 
 }
 
-    inline void assert_true(bool expr, const std::string & msg) {
-      if (expr == false)
-        throw std::runtime_error("Unpickle Error: "+msg);
-      return;
-    }
 
+inline void assert_true(bool expr, const std::string & msg) {
+    if (expr == false)
+    throw std::runtime_error("Unpickle Error: "+msg);
+    return;
+}
 
 
 template<typename dist_t, typename data_t=float>