Merge branch 'develop' of github.com:MurTree/pymurtree into docs

.github/workflows/pip.yml

@@ -63,13 +63,16 @@ jobs:
           mingw-w64-x86_64-gcc
           mingw-w64-x86_64-python-pip
           mingw-w64-x86_64-python-wheel
+          mingw-w64-x86_64-python-pandas
+          git
+          mingw-w64-x86_64-meson
 
     - uses: actions/checkout@v3
 
-    - name: Install pybind11
+    - name: Add requirements
       # This is required because --no-build-isolation disable dependences
       # installation
-      run: pip install pybind11
+      run: python -m pip install gitpython pybind11 meson-python
 
     - name: Build and install
       # --no-build-isolation is required because the vanilla setuptool does not
@@ -80,4 +83,6 @@ jobs:
       run: pip install --no-build-isolation .
 
     - name: Test
-      run: python tests/test.py
+      run: | 
+        pip install pytest
+        pytest

.gitignore

@@ -49,3 +49,4 @@ _no_*
 **/__pycache__/
 *pymurtree_data/
 **/*.cpython*
+*.pyd

setup.py

@@ -31,7 +31,9 @@
                                     "murtree/code/MurTree/Data Structures/",
                                     "src/pymurtree/"],
                       # passing in the version to the compiled code
-                      define_macros=[('VERSION_INFO', __version__)]
+                      define_macros=[('VERSION_INFO', __version__)],
+                      language='c++',
+                      cxx_std=11
                       )
 ]
 

src/pymurtree/OptimalDecisionTreeClassifier.py

@@ -1,6 +1,5 @@
 import pandas as pd
 import numpy as np
-
 from . import lib
 from pymurtree.parameters import Parameters
 
@@ -34,10 +33,10 @@ class OptimalDecisionTreeClassifier:
     def __init__(self,
                  time: int = 600,
                  max_depth: int = 3,
-                 max_num_nodes: int = 7,
+                 max_num_nodes: int = None,
                  sparse_coefficient: float = 0.0,
-                 verbose: bool = True,
-                 all_trees: bool = True,
+                 verbose: bool = False,
+                 all_trees: bool = False,
                  incremental_frequency: bool = True,
                  similarity_lower_bound: bool = True,
                  node_selection: int = 0,
@@ -50,6 +49,10 @@ def __init__(self,
         self.__solver = None
         self.__tree = None
 
+        if max_num_nodes is None:
+            max_num_nodes = 2**max_depth - 1
+        max_num_nodes = min(2**max_depth - 1, max_num_nodes)
+
         self.__params = Parameters(time, max_depth, max_num_nodes,
                                    sparse_coefficient, verbose,
                                    all_trees, incremental_frequency, 

src/pymurtree/exporttree.h

@@ -1,4 +1,5 @@
 #include "solver_result.h"
+#include <string>
 
 class ExportTree {