Merge branch 'main' into quantile_forest_exp

neurodata · Oct 18, 2023 · 4e12e12 · 4e12e12
2 parents 996914f + 9ad065e
commit 4e12e12
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 1 deletion.
diff --git a/.github/workflows/cffconvert.yml b/.github/workflows/cffconvert.yml
@@ -0,0 +1,22 @@
+name: cffconvert
+
+on:
+  push:
+    paths:
+      - CITATION.cff
+  pull_request:
+    paths:
+      - CITATION.cff        
+
+jobs:
+  validate:
+    name: "validate"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out a copy of the repository
+        uses: actions/checkout@v4
+
+      - name: Check whether the citation metadata from CITATION.cff is valid
+        uses: citation-file-format/cffconvert-github-action@2.0.0
+        with:
+          args: "--validate"
diff --git a/CITATION.cff b/CITATION.cff
@@ -0,0 +1,31 @@
+# YAML 1.2
+---
+# Metadata for citation of this software according to the CFF format (https://citation-file-format.github.io/)
+cff-version: 1.2.0
+title: "Scikit-tree: Modern decision-trees compatible with scikit-learn in Python."
+abstract: "scikit-tree is a scikit-learn compatible API for building state-of-the-art decision trees. These include unsupervised trees, oblique trees, uncertainty trees, quantile trees and causal trees."
+authors:
+  - given-names: Adam
+    family-names: Li
+    affiliation: "Department of Computer Science, Columbia University, New York, NY, USA"
+    orcid: "https://orcid.org/0000-0001-8421-365X"
+  - given-names: Sambit
+    family-names: Panda
+    affiliation: "Department of Biomedical Engineering, Johns Hopkins University, Baltimore, MD, USA"
+    orcid: "https://orcid.org/0000-0001-8455-4243"
+  - given-names: Haoyin
+    family-names: Xu
+    affiliation: "Department of Biomedical Engineering, Johns Hopkins University, Baltimore, MD, USA"
+    orcid: "https://orcid.org/0000-0001-8235-4950"
+type: software
+repository-code: "https://github.com/neurodata/scikit-tree"
+license: 'BSD-3-Clause'
+keywords:
+  - random forest
+  - oblique trees
+  - honest forests
+  - statisical learning
+  - machine learning
+message: >-
+  Please cite this software using the metadata from
+  'preferred-citation' in the CITATION.cff file.
diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@
 [![codecov](https://codecov.io/gh/neurodata/scikit-tree/branch/main/graph/badge.svg?token=H1reh7Qwf4)](https://codecov.io/gh/neurodata/scikit-tree)
 [![PyPI Download count](https://img.shields.io/pypi/dm/scikit-tree.svg)](https://pypistats.org/packages/scikit-tree)
 [![Latest PyPI release](https://img.shields.io/pypi/v/scikit-tree.svg)](https://pypi.org/project/scikit-tree/)
+[![DOI](https://zenodo.org/badge/491260497.svg)](https://zenodo.org/doi/10.5281/zenodo.8412279)
 
 scikit-tree
 ===========

diff --git a/sktree/_lib/sklearn_fork b/sktree/_lib/sklearn_fork
diff --git a/style_requirements.txt b/style_requirements.txt
@@ -0,0 +1,9 @@
+mypy
+black
+isort
+flake8
+bandit
+pydocstyle
+codespell
+toml
+cython-lint
+1 −1		benchmarks/bench_plot_nmf.py
+2 −2		benchmarks/bench_plot_polynomial_kernel_approximation.py
+4 −0		build_tools/cirrus/arm_tests.yml
+4 −1		doc/conf.py
+1 −1		doc/modules/grid_search.rst
+312 −228		doc/modules/linear_model.rst
+9 −3		doc/modules/model_evaluation.rst
+1 −0		doc/themes/scikit-learn-modern/layout.html
+13 −0		doc/themes/scikit-learn-modern/static/css/theme.css
+47 −0		doc/themes/scikit-learn-modern/static/js/details-permalink.js
+17 −0		doc/whats_new/v1.3.rst
+24 −0		doc/whats_new/v1.4.rst
+42 −15		examples/applications/plot_cyclical_feature_engineering.py
+1 −1		examples/linear_model/plot_poisson_regression_non_normal_loss.py
+1 −1		examples/linear_model/plot_tweedie_regression_insurance_claims.py
+2 −2		setup.py
+4 −3		sklearn/cluster/tests/test_hdbscan.py
+1 −1		sklearn/decomposition/_kernel_pca.py
+14 −1		sklearn/decomposition/tests/test_kernel_pca.py
+34 −0		sklearn/inspection/_plot/tests/test_boundary_decision_display.py
+12 −6		sklearn/metrics/_classification.py
+1 −1		sklearn/metrics/_regression.py
+165 −212		sklearn/metrics/_scorer.py
+27 −0		sklearn/metrics/tests/test_classification.py
+150 −49		sklearn/metrics/tests/test_score_objects.py
+5 −3		sklearn/tests/metadata_routing_common.py
+1 −1		sklearn/tree/_tree.pxd
+5 −3		sklearn/tree/_tree.pyx
+13 −0		sklearn/tree/tests/test_tree.py
+3 −0		sklearn/utils/_param_validation.py
+9 −4		sklearn/utils/_response.py
+3 −0		sklearn/utils/tests/test_param_validation.py
+28 −0		sklearn/utils/tests/test_response.py