#6 - Update tests and codecov conf

Removed (by now) predict_proba. Created a notebook in jupyter
Added split_criteria parameter with min_distance and max_samples values
Refactor _distances
Refactor _split_criteria
Refactor _reorder_results

.coveragerc

@@ -0,0 +1,14 @@
+[run]
+branch = True
+source = stree
+
+[report]
+exclude_lines =
+    if self.debug:
+    pragma: no cover
+    raise NotImplementedError
+    if __name__ == .__main__.:
+ignore_errors = True
+omit =
+    stree/tests/*
+    stree/__init__.py

.gitignore

@@ -130,3 +130,4 @@ dmypy.json
 
 .idea
 .vscode
+.pre-commit-config.yaml

.travis.yml

@@ -1,13 +0,0 @@
-language: python
-os: linux
-dist: xenial
-install:
-  - pip install -r requirements.txt
-notifications:
-  email:
-    recipients:
-      - ricardo.montanana@alu.uclm.es
-    on_success: never # default: change
-    on_failure: always # default: always
-# command to run tests
-script: python -m unittest stree.tests

README.md

@@ -1,8 +1,10 @@
-[![Build Status](https://travis-ci.com/Doctorado-ML/STree.svg?branch=master)](https://travis-ci.com/Doctorado-ML/STree)
+[![Codeship Status for Doctorado-ML/STree](https://app.codeship.com/projects/8b2bd350-8a1b-0138-5f2c-3ad36f3eb318/status?branch=master)](https://app.codeship.com/projects/399170)
+[![codecov](https://codecov.io/gh/doctorado-ml/stree/branch/master/graph/badge.svg)](https://codecov.io/gh/doctorado-ml/stree)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/35fa3dfd53a24a339344b33d9f9f2f3d)](https://www.codacy.com/gh/Doctorado-ML/STree?utm_source=github.com&utm_medium=referral&utm_content=Doctorado-ML/STree&utm_campaign=Badge_Grade)
 
 # Stree
 
-Oblique Tree classifier based on SVM nodes. The nodes are built and splitted with sklearn LinearSVC models.Stree is a sklearn estimator and can be integrated in pipelines, grid searches, etc.
+Oblique Tree classifier based on SVM nodes. The nodes are built and splitted with sklearn SVC models. Stree is a sklearn estimator and can be integrated in pipelines, grid searches, etc.
 
 ![Stree](https://raw.github.com/doctorado-ml/stree/master/example.png)
 
@@ -16,17 +18,17 @@ pip install git+https://github.com/doctorado-ml/stree
 
 ### Jupyter notebooks
 
-##### Slow launch but better integration
+* [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/Doctorado-ML/STree/master?urlpath=lab/tree/notebooks/benchmark.ipynb) Benchmark
 
-* [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/Doctorado-ML/STree/master?urlpath=lab/tree/notebooks/test.ipynb) Test notebook
+* [![Test](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Doctorado-ML/STree/blob/master/notebooks/benchmark.ipynb) Benchmark
 
-##### Fast launch but have to run first commented out cell for setup
+* [![Test2](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Doctorado-ML/STree/blob/master/notebooks/features.ipynb) Test features
 
-* [![Test](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Doctorado-ML/STree/blob/master/notebooks/test.ipynb) Test notebook
+* [![Adaboost](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Doctorado-ML/STree/blob/master/notebooks/adaboost.ipynb) Adaboost
 
-* [![Test2](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Doctorado-ML/STree/blob/master/notebooks/test2.ipynb) Another Test notebook
+* [![Gridsearch](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Doctorado-ML/STree/blob/master/notebooks/gridsearch.ipynb) Gridsearch
 
-* [![Test Graphics](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Doctorado-ML/STree/blob/master/notebooks/test_graphs.ipynb) Test Graphics notebook
+* [![Test Graphics](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Doctorado-ML/STree/blob/master/notebooks/test_graphs.ipynb) Test Graphics
 
 ### Command line
 

codecov.yml

@@ -0,0 +1,12 @@
+overage:
+  status:
+    project:
+      default:
+        target: 90%
+comment:
+  layout: "reach, diff, flags, files"
+  behavior: default
+  require_changes: false  
+  require_base: yes
+  require_head: yes       
+  branches: null

main.py

@@ -4,15 +4,27 @@ from stree import Stree
 
 random_state = 1
 
+
 def load_creditcard(n_examples=0):
     import pandas as pd
     import numpy as np
     import random
-    df = pd.read_csv('data/creditcard.csv')
+
-    print("Fraud: {0:.3f}% {1}".format(df.Class[df.Class == 1].count()*100/df.shape[0], df.Class[df.Class == 1].count()))
+    df = pd.read_csv("data/creditcard.csv")
-    print("Valid: {0:.3f}% {1}".format(df.Class[df.Class == 0].count()*100/df.shape[0], df.Class[df.Class == 0].count()))
+    print(
+        "Fraud: {0:.3f}% {1}".format(
+            df.Class[df.Class == 1].count() * 100 / df.shape[0],
+            df.Class[df.Class == 1].count(),
+        )
+    )
+    print(
+        "Valid: {0:.3f}% {1}".format(
+            df.Class[df.Class == 0].count() * 100 / df.shape[0],
+            df.Class[df.Class == 0].count(),
+        )
+    )
     y = np.expand_dims(df.Class.values, axis=1)
-    X = df.drop(['Class', 'Time', 'Amount'], axis=1).values
+    X = df.drop(["Class", "Time", "Amount"], axis=1).values
     if n_examples > 0:
         # Take first n_examples samples
         X = X[:n_examples, :]
@@ -26,11 +38,27 @@ def load_creditcard(n_examples=0):
             X = np.append(Xt, X[indices], axis=0)
             y = np.append(yt, y[indices], axis=0)
     print("X.shape", X.shape, " y.shape", y.shape)
-    print("Fraud: {0:.3f}% {1}".format(len(y[y == 1])*100/X.shape[0], len(y[y == 1])))
+    print(
-    print("Valid: {0:.3f}% {1}".format(len(y[y == 0]) * 100 / X.shape[0], len(y[y == 0])))
+        "Fraud: {0:.3f}% {1}".format(
-    Xtrain, Xtest, ytrain, ytest = train_test_split(X, y, train_size=0.7, shuffle=True, random_state=random_state, stratify=y)
+            len(y[y == 1]) * 100 / X.shape[0], len(y[y == 1])
+        )
+    )
+    print(
+        "Valid: {0:.3f}% {1}".format(
+            len(y[y == 0]) * 100 / X.shape[0], len(y[y == 0])
+        )
+    )
+    Xtrain, Xtest, ytrain, ytest = train_test_split(
+        X,
+        y,
+        train_size=0.7,
+        shuffle=True,
+        random_state=random_state,
+        stratify=y,
+    )
     return Xtrain, Xtest, ytrain, ytest
 
+
 # data = load_creditcard(-5000) # Take all true samples + 5000 of the others
 # data = load_creditcard(5000)  # Take the first 5000 samples
 data = load_creditcard()  # Take all the samples
@@ -41,17 +69,9 @@ ytrain = data[2]
 ytest = data[3]
 
 now = time.time()
-clf = Stree(C=.01, random_state=random_state)
+clf = Stree(C=0.01, random_state=random_state)
 clf.fit(Xtrain, ytrain)
 print(f"Took {time.time() - now:.2f} seconds to train")
 print(clf)
 print(f"Classifier's accuracy (train): {clf.score(Xtrain, ytrain):.4f}")
 print(f"Classifier's accuracy (test) : {clf.score(Xtest, ytest):.4f}")
-proba = clf.predict_proba(Xtest)
-print("Checking that we have correct probabilities, these are probabilities of sample belonging to class 1")
-res0 = proba[proba[:, 0] == 0]
-res1 = proba[proba[:, 0] == 1]
-print("++++++++++res0 > .8++++++++++++")
-print(res0[res0[:, 1] > .8])
-print("**********res1 < .4************")
-print(res1[res1[:, 1] < .4])

notebooks/adaboost.ipynb

@@ -1,15 +1,42 @@
 {
  "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Test AdaBoost with different configurations"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Setup\n",
+    "Uncomment the next cell if STree is not already installed"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 1,
    "metadata": {},
    "outputs": [],
+   "source": [
+    "#\n",
+    "# Google Colab setup\n",
+    "#\n",
+    "#!pip install git+https://github.com/doctorado-ml/stree"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "import time\n",
     "from sklearn.ensemble import AdaBoostClassifier\n",
     "from sklearn.tree import DecisionTreeClassifier\n",
-    "from sklearn.svm import LinearSVC\n",
+    "from sklearn.svm import LinearSVC, SVC\n",
     "from sklearn.model_selection import GridSearchCV, train_test_split\n",
     "from sklearn.datasets import load_iris\n",
     "from stree import Stree"
@@ -17,7 +44,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -29,13 +56,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
      "output_type": "stream",
      "name": "stdout",
-     "text": "Fraud: 0.244% 196\nValid: 99.755% 80234\nX.shape (1196, 28)  y.shape (1196,)\nFraud: 16.722% 200\nValid: 83.278% 996\n"
+     "text": "Fraud: 0.173% 492\nValid: 99.827% 284315\nX.shape (100492, 28)  y.shape (100492,)\nFraud: 0.659% 662\nValid: 99.341% 99830\n"
     }
    ],
    "source": [
@@ -68,9 +95,10 @@
     "    Xtrain, Xtest, ytrain, ytest = train_test_split(X, y, train_size=0.7, shuffle=True, random_state=random_state, stratify=y)\n",
     "    return Xtrain, Xtest, ytrain, ytest\n",
     "\n",
-    "data = load_creditcard(-1000) # Take all true samples + 1000 of the others\n",
+    "# data = load_creditcard(-1000) # Take all true samples + 1000 of the others\n",
     "# data = load_creditcard(5000)  # Take the first 5000 samples\n",
     "# data = load_creditcard(0) # Take all the samples\n",
+    "data = load_creditcard(-100000)\n",
     "\n",
     "Xtrain = data[0]\n",
     "Xtest = data[1]\n",
@@ -78,15 +106,29 @@
     "ytest = data[3]"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Tests"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## STree alone on the whole dataset and linear kernel"
+   ]
+  },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
      "output_type": "stream",
      "name": "stdout",
-     "text": "Score Train:  0.986857825567503\nScore Test:  0.9805013927576601\nTook 0.12 seconds\n"
+     "text": "Score Train:  0.9985499829409757\nScore Test:  0.998407854584052\nTook 39.45 seconds\n"
     }
    ],
    "source": [
@@ -99,43 +141,21 @@
    ]
   },
   {
-   "cell_type": "code",
+   "cell_type": "markdown",
-   "execution_count": 5,
    "metadata": {},
-   "outputs": [
-    {
-     "output_type": "stream",
-     "name": "stdout",
-     "text": "Score Train:  0.997610513739546\nScore Test:  0.9721448467966574\nTook 7.80 seconds\n"
-    }
-   ],
    "source": [
-    "now = time.time()\n",
+    "## Different kernels with different configuations"
-    "clf2 = AdaBoostClassifier(Stree(max_depth=3, random_state=random_state), n_estimators=100, random_state=random_state)\n",
-    "clf2.fit(Xtrain, ytrain)\n",
-    "print(\"Score Train: \", clf2.score(Xtrain, ytrain))\n",
-    "print(\"Score Test: \", clf2.score(Xtest, ytest))\n",
-    "print(f\"Took {time.time() - now:.2f} seconds\")"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": 6,
    "metadata": {},
-   "outputs": [
+   "outputs": [],
-    {
-     "output_type": "stream",
-     "name": "stdout",
-     "text": "Score Train:  0.9796893667861409\nScore Test:  0.9554317548746518\nTook 0.48 seconds\n"
-    }
-   ],
    "source": [
-    "now = time.time()\n",
+    "n_estimators = 10\n",
-    "clf3 = AdaBoostClassifier(LinearSVC(random_state=random_state), n_estimators=100, random_state=random_state, algorithm='SAMME')\n",
+    "C = 7\n",
-    "clf3.fit(Xtrain, ytrain)\n",
+    "max_depth = 3"
-    "print(\"Score Train: \", clf3.score(Xtrain, ytrain))\n",
-    "print(\"Score Test: \", clf3.score(Xtest, ytest))\n",
-    "print(f\"Took {time.time() - now:.2f} seconds\")"
    ]
   },
   {
@@ -146,24 +166,46 @@
     {
      "output_type": "stream",
      "name": "stdout",
-     "text": "Score Train:  1.0\nScore Test:  0.9721448467966574\nTook 0.86 seconds\n"
+     "text": "Kernel: linear\tTime: 87.00 seconds\tScore Train: 0.9982372\tScore Test: 0.9981425\nKernel: rbf\tTime: 60.60 seconds\tScore Train: 0.9934181\tScore Test: 0.9933992\nKernel: poly\tTime: 88.08 seconds\tScore Train: 0.9937450\tScore Test: 0.9938968\n"
     }
    ],
    "source": [
+    "for kernel in ['linear', 'rbf', 'poly']:\n",
     "    now = time.time()\n",
-    "clf4 = AdaBoostClassifier(DecisionTreeClassifier(max_depth=1, random_state=random_state), n_estimators=100, random_state=random_state)\n",
+    "    clf = AdaBoostClassifier(Stree(C=7, kernel=kernel, max_depth=max_depth, random_state=random_state), n_estimators=n_estimators, random_state=random_state)\n",
-    "clf4.fit(Xtrain, ytrain)\n",
+    "    clf.fit(Xtrain, ytrain)\n",
-    "print(\"Score Train: \", clf4.score(Xtrain, ytrain))\n",
+    "    score_train = clf.score(Xtrain, ytrain)\n",
-    "print(\"Score Test: \", clf4.score(Xtest, ytest))\n",
+    "    score_test = clf.score(Xtest, ytest)\n",
-    "print(f\"Took {time.time() - now:.2f} seconds\")"
+    "    print(f\"Kernel: {kernel}\\tTime: {time.time() - now:.2f} seconds\\tScore Train: {score_train:.7f}\\tScore Test: {score_test:.7f}\")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Test algorithm SAMME in AdaBoost to check speed/accuracy"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 8,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
-   "source": []
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": "Kernel: linear\tTime: 58.75 seconds\tScore Train: 0.9980524\tScore Test: 0.9978771\nKernel: rbf\tTime: 12.49 seconds\tScore Train: 0.9934181\tScore Test: 0.9933992\nKernel: poly\tTime: 97.85 seconds\tScore Train: 0.9972137\tScore Test: 0.9971806\n"
+    }
+   ],
+   "source": [
+    "for kernel in ['linear', 'rbf', 'poly']:\n",
+    "    now = time.time()\n",
+    "    clf = AdaBoostClassifier(Stree(C=7, kernel=kernel, max_depth=max_depth, random_state=random_state), n_estimators=n_estimators, random_state=random_state, algorithm=\"SAMME\")\n",
+    "    clf.fit(Xtrain, ytrain)\n",
+    "    score_train = clf.score(Xtrain, ytrain)\n",
+    "    score_test = clf.score(Xtest, ytest)\n",
+    "    print(f\"Kernel: {kernel}\\tTime: {time.time() - now:.2f} seconds\\tScore Train: {score_train:.7f}\\tScore Test: {score_test:.7f}\")"
+   ]
   }
  ],
  "metadata": {

notebooks/benchmark.ipynb

@@ -1,5 +1,20 @@
 {
  "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Compare STree with different estimators"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Setup\n",
+    "Uncomment the next cell if STree is not already installed"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 1,
@@ -40,6 +55,13 @@
     "    !tar xzf creditcard.tgz"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Tests"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 4,
@@ -55,6 +77,13 @@
     "print(datetime.date.today(), time.strftime(\"%H:%M:%S\"))"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Load dataset and normalize values"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 5,
@@ -113,6 +142,13 @@
     "print(f\"X shape: {X.shape}\\ny shape: {y.shape}\")"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Build the models"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 9,
@@ -174,6 +210,13 @@
     "gradient = GradientBoostingClassifier(random_state=random_state)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Do the test"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 15,

notebooks/features.ipynb

@@ -0,0 +1,370 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Test smple_weight, kernels, C, sklearn estimator"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Setup\n",
+    "Uncomment the next cell if STree is not already installed"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#\n",
+    "# Google Colab setup\n",
+    "#\n",
+    "#!pip install git+https://github.com/doctorado-ml/stree"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import numpy as np\n",
+    "import pandas as pd\n",
+    "from sklearn.svm import SVC\n",
+    "from sklearn.tree import DecisionTreeClassifier\n",
+    "from sklearn.utils.estimator_checks import check_estimator\n",
+    "from sklearn.datasets import make_classification, load_iris, load_wine\n",
+    "from sklearn.model_selection import train_test_split\n",
+    "from stree import Stree\n",
+    "import time"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import os\n",
+    "if not os.path.isfile('data/creditcard.csv'):\n",
+    "    !wget --no-check-certificate --content-disposition http://nube.jccm.es/index.php/s/Zs7SYtZQJ3RQ2H2/download\n",
+    "    !tar xzf creditcard.tgz"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": "Fraud: 0.173% 492\nValid: 99.827% 284315\nX.shape (1492, 28)  y.shape (1492,)\nFraud: 33.110% 494\nValid: 66.890% 998\n"
+    }
+   ],
+   "source": [
+    "random_state=1\n",
+    "\n",
+    "def load_creditcard(n_examples=0):\n",
+    "    import pandas as pd\n",
+    "    import numpy as np\n",
+    "    import random\n",
+    "    df = pd.read_csv('data/creditcard.csv')\n",
+    "    print(\"Fraud: {0:.3f}% {1}\".format(df.Class[df.Class == 1].count()*100/df.shape[0], df.Class[df.Class == 1].count()))\n",
+    "    print(\"Valid: {0:.3f}% {1}\".format(df.Class[df.Class == 0].count()*100/df.shape[0], df.Class[df.Class == 0].count()))\n",
+    "    y = df.Class\n",
+    "    X = df.drop(['Class', 'Time', 'Amount'], axis=1).values\n",
+    "    if n_examples > 0:\n",
+    "        # Take first n_examples samples\n",
+    "        X = X[:n_examples, :]\n",
+    "        y = y[:n_examples, :]\n",
+    "    else:\n",
+    "        # Take all the positive samples with a number of random negatives\n",
+    "        if n_examples < 0:\n",
+    "            Xt = X[(y == 1).ravel()]\n",
+    "            yt = y[(y == 1).ravel()]\n",
+    "            indices = random.sample(range(X.shape[0]), -1 * n_examples)\n",
+    "            X = np.append(Xt, X[indices], axis=0)\n",
+    "            y = np.append(yt, y[indices], axis=0)\n",
+    "    print(\"X.shape\", X.shape, \" y.shape\", y.shape)\n",
+    "    print(\"Fraud: {0:.3f}% {1}\".format(len(y[y == 1])*100/X.shape[0], len(y[y == 1])))\n",
+    "    print(\"Valid: {0:.3f}% {1}\".format(len(y[y == 0]) * 100 / X.shape[0], len(y[y == 0])))\n",
+    "    Xtrain, Xtest, ytrain, ytest = train_test_split(X, y, train_size=0.7, shuffle=True, random_state=random_state, stratify=y)\n",
+    "    return Xtrain, Xtest, ytrain, ytest\n",
+    "\n",
+    "# data = load_creditcard(-5000) # Take all true samples + 5000 of the others\n",
+    "# data = load_creditcard(5000)  # Take the first 5000 samples\n",
+    "data = load_creditcard(-1000) # Take all the samples\n",
+    "\n",
+    "Xtrain = data[0]\n",
+    "Xtest = data[1]\n",
+    "ytrain = data[2]\n",
+    "ytest = data[3]\n",
+    "# Set weights inverse to its count class in dataset\n",
+    "weights = np.ones(Xtrain.shape[0],) * 1.00244\n",
+    "weights[ytrain==1] = 1.99755\n",
+    "weights_test = np.ones(Xtest.shape[0],) * 1.00244\n",
+    "weights_test[ytest==1] = 1.99755 "
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Tests"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Test smple_weights\n",
+    "Compute accuracy with weights in samples. The weights are set based on the inverse of the number of samples of each class"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": "Accuracy of Train without weights 0.9789272030651341\nAccuracy of Train with    weights 0.9952107279693486\nAccuracy of Tests without weights 0.9598214285714286\nAccuracy of Tests with    weights 0.9508928571428571\n"
+    }
+   ],
+   "source": [
+    "C = 23\n",
+    "print(\"Accuracy of Train without weights\", Stree(C=C, random_state=1).fit(Xtrain, ytrain).score(Xtrain, ytrain))\n",
+    "print(\"Accuracy of Train with    weights\", Stree(C=C, random_state=1).fit(Xtrain, ytrain, sample_weight=weights).score(Xtrain, ytrain))\n",
+    "print(\"Accuracy of Tests without weights\", Stree(C=C, random_state=1).fit(Xtrain, ytrain).score(Xtest, ytest))\n",
+    "print(\"Accuracy of Tests with    weights\", Stree(C=C, random_state=1).fit(Xtrain, ytrain, sample_weight=weights).score(Xtest, ytest))"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Test accuracy with different kernels\n",
+    "Compute accuracy on train and test set with default hyperparmeters of every kernel"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": "Time: 0.27s\tKernel: linear\tAccuracy_train: 0.9683908045977011\tAccuracy_test: 0.953125\nTime: 0.09s\tKernel: rbf\tAccuracy_train: 0.9875478927203065\tAccuracy_test: 0.9598214285714286\nTime: 0.06s\tKernel: poly\tAccuracy_train: 0.9885057471264368\tAccuracy_test: 0.9464285714285714\n"
+    }
+   ],
+   "source": [
+    "random_state=1\n",
+    "for kernel in ['linear', 'rbf', 'poly']:\n",
+    "    now = time.time()\n",
+    "    clf = Stree(C=7, kernel=kernel, random_state=random_state).fit(Xtrain, ytrain)\n",
+    "    accuracy_train = clf.score(Xtrain, ytrain)\n",
+    "    accuracy_test = clf.score(Xtest, ytest)\n",
+    "    time_spent = time.time() - now\n",
+    "    print(f\"Time: {time_spent:.2f}s\\tKernel: {kernel}\\tAccuracy_train: {accuracy_train}\\tAccuracy_test: {accuracy_test}\")\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Test diferent values of C"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "metadata": {
+    "tags": [
+     "outputPrepend"
+    ]
+   },
+   "outputs": [
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": "************** C=0.001 ****************************\nClassifier's accuracy (train): 0.9531\nClassifier's accuracy (test) : 0.9621\nroot\nroot - Down, <cgaf> - Leaf class=1 belief= 0.983713 counts=(array([0, 1]), array([  5, 302]))\nroot - Up, <cgaf> - Leaf class=0 belief= 0.940299 counts=(array([0, 1]), array([693,  44]))\n\n**************************************************\n************** C=0.01 ****************************\nClassifier's accuracy (train): 0.9569\nClassifier's accuracy (test) : 0.9621\nroot\nroot - Down, <cgaf> - Leaf class=1 belief= 0.990228 counts=(array([0, 1]), array([  3, 304]))\nroot - Up, <cgaf> - Leaf class=0 belief= 0.943012 counts=(array([0, 1]), array([695,  42]))\n\n**************************************************\n************** C=1 ****************************\nClassifier's accuracy (train): 0.9655\nClassifier's accuracy (test) : 0.9643\nroot\nroot - Down\nroot - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([310]))\nroot - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([5]))\nroot - Up, <cgaf> - Leaf class=0 belief= 0.950617 counts=(array([0, 1]), array([693,  36]))\n\n**************************************************\n************** C=5 ****************************\nClassifier's accuracy (train): 0.9684\nClassifier's accuracy (test) : 0.9598\nroot\nroot - Down\nroot - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([311]))\nroot - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([8]))\nroot - Up\nroot - Up - Down\nroot - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([1]))\nroot - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([2]))\nroot - Up - Up\nroot - Up - Up - Down, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([2]))\nroot - Up - Up - Up\nroot - Up - Up - Up - Down\nroot - Up - Up - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([1]))\nroot - Up - Up - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([1]))\nroot - Up - Up - Up - Up, <cgaf> - Leaf class=0 belief= 0.954039 counts=(array([0, 1]), array([685,  33]))\n\n**************************************************\n************** C=17 ****************************\nClassifier's accuracy (train): 0.9751\nClassifier's accuracy (test) : 0.9464\nroot\nroot - Down\nroot - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([304]))\nroot - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([8]))\nroot - Up\nroot - Up - Down\nroot - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([4]))\nroot - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([3]))\nroot - Up - Up\nroot - Up - Up - Down\nroot - Up - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([4]))\nroot - Up - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([2]))\nroot - Up - Up - Up\nroot - Up - Up - Up - Down\nroot - Up - Up - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([3]))\nroot - Up - Up - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([1]))\nroot - Up - Up - Up - Up\nroot - Up - Up - Up - Up - Down\nroot - Up - Up - Up - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([3]))\nroot - Up - Up - Up - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([3]))\nroot - Up - Up - Up - Up - Up\nroot - Up - Up - Up - Up - Up - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([2]))\nroot - Up - Up - Up - Up - Up - Up, <cgaf> - Leaf class=0 belief= 0.963225 counts=(array([0, 1]), array([681,  26]))\n\n**************************************************\n0.6869 secs\n"
+    }
+   ],
+   "source": [
+    "t = time.time()\n",
+    "for C in (.001, .01, 1, 5, 17):\n",
+    "    clf = Stree(C=C, kernel=\"linear\", random_state=random_state)\n",
+    "    clf.fit(Xtrain, ytrain)\n",
+    "    print(f\"************** C={C} ****************************\")\n",
+    "    print(f\"Classifier's accuracy (train): {clf.score(Xtrain, ytrain):.4f}\")\n",
+    "    print(f\"Classifier's accuracy (test) : {clf.score(Xtest, ytest):.4f}\")\n",
+    "    print(clf)\n",
+    "    print(f\"**************************************************\")\n",
+    "print(f\"{time.time() - t:.4f} secs\")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Test iterator\n",
+    "Check different weays of using the iterator"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 8,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": "root\nroot - Down\nroot - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([304]))\nroot - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([8]))\nroot - Up\nroot - Up - Down\nroot - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([4]))\nroot - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([3]))\nroot - Up - Up\nroot - Up - Up - Down\nroot - Up - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([4]))\nroot - Up - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([2]))\nroot - Up - Up - Up\nroot - Up - Up - Up - Down\nroot - Up - Up - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([3]))\nroot - Up - Up - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([1]))\nroot - Up - Up - Up - Up\nroot - Up - Up - Up - Up - Down\nroot - Up - Up - Up - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([3]))\nroot - Up - Up - Up - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([3]))\nroot - Up - Up - Up - Up - Up\nroot - Up - Up - Up - Up - Up - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([2]))\nroot - Up - Up - Up - Up - Up - Up, <cgaf> - Leaf class=0 belief= 0.963225 counts=(array([0, 1]), array([681,  26]))\n"
+    }
+   ],
+   "source": [
+    "#check iterator\n",
+    "for i in list(clf):\n",
+    "    print(i)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 9,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": "root\nroot - Down\nroot - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([304]))\nroot - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([8]))\nroot - Up\nroot - Up - Down\nroot - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([4]))\nroot - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([3]))\nroot - Up - Up\nroot - Up - Up - Down\nroot - Up - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([4]))\nroot - Up - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([2]))\nroot - Up - Up - Up\nroot - Up - Up - Up - Down\nroot - Up - Up - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([3]))\nroot - Up - Up - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([1]))\nroot - Up - Up - Up - Up\nroot - Up - Up - Up - Up - Down\nroot - Up - Up - Up - Up - Down - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([3]))\nroot - Up - Up - Up - Up - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([3]))\nroot - Up - Up - Up - Up - Up\nroot - Up - Up - Up - Up - Up - Down, <pure> - Leaf class=1 belief= 1.000000 counts=(array([1]), array([2]))\nroot - Up - Up - Up - Up - Up - Up, <cgaf> - Leaf class=0 belief= 0.963225 counts=(array([0, 1]), array([681,  26]))\n"
+    }
+   ],
+   "source": [
+    "#check iterator again\n",
+    "for i in clf:\n",
+    "    print(i)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Test STree is a sklearn estimator"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 10,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": "1 functools.partial(<function check_no_attributes_set_in_init at 0x1254f13b0>, 'Stree')\n2 functools.partial(<function check_estimators_dtypes at 0x1254e84d0>, 'Stree')\n3 functools.partial(<function check_fit_score_takes_y at 0x1254e83b0>, 'Stree')\n4 functools.partial(<function check_sample_weights_pandas_series at 0x1254e0cb0>, 'Stree')\n5 functools.partial(<function check_sample_weights_not_an_array at 0x1254e0dd0>, 'Stree')\n6 functools.partial(<function check_sample_weights_list at 0x1254e0ef0>, 'Stree')\n7 functools.partial(<function check_sample_weights_shape at 0x1254e2050>, 'Stree')\n8 functools.partial(<function check_sample_weights_invariance at 0x1254e2170>, 'Stree')\n9 functools.partial(<function check_estimators_fit_returns_self at 0x1254eb4d0>, 'Stree')\n10 functools.partial(<function check_estimators_fit_returns_self at 0x1254eb4d0>, 'Stree', readonly_memmap=True)\n11 functools.partial(<function check_complex_data at 0x1254e2320>, 'Stree')\n12 functools.partial(<function check_dtype_object at 0x1254e2290>, 'Stree')\n13 functools.partial(<function check_estimators_empty_data_messages at 0x1254e85f0>, 'Stree')\n14 functools.partial(<function check_pipeline_consistency at 0x1254e8290>, 'Stree')\n15 functools.partial(<function check_estimators_nan_inf at 0x1254e8710>, 'Stree')\n16 functools.partial(<function check_estimators_overwrite_params at 0x1254f1290>, 'Stree')\n17 functools.partial(<function check_estimator_sparse_data at 0x1254e0b90>, 'Stree')\n18 functools.partial(<function check_estimators_pickle at 0x1254e8950>, 'Stree')\n19 functools.partial(<function check_classifier_data_not_an_array at 0x1254f15f0>, 'Stree')\n20 functools.partial(<function check_classifiers_one_label at 0x1254eb050>, 'Stree')\n21 functools.partial(<function check_classifiers_classes at 0x1254eba70>, 'Stree')\n22 functools.partial(<function check_estimators_partial_fit_n_features at 0x1254e8a70>, 'Stree')\n23 functools.partial(<function check_classifiers_train at 0x1254eb170>, 'Stree')\n24 functools.partial(<function check_classifiers_train at 0x1254eb170>, 'Stree', readonly_memmap=True)\n25 functools.partial(<function check_classifiers_train at 0x1254eb170>, 'Stree', readonly_memmap=True, X_dtype='float32')\n26 functools.partial(<function check_classifiers_regression_target at 0x1254f40e0>, 'Stree')\n27 functools.partial(<function check_supervised_y_no_nan at 0x1254da9e0>, 'Stree')\n28 functools.partial(<function check_supervised_y_2d at 0x1254eb710>, 'Stree')\n29 functools.partial(<function check_estimators_unfitted at 0x1254eb5f0>, 'Stree')\n30 functools.partial(<function check_non_transformer_estimators_n_iter at 0x1254f1c20>, 'Stree')\n31 functools.partial(<function check_decision_proba_consistency at 0x1254f4200>, 'Stree')\n32 functools.partial(<function check_fit2d_predict1d at 0x1254e2830>, 'Stree')\n33 functools.partial(<function check_methods_subset_invariance at 0x1254e29e0>, 'Stree')\n34 functools.partial(<function check_fit2d_1sample at 0x1254e2b00>, 'Stree')\n35 functools.partial(<function check_fit2d_1feature at 0x1254e2c20>, 'Stree')\n36 functools.partial(<function check_fit1d at 0x1254e2d40>, 'Stree')\n37 functools.partial(<function check_get_params_invariance at 0x1254f1e60>, 'Stree')\n38 functools.partial(<function check_set_params at 0x1254f1f80>, 'Stree')\n39 functools.partial(<function check_dict_unchanged at 0x1254e2440>, 'Stree')\n40 functools.partial(<function check_dont_overwrite_parameters at 0x1254e2710>, 'Stree')\n41 functools.partial(<function check_fit_idempotent at 0x1254f43b0>, 'Stree')\n42 functools.partial(<function check_n_features_in at 0x1254f4440>, 'Stree')\n43 functools.partial(<function check_requires_y_none at 0x1254f44d0>, 'Stree')\n"
+    }
+   ],
+   "source": [
+    "# Make checks one by one\n",
+    "c = 0\n",
+    "checks = check_estimator(Stree(), generate_only=True)\n",
+    "for check in checks:\n",
+    "    c += 1\n",
+    "    print(c, check[1])\n",
+    "    check[1](check[0])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 11,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Check if the classifier is a sklearn estimator\n",
+    "check_estimator(Stree())"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Compare to SVM"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 12,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": "== Not Weighted ===\nSVC train score ..: 0.9521072796934866\nSTree train score : 0.9578544061302682\nSVC test score ...: 0.9553571428571429\nSTree test score .: 0.9575892857142857\n==== Weighted =====\nSVC train score ..: 0.9616858237547893\nSTree train score : 0.9616858237547893\nSVC test score ...: 0.9642857142857143\nSTree test score .: 0.9598214285714286\n*SVC test score ..: 0.951413553411694\n*STree test score : 0.9480517444389333\n"
+    }
+   ],
+   "source": [
+    "svc = SVC(C=7, kernel='rbf', gamma=.001, random_state=random_state)\n",
+    "clf = Stree(C=17, kernel='rbf', gamma=.001, random_state=random_state)\n",
+    "svc.fit(Xtrain, ytrain)\n",
+    "clf.fit(Xtrain, ytrain)\n",
+    "print(\"== Not Weighted ===\")\n",
+    "print(\"SVC train score ..:\", svc.score(Xtrain, ytrain))\n",
+    "print(\"STree train score :\", clf.score(Xtrain, ytrain))\n",
+    "print(\"SVC test score ...:\", svc.score(Xtest, ytest))\n",
+    "print(\"STree test score .:\", clf.score(Xtest, ytest))\n",
+    "svc.fit(Xtrain, ytrain, weights)\n",
+    "clf.fit(Xtrain, ytrain, weights)\n",
+    "print(\"==== Weighted =====\")\n",
+    "print(\"SVC train score ..:\", svc.score(Xtrain, ytrain))\n",
+    "print(\"STree train score :\", clf.score(Xtrain, ytrain))\n",
+    "print(\"SVC test score ...:\", svc.score(Xtest, ytest))\n",
+    "print(\"STree test score .:\", clf.score(Xtest, ytest))\n",
+    "print(\"*SVC test score ..:\", svc.score(Xtest, ytest, weights_test))\n",
+    "print(\"*STree test score :\", clf.score(Xtest, ytest, weights_test))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 13,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": "root\nroot - Down\nroot - Down - Down, <cgaf> - Leaf class=1 belief= 0.969325 counts=(array([0, 1]), array([ 10, 316]))\nroot - Down - Up, <pure> - Leaf class=0 belief= 1.000000 counts=(array([0]), array([1]))\nroot - Up, <cgaf> - Leaf class=0 belief= 0.958159 counts=(array([0, 1]), array([687,  30]))\n\n"
+    }
+   ],
+   "source": [
+    "print(clf)"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3.7.6 64-bit ('general': venv)",
+   "language": "python",
+   "name": "python37664bitgeneralvenvfbd0a23e74cf4e778460f5ffc6761f39"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.7.6-final"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}

notebooks/test2.ipynb

@@ -1,225 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#\n",
-    "# Google Colab setup\n",
-    "#\n",
-    "#!pip install git+https://github.com/doctorado-ml/stree"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import numpy as np\n",
-    "import pandas as pd\n",
-    "from sklearn.svm import LinearSVC\n",
-    "from sklearn.tree import DecisionTreeClassifier\n",
-    "from sklearn.datasets import make_classification, load_iris, load_wine\n",
-    "from sklearn.model_selection import train_test_split\n",
-    "from stree import Stree\n",
-    "import time"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "if not os.path.isfile('data/creditcard.csv'):\n",
-    "    !wget --no-check-certificate --content-disposition http://nube.jccm.es/index.php/s/Zs7SYtZQJ3RQ2H2/download\n",
-    "    !tar xzf creditcard.tgz"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 19,
-   "metadata": {},
-   "outputs": [
-    {
-     "output_type": "stream",
-     "name": "stdout",
-     "text": "Fraud: 0.244% 196\nValid: 99.755% 80234\nX.shape (1196, 28)  y.shape (1196,)\nFraud: 16.472% 197\nValid: 83.528% 999\n"
-    }
-   ],
-   "source": [
-    "random_state=1\n",
-    "\n",
-    "def load_creditcard(n_examples=0):\n",
-    "    import pandas as pd\n",
-    "    import numpy as np\n",
-    "    import random\n",
-    "    df = pd.read_csv('data/creditcard.csv')\n",
-    "    print(\"Fraud: {0:.3f}% {1}\".format(df.Class[df.Class == 1].count()*100/df.shape[0], df.Class[df.Class == 1].count()))\n",
-    "    print(\"Valid: {0:.3f}% {1}\".format(df.Class[df.Class == 0].count()*100/df.shape[0], df.Class[df.Class == 0].count()))\n",
-    "    y = df.Class\n",
-    "    X = df.drop(['Class', 'Time', 'Amount'], axis=1).values\n",
-    "    if n_examples > 0:\n",
-    "        # Take first n_examples samples\n",
-    "        X = X[:n_examples, :]\n",
-    "        y = y[:n_examples, :]\n",
-    "    else:\n",
-    "        # Take all the positive samples with a number of random negatives\n",
-    "        if n_examples < 0:\n",
-    "            Xt = X[(y == 1).ravel()]\n",
-    "            yt = y[(y == 1).ravel()]\n",
-    "            indices = random.sample(range(X.shape[0]), -1 * n_examples)\n",
-    "            X = np.append(Xt, X[indices], axis=0)\n",
-    "            y = np.append(yt, y[indices], axis=0)\n",
-    "    print(\"X.shape\", X.shape, \" y.shape\", y.shape)\n",
-    "    print(\"Fraud: {0:.3f}% {1}\".format(len(y[y == 1])*100/X.shape[0], len(y[y == 1])))\n",
-    "    print(\"Valid: {0:.3f}% {1}\".format(len(y[y == 0]) * 100 / X.shape[0], len(y[y == 0])))\n",
-    "    Xtrain, Xtest, ytrain, ytest = train_test_split(X, y, train_size=0.7, shuffle=True, random_state=random_state, stratify=y)\n",
-    "    return Xtrain, Xtest, ytrain, ytest\n",
-    "\n",
-    "# data = load_creditcard(-5000) # Take all true samples + 5000 of the others\n",
-    "# data = load_creditcard(5000)  # Take the first 5000 samples\n",
-    "data = load_creditcard(-1000) # Take all the samples\n",
-    "\n",
-    "Xtrain = data[0]\n",
-    "Xtest = data[1]\n",
-    "ytrain = data[2]\n",
-    "ytest = data[3]\n",
-    "# Set weights inverse to its count class in dataset\n",
-    "weights = np.ones(Xtrain.shape[0],) * 1.00244\n",
-    "weights[ytrain==1] = 1.99755 "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 21,
-   "metadata": {},
-   "outputs": [
-    {
-     "output_type": "stream",
-     "name": "stdout",
-     "text": "Accuracy of Train without weights 0.996415770609319\nAccuracy of Train with    weights 0.994026284348865\nAccuracy of Tests without weights 0.9665738161559888\nAccuracy of Tests with    weights 0.9721448467966574\n"
-    }
-   ],
-   "source": [
-    "C = 23\n",
-    "print(\"Accuracy of Train without weights\", Stree(C=C, random_state=1).fit(Xtrain, ytrain).score(Xtrain, ytrain))\n",
-    "print(\"Accuracy of Train with    weights\", Stree(C=C, random_state=1).fit(Xtrain, ytrain, sample_weight=weights).score(Xtrain, ytrain))\n",
-    "print(\"Accuracy of Tests without weights\", Stree(C=C, random_state=1).fit(Xtrain, ytrain).score(Xtest, ytest))\n",
-    "print(\"Accuracy of Tests with    weights\", Stree(C=C, random_state=1).fit(Xtrain, ytrain, sample_weight=weights).score(Xtest, ytest))"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "tags": [
-     "outputPrepend"
-    ]
-   },
-   "outputs": [],
-   "source": [
-    "t = time.time()\n",
-    "for C in (.001, .01, 1, 5, 17):\n",
-    "    clf = Stree(C=C, random_state=random_state)\n",
-    "    clf.fit(Xtrain, ytrain)\n",
-    "    print(f\"************** C={C} ****************************\")\n",
-    "    print(f\"Classifier's accuracy (train): {clf.score(Xtrain, ytrain):.4f}\")\n",
-    "    print(f\"Classifier's accuracy (test) : {clf.score(Xtest, ytest):.4f}\")\n",
-    "    print(clf)\n",
-    "    print(f\"**************************************************\")\n",
-    "print(f\"{time.time() - t:.4f} secs\")"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import numpy as np\n",
-    "from sklearn.preprocessing import StandardScaler\n",
-    "from sklearn.svm import LinearSVC\n",
-    "from sklearn.calibration import CalibratedClassifierCV\n",
-    "scaler = StandardScaler()\n",
-    "cclf = CalibratedClassifierCV(base_estimator=LinearSVC(), cv=5)\n",
-    "cclf.fit(Xtrain, ytrain)\n",
-    "res = cclf.predict_proba(Xtest)\n",
-    "print(res[:4, :])"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#check iterator\n",
-    "for i in list(clf):\n",
-    "    print(i)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#check iterator again\n",
-    "for i in clf:\n",
-    "    print(i)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Check if the classifier is a sklearn estimator\n",
-    "from sklearn.utils.estimator_checks import check_estimator\n",
-    "check_estimator(Stree())"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Make checks one by one\n",
-    "c = 0\n",
-    "checks = check_estimator(Stree(), generate_only=True)\n",
-    "for check in checks:\n",
-    "    c += 1\n",
-    "    print(c, check[1])\n",
-    "    check[1](check[0])"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3.7.6 64-bit ('general': venv)",
-   "language": "python",
-   "name": "python37664bitgeneralvenvfbd0a23e74cf4e778460f5ffc6761f39"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.7.6-final"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 2
-}

pyproject.toml

@@ -0,0 +1,16 @@
+[tool.black]
+line-length = 79
+include = '\.pyi?$'
+exclude = '''
+/(
+    \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | _build
+  | buck-out
+  | build
+  | dist
+)/
+'''

setup.py

@@ -5,37 +5,32 @@ __author__ = "Ricardo Montañana Gómez"
 
 
 def readme():
-    with open('README.md') as f:
+    with open("README.md") as f:
         return f.read()
 
 
 setuptools.setup(
-    name='STree',
+    name="STree",
     version=__version__,
-    license='MIT License',
+    license="MIT License",
-    description='Oblique decision tree with svm nodes',
+    description="Oblique decision tree with svm nodes",
     long_description=readme(),
-    long_description_content_type='text/markdown',
+    long_description_content_type="text/markdown",
     packages=setuptools.find_packages(),
-    url='https://github.com/doctorado-ml/stree',
+    url="https://github.com/doctorado-ml/stree",
     author=__author__,
-    author_email='ricardo.montanana@alu.uclm.es',
+    author_email="ricardo.montanana@alu.uclm.es",
-    keywords='scikit-learn oblique-classifier oblique-decision-tree decision-\
+    keywords="scikit-learn oblique-classifier oblique-decision-tree decision-\
-    tree svm svc',
+    tree svm svc",
     classifiers=[
-        'Development Status :: 4 - Beta',
+        "Development Status :: 4 - Beta",
-        'License :: OSI Approved :: MIT License',
+        "License :: OSI Approved :: MIT License",
-        'Programming Language :: Python :: 3.7',
+        "Programming Language :: Python :: 3.7",
-        'Natural Language :: English',
+        "Natural Language :: English",
-        'Topic :: Scientific/Engineering :: Artificial Intelligence',
+        "Topic :: Scientific/Engineering :: Artificial Intelligence",
-        'Intended Audience :: Science/Research'
+        "Intended Audience :: Science/Research",
-    ],
-    install_requires=[
-        'scikit-learn>=0.23.0',
-        'numpy',
-        'matplotlib',
-        'ipympl'
     ],
+    install_requires=["scikit-learn>=0.23.0", "numpy", "matplotlib", "ipympl"],
     test_suite="stree.tests",
-    zip_safe=False
+    zip_safe=False,
 )

stree/Strees.py

@@ -1,20 +1,25 @@
-'''
+"""
 __author__ = "Ricardo Montañana Gómez"
 __copyright__ = "Copyright 2020, Ricardo Montañana Gómez"
 __license__ = "MIT"
 __version__ = "0.9"
 Build an oblique tree classifier based on SVM Trees
-Uses LinearSVC
+"""
-'''
 
 import os
 
 import numpy as np
 from sklearn.base import BaseEstimator, ClassifierMixin
-from sklearn.svm import LinearSVC
+from sklearn.svm import SVC, LinearSVC
+from sklearn.utils import check_consistent_length
 from sklearn.utils.multiclass import check_classification_targets
-from sklearn.utils.validation import check_X_y, check_array, check_is_fitted, \
+from sklearn.utils.validation import (
-    _check_sample_weight
+    check_X_y,
+    check_array,
+    check_is_fitted,
+    _check_sample_weight,
+)
+from sklearn.metrics._classification import _weighted_sum, _check_targets
 
 
 class Snode:
@@ -22,22 +27,19 @@ class Snode:
     dataset assigned to it
     """
 
-    def __init__(self, clf: LinearSVC, X: np.ndarray, y: np.ndarray,
+    def __init__(self, clf: SVC, X: np.ndarray, y: np.ndarray, title: str):
-                 title: str):
         self._clf = clf
-        self._vector = None if clf is None else clf.coef_
-        self._interceptor = 0. if clf is None else clf.intercept_
         self._title = title
-        self._belief = 0.
+        self._belief = 0.0
         # Only store dataset in Testing
-        self._X = X if os.environ.get('TESTING', 'NS') != 'NS' else None
+        self._X = X if os.environ.get("TESTING", "NS") != "NS" else None
         self._y = y
         self._down = None
         self._up = None
         self._class = None
 
     @classmethod
-    def copy(cls, node: 'Snode') -> 'Snode':
+    def copy(cls, node: "Snode") -> "Snode":
         return cls(node._clf, node._X, node._y, node._title)
 
     def set_down(self, son):
@@ -49,10 +51,10 @@ class Snode:
     def is_leaf(self) -> bool:
         return self._up is None and self._down is None
 
-    def get_down(self) -> 'Snode':
+    def get_down(self) -> "Snode":
         return self._down
 
-    def get_up(self) -> 'Snode':
+    def get_up(self) -> "Snode":
         return self._up
 
     def make_predictor(self):
@@ -65,20 +67,22 @@ class Snode:
         if len(classes) > 1:
             max_card = max(card)
             min_card = min(card)
-            try:
-                self._belief = max_card / (max_card + min_card)
-            except ZeroDivisionError:
-                self._belief = 0.
             self._class = classes[card == max_card][0]
+            self._belief = max_card / (max_card + min_card)
         else:
             self._belief = 1
+            try:
                 self._class = classes[0]
+            except IndexError:
+                self._class = None
 
     def __str__(self) -> str:
         if self.is_leaf():
             count_values = np.unique(self._y, return_counts=True)
-            result = f"{self._title} - Leaf class={self._class} belief="\
+            result = (
+                f"{self._title} - Leaf class={self._class} belief="
                 f"{self._belief: .6f} counts={count_values}"
+            )
             return result
         else:
             return f"{self._title}"
@@ -116,41 +120,40 @@ class Stree(BaseEstimator, ClassifierMixin):
     with "classifier" as value
     """
 
-    def __init__(self, C: float = 1.0, max_iter: int = 1000,
+    def __init__(
-                 random_state: int = None, max_depth: int = None,
+        self,
-                 tol: float = 1e-4, use_predictions: bool = False):
+        C: float = 1.0,
+        kernel: str = "linear",
+        max_iter: int = 1000,
+        random_state: int = None,
+        max_depth: int = None,
+        tol: float = 1e-4,
+        degree: int = 3,
+        gamma="scale",
+        split_criteria="max_samples",
+        min_samples_split: int = 0,
+    ):
         self.max_iter = max_iter
         self.C = C
+        self.kernel = kernel
         self.random_state = random_state
-        self.use_predictions = use_predictions
         self.max_depth = max_depth
         self.tol = tol
+        self.gamma = gamma
+        self.degree = degree
+        self.min_samples_split = min_samples_split
+        self.split_criteria = split_criteria
 
     def _more_tags(self) -> dict:
-        """Required by sklearn to tell that this estimator is a binary classifier
+        """Required by sklearn to supply features of the classifier
 
         :return: the tag required
         :rtype: dict
         """
-        return {'binary_only': True, 'requires_y': True}
+        return {"requires_y": True}
-
-    def _linear_function(self, data: np.array, node: Snode) -> np.array:
-        """Compute the distance of set of samples to a hyperplane, in
-        multiclass classification it should compute the distance to a
-        hyperplane of each class
-
-        :param data: dataset of samples
-        :type data: np.array
-        :param node: the node that contains the hyperplance coefficients
-        :type node: Snode
-        :return: array of distances of each sample to the hyperplane
-        :rtype: np.array
-        """
-        coef = node._vector[0, :].reshape(-1, data.shape[1])
-        return data.dot(coef.T) + node._interceptor[0]
 
     def _split_array(self, origin: np.array, down: np.array) -> list:
-        """Split an array in two based on indices passed as down and its complement
+        """Split an array in two based on indices (down) and its complement
 
         :param origin: dataset to split
         :type origin: np.array
@@ -160,8 +163,10 @@ class Stree(BaseEstimator, ClassifierMixin):
         :rtype: list
         """
         up = ~down
-        return origin[up[:, 0]] if any(up) else None, \
+        return (
-            origin[down[:, 0]] if any(down) else None
+            origin[up] if any(up) else None,
+            origin[down] if any(down) else None,
+        )
 
     def _distances(self, node: Snode, data: np.ndarray) -> np.array:
         """Compute distances of the samples to the hyperplane of the node
@@ -174,73 +179,98 @@ class Stree(BaseEstimator, ClassifierMixin):
         the hyperplane of the node
         :rtype: np.array
         """
-        if self.use_predictions:
+        return node._clf.decision_function(data)
-            res = np.expand_dims(node._clf.decision_function(data), 1)
-        else:
-            """doesn't work with multiclass as each sample has to do inner
-            product with its own coefficients computes positition of every
-            sample is w.r.t. the hyperplane
-            """
-            res = self._linear_function(data, node)
-        return res
 
-    def _split_criteria(self, data: np.array) -> np.array:
+    def _min_distance(self, data: np.array, _) -> np.array:
+        # chooses the lowest distance of every sample
+        indices = np.argmin(np.abs(data), axis=1)
+        return np.take(data, indices)
+
+    def _max_samples(self, data: np.array, y: np.array) -> np.array:
+        # select the class with max number of samples
+        _, samples = np.unique(y, return_counts=True)
+        selected = np.argmax(samples)
+        return data[:, selected]
+
+    def _split_criteria(self, data: np.array, node: Snode) -> np.array:
         """Set the criteria to split arrays
 
-        :param data: [description]
+        :param data: distances of samples to hyperplanes shape (m, nclasses)
+        if nclasses > 2 else (m,)
         :type data: np.array
-        :return: [description]
+        :param node: node containing the svm classifier
+        :type node: Snode
+        :return: array of booleans of samples under or above zero
         :rtype: np.array
         """
-        return data > 0
 
-    def fit(self, X: np.ndarray, y: np.ndarray,
+        if data.shape[0] < self.min_samples_split:
-            sample_weight: np.array = None) -> 'Stree':
+            return np.ones((data.shape[0]), dtype=bool)
+        if data.ndim > 1:
+            # split criteria for multiclass
+            data = getattr(self, f"_{self.split_criteria}")(data, node._y)
+        res = data > 0
+        return res
+
+    def fit(
+        self, X: np.ndarray, y: np.ndarray, sample_weight: np.array = None
+    ) -> "Stree":
         """Build the tree based on the dataset of samples and its labels
 
+        :param X: dataset of samples to make predictions
+        :type X: np.array
+        :param y: samples labels
+        :type y: np.array
+        :param sample_weight: weights of the samples. Rescale C per sample.
+        Hi' weights force the classifier to put more emphasis on these points
+        :type sample_weight: np.array optional
         :raises ValueError: if parameters C or max_depth are out of bounds
         :return: itself to be able to chain actions: fit().predict() ...
         :rtype: Stree
         """
         # Check parameters are Ok.
-        if type(y).__name__ == 'np.ndarray':
-            y = y.ravel()
         if self.C < 0:
             raise ValueError(
-                f"Penalty term must be positive... got (C={self.C:f})")
+                f"Penalty term must be positive... got (C={self.C:f})"
-        self.__max_depth = np.iinfo(
+            )
-            np.int32).max if self.max_depth is None else self.max_depth
+        self.__max_depth = (
+            np.iinfo(np.int32).max
+            if self.max_depth is None
+            else self.max_depth
+        )
         if self.__max_depth < 1:
             raise ValueError(
                 f"Maximum depth has to be greater than 1... got (max_depth=\
-                    {self.max_depth})")
+                    {self.max_depth})"
+            )
+        if self.split_criteria not in ["min_distance", "max_samples"]:
+            raise ValueError(
+                f"split_criteria has to be min_distance or \
+                max_samples got ({self.split_criteria})"
+            )
+
         check_classification_targets(y)
         X, y = check_X_y(X, y)
         sample_weight = _check_sample_weight(sample_weight, X)
         check_classification_targets(y)
         # Initialize computed parameters
         self.classes_, y = np.unique(y, return_inverse=True)
+        self.n_classes_ = self.classes_.shape[0]
         self.n_iter_ = self.max_iter
         self.depth_ = 0
         self.n_features_in_ = X.shape[1]
-        self.tree_ = self.train(X, y, sample_weight, 1, 'root')
+        self.tree_ = self.train(X, y, sample_weight, 1, "root")
         self._build_predictor()
         return self
 
-    def _build_predictor(self):
+    def train(
-        """Process the leaves to make them predictors
+        self,
-        """
+        X: np.ndarray,
-        def run_tree(node: Snode):
+        y: np.ndarray,
-            if node.is_leaf():
+        sample_weight: np.ndarray,
-                node.make_predictor()
+        depth: int,
-                return
+        title: str,
-            run_tree(node.get_down())
+    ) -> Snode:
-            run_tree(node.get_up())
-
-        run_tree(self.tree_)
-
-    def train(self, X: np.ndarray, y: np.ndarray, sample_weight: np.ndarray,
-              depth: int, title: str) -> Snode:
         """Recursive function to split the original dataset into predictor
         nodes (leaves)
 
@@ -248,7 +278,8 @@ class Stree(BaseEstimator, ClassifierMixin):
         :type X: np.ndarray
         :param y: samples labels
         :type y: np.ndarray
-        :param sample_weight: weight of samples (used in boosting)
+        :param sample_weight: weight of samples. Rescale C per sample.
+        Hi weights force the classifier to put more emphasis on these points.
         :type sample_weight: np.ndarray
         :param depth: actual depth in the tree
         :type depth: int
@@ -261,23 +292,56 @@ class Stree(BaseEstimator, ClassifierMixin):
             return None
         if np.unique(y).shape[0] == 1:
             # only 1 class => pure dataset
-            return Snode(None, X, y, title + ', <pure>')
+            return Snode(None, X, y, title + ", <pure>")
         # Train the model
-        clf = LinearSVC(max_iter=self.max_iter, random_state=self.random_state,
+        clf = self._build_clf()
-                        C=self.C)  # , sample_weight=sample_weight)
         clf.fit(X, y, sample_weight=sample_weight)
-        tree = Snode(clf, X, y, title)
+        node = Snode(clf, X, y, title)
         self.depth_ = max(depth, self.depth_)
-        down = self._split_criteria(self._distances(tree, X))
+        down = self._split_criteria(self._distances(node, X), node)
         X_U, X_D = self._split_array(X, down)
         y_u, y_d = self._split_array(y, down)
         sw_u, sw_d = self._split_array(sample_weight, down)
         if X_U is None or X_D is None:
             # didn't part anything
-            return Snode(clf, X, y, title + ', <cgaf>')
+            return Snode(clf, X, y, title + ", <cgaf>")
-        tree.set_up(self.train(X_U, y_u, sw_u, depth + 1, title + ' - Up'))
+        node.set_up(self.train(X_U, y_u, sw_u, depth + 1, title + " - Up"))
-        tree.set_down(self.train(X_D, y_d, sw_d, depth + 1, title + ' - Down'))
+        node.set_down(self.train(X_D, y_d, sw_d, depth + 1, title + " - Down"))
-        return tree
+        return node
+
+    def _build_predictor(self):
+        """Process the leaves to make them predictors
+        """
+
+        def run_tree(node: Snode):
+            if node.is_leaf():
+                node.make_predictor()
+                return
+            run_tree(node.get_down())
+            run_tree(node.get_up())
+
+        run_tree(self.tree_)
+
+    def _build_clf(self):
+        """ Build the correct classifier for the node
+        """
+        return (
+            LinearSVC(
+                max_iter=self.max_iter,
+                random_state=self.random_state,
+                C=self.C,
+                tol=self.tol,
+            )
+            if self.kernel == "linear"
+            else SVC(
+                kernel=self.kernel,
+                max_iter=self.max_iter,
+                tol=self.tol,
+                C=self.C,
+                gamma=self.gamma,
+                degree=self.degree,
+            )
+        )
 
     def _reorder_results(self, y: np.array, indices: np.array) -> np.array:
         """Reorder an array based on the array of indices passed
@@ -289,10 +353,6 @@ class Stree(BaseEstimator, ClassifierMixin):
         :return: array y ordered
         :rtype: np.array
         """
-        if y.ndim > 1 and y.shape[1] > 1:
-            # if predict_proba return np.array of floats
-            y_ordered = np.zeros(y.shape, dtype=float)
-        else:
         # return array of same type given in y
         y_ordered = y.copy()
         indices = indices.astype(int)
@@ -308,108 +368,65 @@ class Stree(BaseEstimator, ClassifierMixin):
         :return: array of labels
         :rtype: np.array
         """
-        def predict_class(xp: np.array, indices: np.array,
+
-                          node: Snode) -> np.array:
+        def predict_class(
+            xp: np.array, indices: np.array, node: Snode
+        ) -> np.array:
             if xp is None:
                 return [], []
             if node.is_leaf():
                 # set a class for every sample in dataset
                 prediction = np.full((xp.shape[0], 1), node._class)
                 return prediction, indices
-            down = self._split_criteria(self._distances(node, xp))
+            down = self._split_criteria(self._distances(node, xp), node)
-            X_U, X_D = self._split_array(xp, down)
+            x_u, x_d = self._split_array(xp, down)
             i_u, i_d = self._split_array(indices, down)
-            prx_u, prin_u = predict_class(X_U, i_u, node.get_up())
+            prx_u, prin_u = predict_class(x_u, i_u, node.get_up())
-            prx_d, prin_d = predict_class(X_D, i_d, node.get_down())
+            prx_d, prin_d = predict_class(x_d, i_d, node.get_down())
             return np.append(prx_u, prx_d), np.append(prin_u, prin_d)
+
         # sklearn check
-        check_is_fitted(self, ['tree_'])
+        check_is_fitted(self, ["tree_"])
         # Input validation
         X = check_array(X)
         # setup prediction & make it happen
         indices = np.arange(X.shape[0])
-        result = self._reorder_results(
+        result = (
-            *predict_class(X, indices, self.tree_)).astype(int).ravel()
+            self._reorder_results(*predict_class(X, indices, self.tree_))
+            .astype(int)
+            .ravel()
+        )
         return self.classes_[result]
 
-    def predict_proba(self, X: np.array) -> np.array:
+    def score(
-        """Computes an approximation of the probability of samples belonging to
+        self, X: np.array, y: np.array, sample_weight: np.array = None
-        class 0 and 1
+    ) -> float:
-        :param X: dataset
-        :type X: np.array
-        :return: array array of shape (m, num_classes), probability of being
-        each class
-        :rtype: np.array
-        """
-        def predict_class(xp: np.array, indices: np.array, dist: np.array,
-                          node: Snode) -> np.array:
-            """Run the tree to compute predictions
-
-            :param xp: subdataset of samples
-            :type xp: np.array
-            :param indices: indices of subdataset samples to rebuild original
-            order
-            :type indices: np.array
-            :param dist: distances of every sample to the hyperplane or the
-            father node
-            :type dist: np.array
-            :param node: node of the leaf with the class
-            :type node: Snode
-            :return: array of labels and distances, array of indices
-            :rtype: np.array
-            """
-            if xp is None:
-                return [], []
-            if node.is_leaf():
-                # set a class for every sample in dataset
-                prediction = np.full((xp.shape[0], 1), node._class)
-                prediction_proba = dist
-                return np.append(prediction, prediction_proba, axis=1), indices
-            distances = self._distances(node, xp)
-            down = self._split_criteria(distances)
-            X_U, X_D = self._split_array(xp, down)
-            i_u, i_d = self._split_array(indices, down)
-            di_u, di_d = self._split_array(distances, down)
-            prx_u, prin_u = predict_class(X_U, i_u, di_u, node.get_up())
-            prx_d, prin_d = predict_class(X_D, i_d, di_d, node.get_down())
-            return np.append(prx_u, prx_d), np.append(prin_u, prin_d)
-
-        # sklearn check
-        check_is_fitted(self, ['tree_'])
-        # Input validation
-        X = check_array(X)
-        # setup prediction & make it happen
-        indices = np.arange(X.shape[0])
-        empty_dist = np.empty((X.shape[0], 1), dtype=float)
-        result, indices = predict_class(X, indices, empty_dist, self.tree_)
-        result = result.reshape(X.shape[0], 2)
-        # Turn distances to hyperplane into probabilities based on fitting
-        # distances of samples to its hyperplane that classified them, to the
-        # sigmoid function
-        # Probability of being 1
-        result[:, 1] = 1 / (1 + np.exp(-result[:, 1]))
-        # Probability of being 0
-        result[:, 0] = 1 - result[:, 1]
-        return self._reorder_results(result, indices)
-
-    def score(self, X: np.array, y: np.array) -> float:
         """Compute accuracy of the prediction
 
         :param X: dataset of samples to make predictions
         :type X: np.array
-        :param y: samples labels
+        :param y_true: samples labels
-        :type y: np.array
+        :type y_true: np.array
+        :param sample_weight: weights of the samples. Rescale C per sample.
+        Hi' weights force the classifier to put more emphasis on these points
+        :type sample_weight: np.array optional
         :return: accuracy of the prediction
         :rtype: float
         """
         # sklearn check
         check_is_fitted(self)
-        yp = self.predict(X).reshape(y.shape)
+        check_classification_targets(y)
-        return np.mean(yp == y)
+        X, y = check_X_y(X, y)
+        y_pred = self.predict(X).reshape(y.shape)
+        # Compute accuracy for each possible representation
+        y_type, y_true, y_pred = _check_targets(y, y_pred)
+        check_consistent_length(y_true, y_pred, sample_weight)
+        score = y_true == y_pred
+        return _weighted_sum(score, sample_weight, normalize=True)
 
     def __iter__(self) -> Siterator:
-        """Create an iterator to be able to visit the nodes of the tree in preorder,
+        """Create an iterator to be able to visit the nodes of the tree in
-        can make a list with all the nodes in preorder
+        preorder, can make a list with all the nodes in preorder
 
         :return: an iterator, can for i in... and list(...)
         :rtype: Siterator
@@ -426,7 +443,7 @@ class Stree(BaseEstimator, ClassifierMixin):
         :return: description of nodes in the tree in preorder
         :rtype: str
         """
-        output = ''
+        output = ""
         for i in self:
-            output += str(i) + '\n'
+            output += str(i) + "\n"
         return output

stree/Strees_grapher.py

@@ -1,10 +1,10 @@
-'''
+"""
 __author__ = "Ricardo Montañana Gómez"
 __copyright__ = "Copyright 2020, Ricardo Montañana Gómez"
 __license__ = "MIT"
 __version__ = "0.9"
 Plot 3D views of nodes in Stree
-'''
+"""
 
 import os
 
@@ -17,7 +17,6 @@ from .Strees import Stree, Snode, Siterator
 
 
 class Snode_graph(Snode):
-
     def __init__(self, node: Stree):
         self._plot_size = (8, 8)
         self._xlimits = (None, None)
@@ -29,34 +28,39 @@ class Snode_graph(Snode):
     def set_plot_size(self, size: tuple):
         self._plot_size = size
 
+    def get_plot_size(self) -> tuple:
+        return self._plot_size
+
     def _is_pure(self) -> bool:
         """is considered pure a leaf node with one label
         """
         if self.is_leaf():
-            return self._belief == 1.
+            return self._belief == 1.0
         return False
 
     def set_axis_limits(self, limits: tuple):
-        self._xlimits = limits[0]
+        self._xlimits, self._ylimits, self._zlimits = limits
-        self._ylimits = limits[1]
+
-        self._zlimits = limits[2]
+    def get_axis_limits(self) -> tuple:
+        return self._xlimits, self._ylimits, self._zlimits
 
     def _set_graphics_axis(self, ax: Axes3D):
         ax.set_xlim(self._xlimits)
         ax.set_ylim(self._ylimits)
         ax.set_zlim(self._zlimits)
 
-    def save_hyperplane(self, save_folder: str = './', save_prefix: str = '',
+    def save_hyperplane(
-                        save_seq: int = 1):
+        self, save_folder: str = "./", save_prefix: str = "", save_seq: int = 1
+    ):
         _, fig = self.plot_hyperplane()
-        name = f"{save_folder}{save_prefix}STnode{save_seq}.png"
+        name = os.path.join(save_folder, f"{save_prefix}STnode{save_seq}.png")
-        fig.savefig(name, bbox_inches='tight')
+        fig.savefig(name, bbox_inches="tight")
         plt.close(fig)
 
     def _get_cmap(self):
-        cmap = 'jet'
+        cmap = "jet"
         if self._is_pure() and self._class == 1:
-            cmap = 'jet_r'
+            cmap = "jet_r"
         return cmap
 
     def _graph_title(self):
@@ -65,22 +69,31 @@ class Snode_graph(Snode):
 
     def plot_hyperplane(self, plot_distribution: bool = True):
         fig = plt.figure(figsize=self._plot_size)
-        ax = fig.add_subplot(1, 1, 1, projection='3d')
+        ax = fig.add_subplot(1, 1, 1, projection="3d")
         if not self._is_pure():
             # Can't plot hyperplane of leaves with one label because it hasn't
             # classiffier
             # get the splitting hyperplane
-            def hyperplane(x, y): return (-self._interceptor
+            def hyperplane(x, y):
-                                          - self._vector[0][0] * x
+                return (
-                                          - self._vector[0][1] * y) \
+                    -self._clf.intercept_
-                / self._vector[0][2]
+                    - self._clf.coef_[0][0] * x
+                    - self._clf.coef_[0][1] * y
+                ) / self._clf.coef_[0][2]
 
             tmpx = np.linspace(self._X[:, 0].min(), self._X[:, 0].max())
             tmpy = np.linspace(self._X[:, 1].min(), self._X[:, 1].max())
             xx, yy = np.meshgrid(tmpx, tmpy)
-            ax.plot_surface(xx, yy, hyperplane(xx, yy), alpha=.5,
+            ax.plot_surface(
-                            antialiased=True, rstride=1, cstride=1,
+                xx,
-                            cmap='seismic')
+                yy,
+                hyperplane(xx, yy),
+                alpha=0.5,
+                antialiased=True,
+                rstride=1,
+                cstride=1,
+                cmap="seismic",
+            )
             self._set_graphics_axis(ax)
         if plot_distribution:
             self.plot_distribution(ax)
@@ -92,14 +105,15 @@ class Snode_graph(Snode):
     def plot_distribution(self, ax: Axes3D = None):
         if ax is None:
             fig = plt.figure(figsize=self._plot_size)
-            ax = fig.add_subplot(1, 1, 1, projection='3d')
+            ax = fig.add_subplot(1, 1, 1, projection="3d")
         plt.title(self._graph_title())
         cmap = self._get_cmap()
-        ax.scatter(self._X[:, 0], self._X[:, 1],
+        ax.scatter(
-                   self._X[:, 2], c=self._y, cmap=cmap)
+            self._X[:, 0], self._X[:, 1], self._X[:, 2], c=self._y, cmap=cmap
-        ax.set_xlabel('X0')
+        )
-        ax.set_ylabel('X1')
+        ax.set_xlabel("X0")
-        ax.set_zlabel('X2')
+        ax.set_ylabel("X1")
+        ax.set_zlabel("X2")
         plt.show()
 
 
@@ -112,17 +126,16 @@ class Stree_grapher(Stree):
         self._plot_size = (8, 8)
         self._tree_gr = None
         # make Snode store X's
-        os.environ['TESTING'] = '1'
+        os.environ["TESTING"] = "1"
         self._fitted = False
         self._pca = None
         super().__init__(**params)
 
     def __del__(self):
         try:
-            os.environ.pop('TESTING')
+            os.environ.pop("TESTING")
         except KeyError:
             pass
-        plt.close('all')
 
     def _copy_tree(self, node: Snode) -> Snode_graph:
         mirror = Snode_graph(node)
@@ -135,7 +148,9 @@ class Stree_grapher(Stree):
             mirror.set_up(self._copy_tree(node.get_up()))
         return mirror
 
-    def fit(self, X: np.array, y: np.array) -> Stree:
+    def fit(
+        self, X: np.array, y: np.array, sample_weight: np.array = None
+    ) -> "Stree_grapher":
         """Fit the Stree and copy the tree in a Snode_graph tree
 
         :param X: Dataset
@@ -148,10 +163,10 @@ class Stree_grapher(Stree):
         if X.shape[1] != 3:
             self._pca = PCA(n_components=3)
             X = self._pca.fit_transform(X)
-        res = super().fit(X, y)
+        super().fit(X, y, sample_weight=sample_weight)
         self._tree_gr = self._copy_tree(self.tree_)
         self._fitted = True
-        return res
+        return self
 
     def score(self, X: np.array, y: np.array) -> float:
         self._check_fitted()
@@ -161,9 +176,9 @@ class Stree_grapher(Stree):
 
     def _check_fitted(self):
         if not self._fitted:
-            raise Exception('Have to fit the grapher first!')
+            raise Exception("Have to fit the grapher first!")
 
-    def save_all(self, save_folder: str = './', save_prefix: str = ''):
+    def save_all(self, save_folder: str = "./", save_prefix: str = ""):
         """Save all the node plots in png format, each with a sequence number
 
         :param save_folder: folder where the plots are saved, defaults to './'
@@ -174,8 +189,9 @@ class Stree_grapher(Stree):
             os.mkdir(save_folder)
         seq = 1
         for node in self:
-            node.save_hyperplane(save_folder=save_folder,
+            node.save_hyperplane(
-                                 save_prefix=save_prefix, save_seq=seq)
+                save_folder=save_folder, save_prefix=save_prefix, save_seq=seq
+            )
             seq += 1
 
     def plot_all(self):

stree/__init__.py

@@ -1,2 +1,4 @@
 from .Strees import Stree, Snode, Siterator
 from .Strees_grapher import Stree_grapher, Snode_graph
+
+__all__ = ["Stree", "Snode", "Siterator", "Stree_grapher", "Snode_graph"]

stree/tests/Strees_grapher_test.py

@@ -0,0 +1,226 @@
+import os
+import imghdr
+import unittest
+
+import numpy as np
+import matplotlib
+import matplotlib.pyplot as plt
+import warnings
+from sklearn.datasets import make_classification
+
+from stree import Stree_grapher, Snode_graph, Snode
+
+
+def get_dataset(random_state=0, n_features=3):
+    X, y = make_classification(
+        n_samples=1500,
+        n_features=n_features,
+        n_informative=3,
+        n_redundant=0,
+        n_repeated=0,
+        n_classes=2,
+        n_clusters_per_class=2,
+        class_sep=1.5,
+        flip_y=0,
+        weights=[0.5, 0.5],
+        random_state=random_state,
+    )
+    return X, y
+
+
+class Stree_grapher_test(unittest.TestCase):
+    def __init__(self, *args, **kwargs):
+        self._random_state = 1
+        self._clf = Stree_grapher(dict(random_state=self._random_state))
+        self._clf.fit(*get_dataset(self._random_state, n_features=4))
+        super().__init__(*args, **kwargs)
+
+    @classmethod
+    def setUp(cls):
+        os.environ["TESTING"] = "1"
+
+    def test_iterator(self):
+        """Check preorder iterator
+        """
+        expected = [
+            "root",
+            "root - Down",
+            "root - Down - Down, <cgaf> - Leaf class=1 belief= 0.976023 counts"
+            "=(array([0, 1]), array([ 17, 692]))",
+            "root - Down - Up",
+            "root - Down - Up - Down, <cgaf> - Leaf class=0 belief= 0.500000 "
+            "counts=(array([0, 1]), array([1, 1]))",
+            "root - Down - Up - Up, <cgaf> - Leaf class=0 belief= 0.888889 "
+            "counts=(array([0, 1]), array([8, 1]))",
+            "root - Up, <cgaf> - Leaf class=0 belief= 0.928205 counts=(array("
+            "[0, 1]), array([724,  56]))",
+        ]
+        computed = []
+        for node in self._clf:
+            computed.append(str(node))
+        self.assertListEqual(expected, computed)
+
+    def test_score(self):
+        X, y = get_dataset(self._random_state)
+        accuracy_score = self._clf.score(X, y)
+        yp = self._clf.predict(X)
+        accuracy_computed = np.mean(yp == y)
+        self.assertEqual(accuracy_score, accuracy_computed)
+        self.assertGreater(accuracy_score, 0.86)
+
+    def test_score_4dims(self):
+        X, y = get_dataset(self._random_state, n_features=4)
+        accuracy_score = self._clf.score(X, y)
+        self.assertEqual(accuracy_score, 0.95)
+
+    def test_save_all(self):
+        folder_name = os.path.join(os.sep, "tmp", "stree")
+        if os.path.isdir(folder_name):
+            os.rmdir(folder_name)
+        file_names = [
+            os.path.join(folder_name, f"STnode{i}.png") for i in range(1, 8)
+        ]
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            matplotlib.use("Agg")
+            self._clf.save_all(save_folder=folder_name)
+        for file_name in file_names:
+            self.assertTrue(os.path.exists(file_name))
+            self.assertEqual("png", imghdr.what(file_name))
+            os.remove(file_name)
+        os.rmdir(folder_name)
+
+    def test_plot_all(self):
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            matplotlib.use("Agg")
+            num_figures_before = plt.gcf().number
+            self._clf.plot_all()
+            num_figures_after = plt.gcf().number
+        self.assertEqual(7, num_figures_after - num_figures_before)
+
+
+class Snode_graph_test(unittest.TestCase):
+    def __init__(self, *args, **kwargs):
+        self._random_state = 1
+        self._clf = Stree_grapher(dict(random_state=self._random_state))
+        self._clf.fit(*get_dataset(self._random_state))
+        super().__init__(*args, **kwargs)
+
+    @classmethod
+    def setUp(cls):
+        os.environ["TESTING"] = "1"
+
+    def test_plot_size(self):
+        default = self._clf._tree_gr.get_plot_size()
+        expected = (17, 3)
+        self._clf._tree_gr.set_plot_size(expected)
+        self.assertEqual(expected, self._clf._tree_gr.get_plot_size())
+        self._clf._tree_gr.set_plot_size(default)
+        self.assertEqual(default, self._clf._tree_gr.get_plot_size())
+
+    def test_attributes_in_leaves_graph(self):
+        """Check if the attributes in leaves have correct values so they form a
+        predictor
+        """
+
+        def check_leave(node: Snode_graph):
+            if not node.is_leaf():
+                check_leave(node.get_down())
+                check_leave(node.get_up())
+                return
+            # Check Belief in leave
+            classes, card = np.unique(node._y, return_counts=True)
+            max_card = max(card)
+            min_card = min(card)
+            if len(classes) > 1:
+                try:
+                    belief = max_card / (max_card + min_card)
+                except ZeroDivisionError:
+                    belief = 0.0
+            else:
+                belief = 1
+            self.assertEqual(belief, node._belief)
+            # Check Class
+            class_computed = classes[card == max_card]
+            self.assertEqual(class_computed, node._class)
+
+        check_leave(self._clf._tree_gr)
+
+    def test_nodes_graph_coefs(self):
+        """Check if the nodes of the tree have the right attributes filled
+        """
+
+        def run_tree(node: Snode_graph):
+            if node._belief < 1:
+                # only exclude pure leaves
+                self.assertIsNotNone(node._clf)
+                self.assertIsNotNone(node._clf.coef_)
+            if node.is_leaf():
+                return
+            run_tree(node.get_down())
+            run_tree(node.get_up())
+
+        run_tree(self._clf._tree_gr)
+
+    def test_save_hyperplane(self):
+        folder_name = "/tmp/"
+        file_name = os.path.join(folder_name, "STnode1.png")
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            matplotlib.use("Agg")
+            self._clf._tree_gr.save_hyperplane(folder_name)
+        self.assertTrue(os.path.exists(file_name))
+        self.assertEqual("png", imghdr.what(file_name))
+        os.remove(file_name)
+
+    def test_plot_hyperplane_with_distribution(self):
+        plt.close()
+        # select a pure node
+        node = self._clf._tree_gr.get_down().get_up().get_up()
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            matplotlib.use("Agg")
+            num_figures_before = plt.gcf().number
+            node.plot_hyperplane(plot_distribution=True)
+            num_figures_after = plt.gcf().number
+        self.assertEqual(1, num_figures_after - num_figures_before)
+
+    def test_plot_hyperplane_without_distribution(self):
+        plt.close()
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            matplotlib.use("Agg")
+            num_figures_before = plt.gcf().number
+            self._clf._tree_gr.plot_hyperplane(plot_distribution=False)
+            num_figures_after = plt.gcf().number
+        self.assertEqual(1, num_figures_after - num_figures_before)
+
+    def test_plot_distribution(self):
+        plt.close()
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            matplotlib.use("Agg")
+            num_figures_before = plt.gcf().number
+            self._clf._tree_gr.plot_distribution()
+            num_figures_after = plt.gcf().number
+        self.assertEqual(1, num_figures_after - num_figures_before)
+
+    def test_set_axis_limits(self):
+        node = Snode_graph(Snode(None, None, None, "test"))
+        limits = (-2, 2), (-3, 3), (-4, 4)
+        node.set_axis_limits(limits)
+        computed = node.get_axis_limits()
+        x, y, z = limits
+        xx, yy, zz = computed
+        self.assertEqual(x, xx)
+        self.assertEqual(y, yy)
+        self.assertEqual(z, zz)
+
+    def test_cmap_change(self):
+        node = Snode_graph(Snode(None, None, None, "test"))
+        self.assertEqual("jet", node._get_cmap())
+        # make node pure
+        node._belief = 1.0
+        node._class = 1
+        self.assertEqual("jet_r", node._get_cmap())

stree/tests/Strees_test.py

@@ -2,36 +2,36 @@ import os
 import unittest
 
 import numpy as np
-from sklearn.datasets import make_classification
+from sklearn.datasets import make_classification, load_iris
 
 from stree import Stree, Snode
 
 
-class Stree_test(unittest.TestCase):
+def get_dataset(random_state=0, n_classes=2):
+    X, y = make_classification(
+        n_samples=1500,
+        n_features=3,
+        n_informative=3,
+        n_redundant=0,
+        n_repeated=0,
+        n_classes=n_classes,
+        n_clusters_per_class=2,
+        class_sep=1.5,
+        flip_y=0,
+        random_state=random_state,
+    )
+    return X, y
 
+
+class Stree_test(unittest.TestCase):
     def __init__(self, *args, **kwargs):
-        os.environ['TESTING'] = '1'
         self._random_state = 1
-        self._clf = Stree(random_state=self._random_state,
+        self._kernels = ["linear", "rbf", "poly"]
-                          use_predictions=False)
-        self._clf.fit(*self._get_Xy())
         super().__init__(*args, **kwargs)
 
     @classmethod
-    def tearDownClass(cls):
+    def setUp(cls):
-        try:
+        os.environ["TESTING"] = "1"
-            os.environ.pop('TESTING')
-        except KeyError:
-            pass
-
-    def _get_Xy(self):
-        X, y = make_classification(n_samples=1500, n_features=3,
-                                   n_informative=3, n_redundant=0,
-                                   n_repeated=0, n_classes=2,
-                                   n_clusters_per_class=2, class_sep=1.5,
-                                   flip_y=0, weights=[0.5, 0.5],
-                                   random_state=self._random_state)
-        return X, y
 
     def _check_tree(self, node: Snode):
         """Check recursively that the nodes that are not leaves have the
@@ -74,26 +74,17 @@ class Stree_test(unittest.TestCase):
     def test_build_tree(self):
         """Check if the tree is built the same way as predictions of models
         """
-        self._check_tree(self._clf.tree_)
+        import warnings
 
-    def _get_file_data(self, file_name: str) -> tuple:
+        warnings.filterwarnings("ignore")
-        """Return X, y from data, y is the last column in array
+        for kernel in self._kernels:
+            clf = Stree(kernel=kernel, random_state=self._random_state)
+            clf.fit(*get_dataset(self._random_state))
+            self._check_tree(clf.tree_)
 
-        Arguments:
+    def _find_out(
-            file_name {str} -- the file name
+        self, px: np.array, x_original: np.array, y_original
-
+    ) -> list:
-        Returns:
-            tuple -- tuple with samples, categories
-        """
-        data = np.genfromtxt(file_name, delimiter=',')
-        data = np.array(data)
-        column_y = data.shape[1] - 1
-        fy = data[:, column_y]
-        fx = np.delete(data, column_y, axis=1)
-        return fx, fy
-
-    def _find_out(self, px: np.array, x_original: np.array,
-                  y_original) -> list:
         """Find the original values of y for a given array of samples
 
         Arguments:
@@ -112,156 +103,100 @@ class Stree_test(unittest.TestCase):
         return res
 
     def test_single_prediction(self):
-        X, y = self._get_Xy()
+        X, y = get_dataset(self._random_state)
-        yp = self._clf.predict((X[0, :].reshape(-1, X.shape[1])))
+        for kernel in self._kernels:
+            clf = Stree(kernel=kernel, random_state=self._random_state)
+            yp = clf.fit(X, y).predict((X[0, :].reshape(-1, X.shape[1])))
             self.assertEqual(yp[0], y[0])
 
     def test_multiple_prediction(self):
         # First 27 elements the predictions are the same as the truth
         num = 27
-        X, y = self._get_Xy()
+        X, y = get_dataset(self._random_state)
-        yp = self._clf.predict(X[:num, :])
+        for kernel in self._kernels:
+            clf = Stree(kernel=kernel, random_state=self._random_state)
+            yp = clf.fit(X, y).predict(X[:num, :])
             self.assertListEqual(y[:num].tolist(), yp.tolist())
 
     def test_score(self):
-        X, y = self._get_Xy()
+        X, y = get_dataset(self._random_state)
-        accuracy_score = self._clf.score(X, y)
+        accuracies = [
-        yp = self._clf.predict(X)
+            0.9506666666666667,
+            0.9606666666666667,
+            0.9433333333333334,
+        ]
+        for kernel, accuracy_expected in zip(self._kernels, accuracies):
+            clf = Stree(random_state=self._random_state, kernel=kernel,)
+            clf.fit(X, y)
+            accuracy_score = clf.score(X, y)
+            yp = clf.predict(X)
             accuracy_computed = np.mean(yp == y)
             self.assertEqual(accuracy_score, accuracy_computed)
-        self.assertGreater(accuracy_score, 0.9)
+            self.assertAlmostEqual(accuracy_expected, accuracy_score)
-
-    def test_single_predict_proba(self):
-        """Check that element 28 has a prediction different that the current
-        label
-        """
-        # Element 28 has a different prediction than the truth
-        decimals = 5
-        prob = 0.29026400766
-        X, y = self._get_Xy()
-        yp = self._clf.predict_proba(X[28, :].reshape(-1, X.shape[1]))
-        self.assertEqual(np.round(1 - prob, decimals),
-                         np.round(yp[0:, 0], decimals))
-        self.assertEqual(1, y[28])
-
-        self.assertAlmostEqual(
-            round(prob, decimals),
-            round(yp[0, 1], decimals),
-            decimals
-        )
-
-    def test_multiple_predict_proba(self):
-        # First 27 elements the predictions are the same as the truth
-        num = 27
-        decimals = 5
-        X, y = self._get_Xy()
-        yp = self._clf.predict_proba(X[:num, :])
-        self.assertListEqual(
-            y[:num].tolist(), np.argmax(yp[:num], axis=1).tolist())
-        expected_proba = [0.88395641, 0.36746962, 0.84158767, 0.34106833,
-                          0.14269291, 0.85193236,
-                          0.29876058, 0.7282164, 0.85958616, 0.89517877,
-                          0.99745224, 0.18860349,
-                          0.30756427, 0.8318412, 0.18981198, 0.15564624,
-                          0.25740655, 0.22923355,
-                          0.87365959, 0.49928689, 0.95574351, 0.28761257,
-                          0.28906333, 0.32643692,
-                          0.29788483, 0.01657364, 0.81149083]
-        expected = np.round(expected_proba, decimals=decimals).tolist()
-        computed = np.round(yp[:, 1], decimals=decimals).tolist()
-        for i in range(len(expected)):
-            self.assertAlmostEqual(expected[i], computed[i], decimals)
-
-    def build_models(self):
-        """Build and train two models, model_clf will use the sklearn
-        classifier to compute predictions and split data. model_computed will
-        use vector of coefficients to compute both predictions and splitted
-        data
-        """
-        model_clf = Stree(random_state=self._random_state,
-                          use_predictions=True)
-        model_computed = Stree(random_state=self._random_state,
-                               use_predictions=False)
-        X, y = self._get_Xy()
-        model_clf.fit(X, y)
-        model_computed.fit(X, y)
-        return model_clf, model_computed, X, y
-
-    def test_use_model_predict(self):
-        """Check that we get the same results wether we use the estimator in
-        nodes to compute labels or we use the hyperplane and the position of
-        samples wrt to it
-        """
-        use_clf, use_math, X, _ = self.build_models()
-        self.assertListEqual(
-            use_clf.predict(X).tolist(),
-            use_math.predict(X).tolist()
-        )
-
-    def test_use_model_score(self):
-        use_clf, use_math, X, y = self.build_models()
-        b = use_math.score(X, y)
-        self.assertEqual(
-            use_clf.score(X, y),
-            b
-        )
-        self.assertGreater(b, .95)
-
-    def test_use_model_predict_proba(self):
-        use_clf, use_math, X, _ = self.build_models()
-        self.assertListEqual(
-            use_clf.predict_proba(X).tolist(),
-            use_math.predict_proba(X).tolist()
-        )
 
     def test_single_vs_multiple_prediction(self):
         """Check if predicting sample by sample gives the same result as
         predicting all samples at once
         """
-        X, _ = self._get_Xy()
+        X, y = get_dataset(self._random_state)
+        for kernel in self._kernels:
+            clf = Stree(kernel=kernel, random_state=self._random_state)
+            clf.fit(X, y)
             # Compute prediction line by line
             yp_line = np.array([], dtype=int)
             for xp in X:
-            yp_line = np.append(yp_line, self._clf.predict(
+                yp_line = np.append(
-                xp.reshape(-1, X.shape[1])))
+                    yp_line, clf.predict(xp.reshape(-1, X.shape[1]))
+                )
             # Compute prediction at once
-        yp_once = self._clf.predict(X)
+            yp_once = clf.predict(X)
-        #
             self.assertListEqual(yp_line.tolist(), yp_once.tolist())
 
-    def test_iterator(self):
+    def test_iterator_and_str(self):
         """Check preorder iterator
         """
         expected = [
-            'root',
+            "root",
-            'root - Down',
+            "root - Down",
-            'root - Down - Down, <cgaf> - Leaf class=1 belief= 0.975989 counts'
+            "root - Down - Down, <cgaf> - Leaf class=1 belief= 0.975989 counts"
-            '=(array([0, 1]), array([ 17, 691]))',
+            "=(array([0, 1]), array([ 17, 691]))",
-            'root - Down - Up',
+            "root - Down - Up",
-            'root - Down - Up - Down, <cgaf> - Leaf class=1 belief= 0.750000 '
+            "root - Down - Up - Down, <cgaf> - Leaf class=1 belief= 0.750000 "
-            'counts=(array([0, 1]), array([1, 3]))',
+            "counts=(array([0, 1]), array([1, 3]))",
-            'root - Down - Up - Up, <pure> - Leaf class=0 belief= 1.000000 '
+            "root - Down - Up - Up, <pure> - Leaf class=0 belief= 1.000000 "
-            'counts=(array([0]), array([7]))',
+            "counts=(array([0]), array([7]))",
-            'root - Up, <cgaf> - Leaf class=0 belief= 0.928297 counts=(array('
+            "root - Up, <cgaf> - Leaf class=0 belief= 0.928297 counts=(array("
-            '[0, 1]), array([725,  56]))',
+            "[0, 1]), array([725,  56]))",
         ]
         computed = []
-        for node in self._clf:
+        expected_string = ""
+        clf = Stree(kernel="linear", random_state=self._random_state)
+        clf.fit(*get_dataset(self._random_state))
+        for node in clf:
             computed.append(str(node))
+            expected_string += str(node) + "\n"
         self.assertListEqual(expected, computed)
+        self.assertEqual(expected_string, str(clf))
 
     def test_is_a_sklearn_classifier(self):
         import warnings
         from sklearn.exceptions import ConvergenceWarning
-        warnings.filterwarnings('ignore', category=ConvergenceWarning)
+
-        warnings.filterwarnings('ignore', category=RuntimeWarning)
+        warnings.filterwarnings("ignore", category=ConvergenceWarning)
+        warnings.filterwarnings("ignore", category=RuntimeWarning)
         from sklearn.utils.estimator_checks import check_estimator
+
         check_estimator(Stree())
 
     def test_exception_if_C_is_negative(self):
         tclf = Stree(C=-1)
         with self.assertRaises(ValueError):
-            tclf.fit(*self._get_Xy())
+            tclf.fit(*get_dataset(self._random_state))
+
+    def test_exception_if_bogus_split_criteria(self):
+        tclf = Stree(split_criteria="duck")
+        with self.assertRaises(ValueError):
+            tclf.fit(*get_dataset(self._random_state))
 
     def test_check_max_depth_is_positive_or_None(self):
         tcl = Stree()
@@ -270,45 +205,92 @@ class Stree_test(unittest.TestCase):
         self.assertGreaterEqual(1, tcl.max_depth)
         with self.assertRaises(ValueError):
             tcl = Stree(max_depth=-1)
-            tcl.fit(*self._get_Xy())
+            tcl.fit(*get_dataset(self._random_state))
 
     def test_check_max_depth(self):
-        depth = 3
+        depths = (3, 4)
+        for depth in depths:
             tcl = Stree(random_state=self._random_state, max_depth=depth)
-        tcl.fit(*self._get_Xy())
+            tcl.fit(*get_dataset(self._random_state))
             self.assertEqual(depth, tcl.depth_)
 
     def test_unfitted_tree_is_iterable(self):
         tcl = Stree()
         self.assertEqual(0, len(list(tcl)))
 
+    def test_min_samples_split(self):
+        tcl_split = Stree(min_samples_split=3)
+        tcl_nosplit = Stree(min_samples_split=4)
+        dataset = [[1], [2], [3]], [1, 1, 0]
+        tcl_split.fit(*dataset)
+        self.assertIsNotNone(tcl_split.tree_.get_down())
+        self.assertIsNotNone(tcl_split.tree_.get_up())
+        tcl_nosplit.fit(*dataset)
+        self.assertIsNone(tcl_nosplit.tree_.get_down())
+        self.assertIsNone(tcl_nosplit.tree_.get_up())
+
+    def test_simple_muticlass_dataset(self):
+        for kernel in self._kernels:
+            clf = Stree(
+                kernel=kernel,
+                split_criteria="max_samples",
+                random_state=self._random_state,
+            )
+            px = [[1, 2], [5, 6], [9, 10]]
+            py = [0, 1, 2]
+            clf.fit(px, py)
+            self.assertEqual(1.0, clf.score(px, py))
+            self.assertListEqual(py, clf.predict(px).tolist())
+            self.assertListEqual(py, clf.classes_.tolist())
+
+    def test_muticlass_dataset(self):
+        datasets = {
+            "Synt": get_dataset(random_state=self._random_state, n_classes=3),
+            "Iris": load_iris(return_X_y=True),
+        }
+        outcomes = {
+            "Synt": {
+                "max_samples linear": 0.9533333333333334,
+                "max_samples rbf": 0.836,
+                "max_samples poly": 0.9473333333333334,
+                "min_distance linear": 0.9533333333333334,
+                "min_distance rbf": 0.836,
+                "min_distance poly": 0.9473333333333334,
+            },
+            "Iris": {
+                "max_samples linear": 0.98,
+                "max_samples rbf": 1.0,
+                "max_samples poly": 1.0,
+                "min_distance linear": 0.98,
+                "min_distance rbf": 1.0,
+                "min_distance poly": 1.0,
+            },
+        }
+        for name, dataset in datasets.items():
+            px, py = dataset
+            for criteria in ["max_samples", "min_distance"]:
+                for kernel in self._kernels:
+                    clf = Stree(
+                        C=1e4,
+                        max_iter=1e4,
+                        kernel=kernel,
+                        random_state=self._random_state,
+                    )
+                    clf.fit(px, py)
+                    outcome = outcomes[name][f"{criteria} {kernel}"]
+                    self.assertAlmostEqual(outcome, clf.score(px, py))
+
 
 class Snode_test(unittest.TestCase):
-
     def __init__(self, *args, **kwargs):
-        os.environ['TESTING'] = '1'
         self._random_state = 1
-        self._clf = Stree(random_state=self._random_state,
+        self._clf = Stree(random_state=self._random_state)
-                          use_predictions=True)
+        self._clf.fit(*get_dataset(self._random_state))
-        self._clf.fit(*self._get_Xy())
         super().__init__(*args, **kwargs)
 
     @classmethod
-    def tearDownClass(cls):
+    def setUp(cls):
-        """[summary]
+        os.environ["TESTING"] = "1"
-        """
-        try:
-            os.environ.pop('TESTING')
-        except KeyError:
-            pass
-
-    def _get_Xy(self):
-        X, y = make_classification(n_samples=1500, n_features=3,
-                                   n_informative=3, n_redundant=0, n_classes=2,
-                                   n_repeated=0, n_clusters_per_class=2,
-                                   class_sep=1.5, flip_y=0, weights=[0.5, 0.5],
-                                   random_state=self._random_state)
-        return X, y
 
     def test_attributes_in_leaves(self):
         """Check if the attributes in leaves have correct values so they form a
@@ -328,7 +310,7 @@ class Snode_test(unittest.TestCase):
                 try:
                     belief = max_card / (max_card + min_card)
                 except ZeroDivisionError:
-                    belief = 0.
+                    belief = 0.0
             else:
                 belief = 1
             self.assertEqual(belief, node._belief)
@@ -347,11 +329,27 @@ class Snode_test(unittest.TestCase):
                 # only exclude pure leaves
                 self.assertIsNotNone(node._clf)
                 self.assertIsNotNone(node._clf.coef_)
-                self.assertIsNotNone(node._vector)
-                self.assertIsNotNone(node._interceptor)
             if node.is_leaf():
                 return
             run_tree(node.get_down())
             run_tree(node.get_up())
 
         run_tree(self._clf.tree_)
+
+    def test_make_predictor_on_leaf(self):
+        test = Snode(None, [1, 2, 3, 4], [1, 0, 1, 1], "test")
+        test.make_predictor()
+        self.assertEqual(1, test._class)
+        self.assertEqual(0.75, test._belief)
+
+    def test_make_predictor_on_not_leaf(self):
+        test = Snode(None, [1, 2, 3, 4], [1, 0, 1, 1], "test")
+        test.set_up(Snode(None, [1], [1], "another_test"))
+        test.make_predictor()
+        self.assertIsNone(test._class)
+        self.assertEqual(0, test._belief)
+
+    def test_make_predictor_on_leaf_bogus_data(self):
+        test = Snode(None, [1, 2, 3, 4], [], "test")
+        test.make_predictor()
+        self.assertIsNone(test._class)

stree/tests/__init__.py

@@ -1 +1,9 @@
 from .Strees_test import Stree_test, Snode_test
+from .Strees_grapher_test import Stree_grapher_test, Snode_graph_test
+
+__all__ = [
+    "Stree_test",
+    "Snode_test",
+    "Stree_grapher_test",
+    "Snode_graph_test",
+]