default comparator set in python code and NotImplementedError fixed

Author: Kishan-Ved

pydatastructs/linear_data_structures/_backend/cpp/arrays/DynamicOneDimensionalArray.hpp

@@ -5,6 +5,7 @@
 #include <Python.h>
 #include <structmember.h>
 #include <cstdlib>
+#include <iostream>
 #include "DynamicArray.hpp"
 #include "OneDimensionalArray.hpp"
 #include "../../../../utils/_backend/cpp/utils.hpp"
@@ -25,8 +26,11 @@ static void DynamicOneDimensionalArray_dealloc(DynamicOneDimensionalArray *self)
 
 static PyObject* DynamicOneDimensionalArray___new__(PyTypeObject* type, PyObject *args,
                                                     PyObject *kwds) {
+    std::cout<<"h1"<<std::endl;
     DynamicOneDimensionalArray *self;
+    std::cout<<"h2"<<std::endl;
     self = reinterpret_cast<DynamicOneDimensionalArray*>(type->tp_alloc(type, 0));
+    std::cout<<"h3"<<std::endl;
     PyObject* _one_dimensional_array = OneDimensionalArray___new__(&OneDimensionalArrayType, args, kwds);
     if( !_one_dimensional_array ) {
         return NULL;

pydatastructs/trees/_backend/cpp/BinaryTree.hpp

@@ -56,32 +56,31 @@ static PyObject* BinaryTree___new__(PyTypeObject* type, PyObject *args, PyObject
     }
     // TO DO: Fix the following line!
     // self->tree = PyObject_CallMethod(reinterpret_cast<PyObject*>(&ArrayForTreesType),"__new__", "OO", &TreeNodeType, listroot);
+    
     self->size = 1;
-
-    if(comp == Py_None){
-        Py_INCREF(Py_None);
-        self->comparator = Py_None; // set to none for now.
-    }
-    else{
-        self->comparator = comp;
-    }
+    // Python code is modified to ensure comp is never None
+    if (!PyCallable_Check(comp)) {
+            PyErr_SetString(PyExc_ValueError, "comparator should be callable");
+            return NULL;
+        }
+    self->comparator = comp;
     self->is_order_statistic = is_order_statistic;
 
     return reinterpret_cast<PyObject*>(self);
 }
 
 static PyObject* BinaryTree_insert(PyTypeObject* type, PyObject *args, PyObject *kwds) {
-    PyErr_SetString(PyExc_ValueError, "This is an abstract method."); // Currently of type ValueError, change type if needed later
+    PyErr_SetString(PyExc_NotImplementedError, "This is an abstract method."); // Currently of type ValueError, change type if needed later
     return NULL;
 }
 
 static PyObject* BinaryTree_delete(PyTypeObject* type, PyObject *args, PyObject *kwds) {
-    PyErr_SetString(PyExc_ValueError, "This is an abstract method."); // Currently of type ValueError, change type if needed later
+    PyErr_SetString(PyExc_NotImplementedError, "This is an abstract method."); // Currently of type ValueError, change type if needed later
     return NULL;
 }
 
 static PyObject* BinaryTree_search(PyTypeObject* type, PyObject *args, PyObject *kwds) {
-    PyErr_SetString(PyExc_ValueError, "This is an abstract method."); // Currently of type ValueError, change type if needed later
+    PyErr_SetString(PyExc_NotImplementedError, "This is an abstract method."); // Currently of type ValueError, change type if needed later
     return NULL;
 }
 

pydatastructs/trees/binary_trees.py

@@ -61,6 +61,8 @@ def __new__(cls, key=None, root_data=None, comp=None,
                 is_order_statistic=False, **kwargs):
         backend = kwargs.get('backend', Backend.PYTHON)
         if backend == Backend.CPP:
+            comp = lambda key1, key2: key1 < key2 \
+                        if comp is None else comp
             return _trees.BinaryTree(key, root_data, comp, is_order_statistic, **kwargs) # If any argument is not given, then it is passed as None
         obj = object.__new__(cls)
         if key is None and root_data is not None:

pydatastructs/trees/tests/test_binary_trees.py

@@ -9,10 +9,13 @@
 
 def test_cpp_BinaryTree():
     pass
-    b = BinaryTree(1,100,backend=Backend.CPP); # Pass None, passing 4 arguments is necessary
+    b = BinaryTree(1,100,backend=Backend.CPP)
+    # b.insert() # Correctly throws NotImplementedError: This is an abstract method
+    # b.delete() # Correctly throws NotImplementedError: This is an abstract method
+    # b.search() # Correctly throws NotImplementedError: This is an abstract method
     # print(str(b))
 
-# test_cpp_BinaryTree()
+test_cpp_BinaryTree()
 
 def test_BinarySearchTree():
     BST = BinarySearchTree

scripts/build/dummy_submodules_data.py

@@ -6,4 +6,4 @@
 
 cpp = 'cpp'
 
-dummy_submodules_list = [('_arrays.py', '_algorithms.py'), ('_stack.py',), ('_nodes.py',),('_trees.py',)]
+dummy_submodules_list = [('_arrays.py', '_algorithms.py'), ('_stack.py',), ('_nodes.py',), ('_trees.py',)]