[BugFixes] Add deconstructor for python classes.

Author: phreer

.gitignore

@@ -1,6 +1,8 @@
 *.so
 build/
 python/*.cpp
+python/dist
+python/*.egg-info
 build-vscode/
 build-deb/
 .vscode/

python/sample_entropy_calculator.pxd

@@ -33,8 +33,8 @@ cdef extern from "sample_entropy_calculator_kd.h" namespace "sampen":
     double get_entropy()
     long long get_a()
     long long get_b()
-    long long get_a_norm()
-    long long get_b_norm()
+    double get_a_norm()
+    double get_b_norm()
     string get_method_name()
     void ComputeSampleEntropy()
 
@@ -44,8 +44,8 @@ cdef extern from "sample_entropy_calculator_kd.h" namespace "sampen":
     double get_entropy()
     long long get_a()
     long long get_b()
-    long long get_a_norm()
-    long long get_b_norm()
+    double get_a_norm()
+    double get_b_norm()
     string get_method_name()
     void ComputeSampleEntropy()
 
@@ -56,8 +56,8 @@ cdef extern from "sample_entropy_calculator_direct.h" namespace "sampen":
     double get_entropy()
     long long get_a()
     long long get_b()
-    long long get_a_norm()
-    long long get_b_norm()
+    double get_a_norm()
+    double get_b_norm()
     string get_method_name()
     void ComputeSampleEntropy()
 
@@ -67,8 +67,8 @@ cdef extern from "sample_entropy_calculator_direct.h" namespace "sampen":
     double get_entropy()
     long long get_a()
     long long get_b()
-    long long get_a_norm()
-    long long get_b_norm()
+    double get_a_norm()
+    double get_b_norm()
     string get_method_name()
     void ComputeSampleEntropy()
 
@@ -78,8 +78,8 @@ cdef extern from "sample_entropy_calculator_direct.h" namespace "sampen":
     double get_entropy()
     long long get_a()
     long long get_b()
-    long long get_a_norm()
-    long long get_b_norm()
+    double get_a_norm()
+    double get_b_norm()
     string get_method_name()
     void ComputeSampleEntropy()
 
@@ -94,8 +94,8 @@ cdef extern from "sample_entropy_calculator_direct.h" namespace "sampen":
     double get_entropy()
     long long get_a()
     long long get_b()
-    long long get_a_norm()
-    long long get_b_norm()
+    double get_a_norm()
+    double get_b_norm()
     vector[long long] get_a_vec()
     vector[long long] get_b_vec()
     string get_method_name()

python/sample_entropy_calculator.pyx

@@ -32,7 +32,11 @@ cdef class SampEnSKD:
   def __cinit__(self, const vector[double] &data, double r, unsigned m,
                 OutputLevel level):
     self.c_ = new SampleEntropyCalculatorMao[double](data, r, m, level)
-  
+
+  def __dealloc__(self):
+    if self.c_ != NULL:
+      del self.c_  
+
   def method_name(self):
     return self.c_.get_method_name()
 
@@ -65,6 +69,10 @@ cdef class SampEnRKD:
                 OutputLevel level):
     self.c_ = new SampleEntropyCalculatorRKD[double](data, r, m, level)
 
+  def __dealloc__(self):
+    if self.c_ != NULL:
+      del self.c_  
+
   def method_name(self):
     return self.c_.get_method_name()
 
@@ -97,6 +105,10 @@ cdef class SampEnFD:
                 OutputLevel level):
     self.c_ = new SampleEntropyCalculatorFastDirect[double](data, r, m, level)
 
+  def __dealloc__(self):
+    if self.c_ != NULL:
+      del self.c_  
+
   def method_name(self):
     return self.c_.get_method_name()
 
@@ -129,6 +141,10 @@ cdef class SampEnD:
                 OutputLevel level):
     self.c_ = new SampleEntropyCalculatorDirect[double](data, r, m, level)
 
+  def __dealloc__(self):
+    if self.c_ != NULL:
+      del self.c_  
+
   def method_name(self):
     return self.c_.get_method_name()
 
@@ -168,6 +184,10 @@ cdef class SampEnSamplingD:
         real_entropy, real_a_norm, real_b_norm,
         random_type, random_, presort, level)
 
+  def __dealloc__(self):
+    if self.c_ != NULL:
+      del self.c_  
+
   def method_name(self):
     return self.c_.get_method_name()
 

python/setup.py

@@ -3,11 +3,15 @@
 from Cython.Build import cythonize
 import platform
 
+description = 'Fast computation (or estimation) of sample entropy.'
 extra_compile_args = ['-std=c++11']
 if platform.system() == 'Darwin':
     extra_compile_args += ['-mmacosx-version-min=10.7', '-stdlib=libc++']
 
-setup(ext_modules=cythonize([Extension('sampen',
+setup(name='sampen',
+      description=description,
+      version='1.0.0',
+      ext_modules=cythonize([Extension('sampen',
                                        sources=[
                                          'sample_entropy_calculator.pyx',
                                        ],

script/run_2dkq256.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/bash
+
+r=0.2
+m=2
+INPUT_DIR=$HOME/workspace/entropy/2d/generation_dataset_kq_256
+OUTPUT_DIR=$HOME/workspace/entropy/2d/kd_256_result_r"$r"_m"$m"
+
+for folder in `ls "$INPUT_DIR"`; do
+    echo "Processing folder $folder..."
+    mkdir -p "$OUTPUT_DIR"/"$folder" 2>/dev/null
+    for f in `ls "$INPUT_DIR"/"$folder"`; do
+        echo "Processing file "$folder"/$f ..."
+        build/bin/sampen2d -r $r -m $m --multiscale-depth 10\
+            --multiscale-factor 0.8\
+            --input "$INPUT_DIR"/"$folder"/"$f"\
+            > "$OUTPUT_DIR"/"$folder"/"$f".txt
+    done
+done

script/run_ex_convergence_n0_kdtreemc_norr.sh

@@ -47,9 +47,9 @@ r=0.15
 line_offset=100000
 n=1000010
 sample_num=1 # N1
-sample_size_array=$(seq -s',' 2000 2000 100000)
+sample_size_array=$(seq -s',' 5000 5000 50000)
 output_level=1
-subdir=convergence_n0_kdtreemc_m${m}_r${r}_220308
+subdir=convergence_n0_kdtreemc/m${m}_r${r}_220322
 mkdir -p result/$subdir 2>/dev/null
 for f in ${input_files[@]}; do
     input_file=${INPUT_DIR}/$f