Add another pairwise distance algorithm

* Handle kernel serialization
* Do not use typetag in WASM
* enable tests for serialization
* Update serde feature deps

Co-authored-by: Luis Moreno <morenol@users.noreply.github.com>
Co-authored-by: Lorenzo <tunedconsulting@gmail.com>

.github/CODEOWNERS

@@ -2,5 +2,6 @@
 # the repo. Unless a later match takes precedence,
 # Developers in this list will be requested for
 # review when someone opens a pull request.
+*       @VolodymyrOrlov
 *       @morenol
 *       @Mec-iS

.github/CONTRIBUTING.md

@@ -50,9 +50,9 @@ $ rust-code-analysis-cli -p src/algorithm/neighbour/fastpair.rs --ls 22 --le 213
 
 1. After a PR is opened maintainers are notified
 2. Probably changes will be required to comply with the workflow, these commands are run automatically and all tests shall pass:
+    * **Coverage** (optional): `tarpaulin` is used with command `cargo tarpaulin --out Lcov --all-features -- --test-threads 1`
     * **Formatting**: run `rustfmt src/*.rs` to apply automatic formatting
     * **Linting**: `clippy` is used with command `cargo clippy --all-features -- -Drust-2018-idioms -Dwarnings`
-    * **Coverage** (optional): `tarpaulin` is used with command `cargo tarpaulin --out Lcov --all-features -- --test-threads 1`
     * **Testing**: multiple test pipelines are run for different targets
 3. When everything is OK, code is merged.
 

.github/workflows/ci.yml

@@ -19,37 +19,59 @@ jobs:
             { os: "ubuntu", target: "i686-unknown-linux-gnu" },
             { os: "ubuntu", target: "wasm32-unknown-unknown" },
             { os: "macos", target: "aarch64-apple-darwin" },
+            { os: "ubuntu", target: "wasm32-wasi" },
           ]
     env:
       TZ: "/usr/share/zoneinfo/your/location"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Cache .cargo and target
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo
             ./target
           key: ${{ runner.os }}-cargo-${{ matrix.platform.target }}-${{ hashFiles('**/Cargo.toml') }}
-          restore-keys: ${{ runner.os }}-cargo-${{ matrix.platform.target }}
+          restore-keys: ${{ runner.os }}-cargo-${{ matrix.platform.target }}-${{ hashFiles('**/Cargo.toml') }}
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rs/toolchain@v1
         with:
-          targets: ${{ matrix.platform.target }}
+          toolchain: 1.81 # 1.82 seems to break wasm32 tests https://github.com/rustwasm/wasm-bindgen/issues/4274
+          target: ${{ matrix.platform.target }}
+          profile: minimal
+          default: true
       - name: Install test runner for wasm
         if: matrix.platform.target == 'wasm32-unknown-unknown'
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+      - name: Install test runner for wasi
+        if: matrix.platform.target == 'wasm32-wasi'
+        run: curl https://wasmtime.dev/install.sh -sSf | bash
       - name: Stable Build with all features
-        run: cargo build --all-features --target ${{ matrix.platform.target }}
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --all-features --target ${{ matrix.platform.target }}
       - name: Stable Build without features
-        run: cargo build --target ${{ matrix.platform.target }}
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --target ${{ matrix.platform.target }}
       - name: Tests
         if: matrix.platform.target == 'x86_64-unknown-linux-gnu' || matrix.platform.target == 'x86_64-pc-windows-msvc' || matrix.platform.target == 'aarch64-apple-darwin'
-        run: cargo test --all-features
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features
       - name: Tests in WASM
         if: matrix.platform.target == 'wasm32-unknown-unknown'
         run: wasm-pack test --node -- --all-features
-  
+      - name: Tests in WASI
+        if: matrix.platform.target == 'wasm32-wasi'
+        run: |
+          export WASMTIME_HOME="$HOME/.wasmtime"
+          export PATH="$WASMTIME_HOME/bin:$PATH"
+          cargo install cargo-wasi && cargo wasi test
+
   check_features:
     runs-on: "${{ matrix.platform.os }}-latest"
     strategy:
@@ -59,16 +81,24 @@ jobs:
     env:
       TZ: "/usr/share/zoneinfo/your/location"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Cache .cargo and target
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo
             ./target
-          key: ${{ runner.os }}-cargo-features-${{ hashFiles('Cargo.toml') }}
-          restore-keys: ${{ runner.os }}-cargo-features
+          key: ${{ runner.os }}-cargo-features-${{ hashFiles('**/Cargo.toml') }}
+          restore-keys: ${{ runner.os }}-cargo-features-${{ hashFiles('**/Cargo.toml') }}
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: ${{ matrix.platform.target }}
+          profile: minimal
+          default: true
       - name: Stable Build
-        run: cargo build --no-default-features ${{ matrix.features }}
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --no-default-features ${{ matrix.features }}

.github/workflows/coverage.yml

@@ -12,22 +12,33 @@ jobs:
     env:
       TZ: "/usr/share/zoneinfo/your/location"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: Cache .cargo
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo
             ./target
-          key: ${{ runner.os }}-coverage-cargo-${{ hashFiles('Cargo.toml') }}
-          restore-keys: ${{ runner.os }}-coverage-cargo
+          key: ${{ runner.os }}-coverage-cargo-${{ hashFiles('**/Cargo.toml') }}
+          restore-keys: ${{ runner.os }}-coverage-cargo-${{ hashFiles('**/Cargo.toml') }}
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@nightly
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          profile: minimal
+          default: true
       - name: Install cargo-tarpaulin
-        run: cargo install cargo-tarpaulin
+        uses: actions-rs/install@v0.1
+        with:
+          crate: cargo-tarpaulin
+          version: latest
+          use-tool-cache: true
       - name: Run cargo-tarpaulin
-        run: cargo tarpaulin --out Lcov --all-features -- --test-threads 1
+        uses: actions-rs/cargo@v1
+        with:
+          command: tarpaulin
+          args: --out Lcov --all-features -- --test-threads 1
       - name: Upload to codecov.io
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v2
         with:
           fail_ci_if_error: false

.github/workflows/lint.yml

@@ -6,27 +6,36 @@ on:
   pull_request:
     branches: [ development ]
 
-
 jobs:
   lint:
     runs-on: ubuntu-latest
     env:
       TZ: "/usr/share/zoneinfo/your/location"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: Cache .cargo and target
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo
             ./target
-          key: ${{ runner.os }}-lint-cargo-${{ hashFiles('Cargo.toml') }}
-          restore-keys: ${{ runner.os }}-lint-cargo
+          key: ${{ runner.os }}-lint-cargo-${{ hashFiles('**/Cargo.toml') }}
+          restore-keys: ${{ runner.os }}-lint-cargo-${{ hashFiles('**/Cargo.toml') }}
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rs/toolchain@v1
         with:
-          components: rustfmt, clippy
-      - name: Check format
-        run: cargo fmt --all -- --check
+          toolchain: stable
+          profile: minimal
+          default: true
+      - run: rustup component add rustfmt
+      - name: Check formt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+      - run: rustup component add clippy
       - name: Run clippy
-        run: cargo clippy --all-features -- -Drust-2018-idioms -Dwarnings
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --all-features -- -Drust-2018-idioms -Dwarnings

CHANGELOG.md

@@ -4,11 +4,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.4.8] - 2025-11-29
-- WARNING: Breaking changes!
-- `LassoParameters` and `LassoSearchParameters` have a new field `fit_intercept`. When it is set to false, the `beta_0` term in the formula will be forced to zero, and `intercept` field in `Lasso` will be set to `None`.
-
-
 ## [0.4.0] - 2023-04-05
 
 ## Added

CITATION.cff

@@ -1,41 +0,0 @@
-cff-version: 1.2.0
-message: "If this software contributes to published work, please cite smartcore."
-type: software
-title: "smartcore: Machine Learning in Rust"
-abstract: "smartcore is a comprehensive machine learning and numerical computing library for Rust, offering supervised and unsupervised algorithms, model evaluation tools, and linear algebra abstractions, with optional ndarray integration." [web:5][web:3]
-repository-code: "https://github.com/smartcorelib/smartcore" [web:5]
-url: "https://github.com/smartcorelib" [web:3]
-license: "MIT" [web:13]
-keywords:
-  - Rust
-  - machine learning
-  - numerical computing
-  - linear algebra
-  - classification
-  - regression
-  - clustering
-  - SVM
-  - Random Forest
-  - XGBoost [web:5]
-authors:
-  - name: "smartcore Developers" [web:7]
-  - name: "Lorenzo (contributor)" [web:16]
-  - name: "Community contributors" [web:7]
-version: "0.4.2" [attached_file:1]
-date-released: "2025-09-14" [attached_file:1]
-preferred-citation:
-  type: software
-  title: "smartcore: Machine Learning in Rust"
-  authors:
-    - name: "smartcore Developers" [web:7]
-  url: "https://github.com/smartcorelib" [web:3]
-  repository-code: "https://github.com/smartcorelib/smartcore" [web:5]
-  license: "MIT" [web:13]
-references:
-  - type: manual
-    title: "smartcore Documentation"
-    url: "https://docs.rs/smartcore" [web:5]
-  - type: webpage
-    title: "smartcore Homepage"
-    url: "https://github.com/smartcorelib" [web:3]
-notes: "For development features, see the docs.rs page and the repository README; SmartCore includes algorithms such as SVM, Random Forest, K-Means, PCA, DBSCAN, and XGBoost." [web:5]

Cargo.toml

@@ -2,7 +2,7 @@
 name = "smartcore"
 description = "Machine Learning in Rust."
 homepage = "https://smartcorelib.org"
-version = "0.4.9"
+version = "0.4.0"
 authors = ["smartcore Developers"]
 edition = "2021"
 license = "Apache-2.0"
@@ -28,7 +28,6 @@ num = "0.4"
 rand = { version = "0.8.5", default-features = false, features = ["small_rng"] }
 rand_distr = { version = "0.4", optional = true }
 serde = { version = "1", features = ["derive"], optional = true }
-ordered-float = "5.1.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 typetag = { version = "0.2", optional = true }

README.md

@@ -16,132 +16,6 @@
 </p>
 
 -----
-[![CI](https://github.com/smartcorelib/smartcore/actions/workflows/ci.yml/badge.svg)](https://github.com/smartcorelib/smartcore/actions/workflows/ci.yml) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.17219259.svg)](https://doi.org/10.5281/zenodo.17219259)
+[![CI](https://github.com/smartcorelib/smartcore/actions/workflows/ci.yml/badge.svg)](https://github.com/smartcorelib/smartcore/actions/workflows/ci.yml)
 
-To start getting familiar with the new smartcore v0.4 API, there is now available a [**Jupyter Notebook environment repository**](https://github.com/smartcorelib/smartcore-jupyter). Please see instructions there, contributions welcome see [CONTRIBUTING](.github/CONTRIBUTING.md).
-
-smartcore is a fast, ergonomic machine learning library for Rust, covering classical supervised and unsupervised methods with a modular linear algebra abstraction and optional ndarray support. It aims to provide production-friendly APIs, strong typing, and good defaults while remaining flexible for research and experimentation.
-
-
-## Highlights
-
-- Broad algorithm coverage: linear models, tree-based methods, ensembles, SVMs, neighbors, clustering, decomposition, and preprocessing.
-- Strong linear algebra traits with optional ndarray integration for users who prefer array-first workflows.
-- WASM-first defaults with attention to portability; features such as serde and datasets are opt-in.
-- Practical utilities for model selection, evaluation, readers (CSV), dataset generators, and built-in sample datasets.
-
-
-## Install
-
-Add to Cargo.toml:
-
-```toml
-[dependencies]
-smartcore = "^0.4.3"
-```
-
-For the latest development branch:
-
-```toml
-[dependencies]
-smartcore = { git = "https://github.com/smartcorelib/smartcore", branch = "development" }
-```
-
-Optional features (examples):
-
-- datasets
-- serde
-- ndarray-bindings (deprecated in favor of ndarray-only support per recent changes)
-
-Check Cargo.toml for available features and compatibility notes.
-
-## Quick start
-
-Here is a minimal example fitting a KNN classifier from native Rust vectors using DenseMatrix:
-
-```rust
-use smartcore::linalg::basic::matrix::DenseMatrix;
-use smartcore::neighbors::knn_classifier::KNNClassifier;
-
-// Turn vector slices into a matrix
-let x = DenseMatrix::from_2d_array(&[
-    &[1., 2.],
-    &[3., 4.],
-    &[5., 6.],
-    &[7., 8.],
-    &[9., 10.],
-]).unwrap;
-
-// Class labels
-let y = vec![2, 2, 2, 3, 3];
-
-// Train classifier
-let knn = KNNClassifier::fit(&x, &y, Default::default()).unwrap();
-
-// Predict
-let yhat = knn.predict(&x).unwrap();
-```
-
-This example mirrors the “First Example” section of the crate docs and demonstrates smartcore’s ergonomic API surface.
-
-## Algorithms
-
-smartcore organizes algorithms into clear modules with consistent traits:
-
-- Clustering: K-Means, DBSCAN, agglomerative (including single-linkage), with K-Means++ initialization and utilities.
-- Matrix decomposition: SVD, EVD, Cholesky, LU, QR, plus related linear algebra helpers.
-- Linear models: OLS, Ridge, Lasso, ElasticNet, Logistic Regression.
-- Ensemble and tree-based: Random Forest (classifier and regressor), Extra Trees, shared reusable components across trees and forests.
-- SVM: SVC/SVR with kernel enum support and multiclass extensions.
-- Neighbors: KNN classification and regression with distance metrics and fast selection helpers.
-- Naive Bayes: Gaussian, Bernoulli, Categorical, Multinomial.
-- Preprocessing: encoders, split utilities, and common transforms.
-- Model selection and metrics: K-fold, search parameters, and evaluation utilities.
-
-Recent refactors emphasize reusable components in trees/forests and expanded multiclass SVM capabilities. XGBoost-style regression and single-linkage clustering have been added. See CHANGELOG for API changes and migration notes.
-
-## Data access and readers
-
-- CSV readers: Read matrices from CSV with configurable delimiter and header rows, with helpful error messages and testing utilities (including non-IO reader abstractions).
-- Dataset generators: make_blobs, make_circles, make_moons for quick experiments.
-- Built-in datasets (feature-gated): digits, diabetes, breast cancer, boston, with serialization utilities to persist or refresh .xy bundles.
-
-
-## WebAssembly and portability
-
-smartcore adopts a WASM/WASI-first posture in defaults to ease browser and embedded deployments. Some file-system operations are restricted in wasm targets; tests and IO utilities are structured to avoid unsupported calls where possible. Enable features like serde selectively to minimize footprint. Consult module-level docs and CHANGELOG for target-specific caveats.
-
-## Notebooks
-
-A curated set of Jupyter notebooks is available via the companion repository to explore smartcore interactively. To run locally, use EVCXR to enable Rust notebooks. This is the recommended path to quickly experiment with the v0.4 API.
-
-## Roadmap and recent changes
-
-- Trait-system refactor, fewer structs and more object-safe traits, large codebase reorganization.
-- Move to Rust 2021 edition and cleanup of duplicate code paths.
-- Seeds and deterministic controls across algorithms using RNG plumbing.
-- Search parameter API for hyperparameter exploration in K-Means and SVM families.
-- Tree and forest components refactored for reuse; Extra Trees added.
-- SVM multiclass support; SVR kernel enum and related improvements.
-- XGBoost-style regression introduced; single-linkage clustering implemented.
-
-See CHANGELOG.md for precise details, deprecations, and breaking changes. Some features like nalgebra-bindings have been dropped in favor of ndarray-only paths. Default features are tuned for WASM/WASI builds; enable serde/datasets as needed.
-
-## Contributing
-
-Contributions are welcome:
-
-- Open an issue describing the change and link it in the PR.
-- Keep PRs in sync with the development branch and ensure tests pass on stable Rust.
-- Provide or update tests; run clippy and apply formatting. Coverage and linting are part of the workflow.
-- Use the provided PR and issue templates to describe behavior changes, new features, and expectations.
-
-If adding IO, prefer abstractions that make non-IO testing straightforward (see readers/iotesting). For datasets, keep serialization helpers in tests gated appropriately to avoid unintended file writes in wasm targets.
-
-## License
-
-smartcore is open source under a permissive license; see Cargo.toml and LICENSE for details. The crate metadata identifies “smartcore Developers” as authors; community contributions are credited via Git history and releases.
-
-## Acknowledgments
-
-smartcore’s design incorporates well-known ML patterns while staying idiomatic to Rust. Thanks to all contributors who have helped expand algorithms, improve docs, modernize traits, and harden the codebase for production.
+To start getting familiar with the new smartcore v0.3 API, there is now available a [**Jupyter Notebook environment repository**](https://github.com/smartcorelib/smartcore-jupyter). Please see instructions there, contributions welcome see [CONTRIBUTING](.github/CONTRIBUTING.md).

src/algorithm/neighbour/eppstein.rs

@@ -0,0 +1,219 @@
+//! This module provides FastPair, a data-structure for efficiently tracking the dynamic
+//! closest pairs in a set of points, with an example usage in hierarchical clustering.[2][3][5]
+//!
+//! ## Purpose
+//!
+//! FastPair allows quick retrieval of the nearest neighbor for each data point by maintaining
+//! a "conga line" of closest pairs. Each point retains a link to its known nearest neighbor,
+//! and updates in the data structure propagate accordingly. This can be leveraged in
+//! agglomerative clustering steps, where merging or insertion of new points must be reflected
+//! in nearest-neighbor relationships.
+//!
+//! ## Example
+//!
+//! ```
+//! use smartcore::metrics::distance::PairwiseDistance;
+//! use smartcore::linalg::basic::matrix::DenseMatrix;
+//! use smartcore::algorithm::neighbour::fastpair::FastPair;
+//!
+//! let x = DenseMatrix::from_2d_array(&[
+//!     &[5.1, 3.5, 1.4, 0.2],
+//!     &[4.9, 3.0, 1.4, 0.2],
+//!     &[4.7, 3.2, 1.3, 0.2],
+//!     &[4.6, 3.1, 1.5, 0.2],
+//!     &[5.0, 3.6, 1.4, 0.2],
+//!     &[5.4, 3.9, 1.7, 0.4],
+//! ]).unwrap();
+//!
+//! let fastpair = FastPair::new(&x).unwrap();
+//! let closest = fastpair.closest_pair();
+//! println!("Closest pair: {:?}", closest);
+//! ```
+use std::collections::HashMap;
+
+use num::Bounded;
+
+use crate::error::{Failed, FailedError};
+use crate::linalg::basic::arrays::{Array, Array1, Array2};
+use crate::metrics::distance::euclidian::Euclidian;
+use crate::metrics::distance::PairwiseDistance;
+use crate::numbers::floatnum::FloatNumber;
+use crate::numbers::realnum::RealNumber;
+
+/// Eppstein dynamic closet-pair structure
+/// 'M' can be a matrix-like trait that provides row access
+#[derive(Debug)]
+pub struct EppsteinDCP<'a, T: RealNumber + FloatNumber, M: Array2<T>> {
+    samples: &'a M,
+    // "buckets" store, for each row, a small structure recording potential neighbors
+    neighbors: HashMap<usize, PairwiseDistance<T>>,
+}
+
+impl<'a, T: RealNumber + FloatNumber, M: Array2<T>> EppsteinDCP<'a, T, M> {
+    /// Creates a new EppsteinDCP instance with the given data
+    pub fn new(m: &'a M) -> Result<Self, Failed> {
+        if m.shape().0 < 3 {
+            return Err(Failed::because(
+                FailedError::FindFailed,
+                "min number of rows should be 3",
+            ));
+        }
+
+        let mut this = Self {
+            samples: m,
+            neighbors: HashMap::with_capacity(m.shape().0),
+        };
+        this.initialize();
+        Ok(this)
+    }
+
+    /// Build an initial "conga line" or chain of potential neighbors
+    /// akin to Eppstein’s technique[2].
+    fn initialize(&mut self) {
+        let n = self.samples.shape().0;
+        if n < 2 {
+            return;
+        }
+        // Assign each row i some large distance by default
+        for i in 0..n {
+            self.neighbors.insert(
+                i,
+                PairwiseDistance {
+                    node: i,
+                    neighbour: None,
+                    distance: Some(<T as Bounded>::max_value()),
+                },
+            );
+        }
+        // Example: link each i to the next, forming a chain
+        // (depending on the actual Eppstein approach, can refine)
+        for i in 0..(n - 1) {
+            let dist = self.compute_dist(i, i + 1);
+            self.neighbors.entry(i).and_modify(|pd| {
+                pd.neighbour = Some(i + 1);
+                pd.distance = Some(dist);
+            });
+        }
+        // Potential refinement steps omitted for brevity
+    }
+
+    /// Insert a point into the structure.
+    pub fn insert(&mut self, row_idx: usize) {
+        // Expand data, find neighbor to link with
+        // For example, link row_idx to nearest among existing
+        let mut best_neighbor = None;
+        let mut best_d = <T as Bounded>::max_value();
+        for (i, _) in &self.neighbors {
+            let d = self.compute_dist(*i, row_idx);
+            if d < best_d {
+                best_d = d;
+                best_neighbor = Some(*i);
+            }
+        }
+        self.neighbors.insert(
+            row_idx,
+            PairwiseDistance {
+                node: row_idx,
+                neighbour: best_neighbor,
+                distance: Some(best_d),
+            },
+        );
+        // For the best_neighbor, you might want to see if row_idx becomes closer
+        if let Some(kn) = best_neighbor {
+            let dist = self.compute_dist(row_idx, kn);
+            let entry = self.neighbors.get_mut(&kn).unwrap();
+            if dist < entry.distance.unwrap() {
+                entry.neighbour = Some(row_idx);
+                entry.distance = Some(dist);
+            }
+        }
+    }
+
+    /// For hierarchical clustering, discover minimal pairs, then merge
+    pub fn closest_pair(&self) -> Option<PairwiseDistance<T>> {
+        let mut min_pair: Option<PairwiseDistance<T>> = None;
+        for (_, pd) in &self.neighbors {
+            if let Some(d) = pd.distance {
+                if min_pair.is_none() || d < min_pair.as_ref().unwrap().distance.unwrap() {
+                    min_pair = Some(pd.clone());
+                }
+            }
+        }
+        min_pair
+    }
+
+    fn compute_dist(&self, i: usize, j: usize) -> T {
+        // Example: Euclidean
+        let row_i = self.samples.get_row(i);
+        let row_j = self.samples.get_row(j);
+        row_i
+            .iterator(0)
+            .zip(row_j.iterator(0))
+            .map(|(a, b)| (*a - *b) * (*a - *b))
+            .sum()
+    }
+}
+
+/// Simple usage
+#[cfg(test)]
+mod tests_eppstein {
+    use super::*;
+    use crate::linalg::basic::matrix::DenseMatrix;
+
+    #[test]
+    fn test_eppstein() {
+        let matrix =
+            DenseMatrix::from_2d_array(&[&vec![1.0, 2.0], &vec![2.0, 2.0], &vec![5.0, 3.0]])
+                .unwrap();
+        let mut dcp = EppsteinDCP::new(&matrix).unwrap();
+        dcp.insert(2);
+        let cp = dcp.closest_pair();
+        assert!(cp.is_some());
+    }
+
+    #[test]
+    fn compare_fastpair_eppstein() {
+        use crate::algorithm::neighbour::fastpair::FastPair;
+        // Assuming EppsteinDCP is implemented in a similar module
+        use crate::algorithm::neighbour::eppstein::EppsteinDCP;
+
+        // Create a static example matrix
+        let x = DenseMatrix::from_2d_array(&[
+            &[5.1, 3.5, 1.4, 0.2],
+            &[4.9, 3.0, 1.4, 0.2],
+            &[4.7, 3.2, 1.3, 0.2],
+            &[4.6, 3.1, 1.5, 0.2],
+            &[5.0, 3.6, 1.4, 0.2],
+            &[5.4, 3.9, 1.7, 0.4],
+            &[4.6, 3.4, 1.4, 0.3],
+            &[5.0, 3.4, 1.5, 0.2],
+            &[4.4, 2.9, 1.4, 0.2],
+            &[4.9, 3.1, 1.5, 0.1],
+        ])
+        .unwrap();
+
+        // Build FastPair
+        let fastpair = FastPair::new(&x).unwrap();
+        let pair_fastpair = fastpair.closest_pair();
+
+        // Build EppsteinDCP
+        let eppstein = EppsteinDCP::new(&x).unwrap();
+        let pair_eppstein = eppstein.closest_pair();
+
+        // Compare the results
+        assert_eq!(pair_fastpair.node, pair_eppstein.as_ref().unwrap().node);
+        assert_eq!(
+            pair_fastpair.neighbour.unwrap(),
+            pair_eppstein.as_ref().unwrap().neighbour.unwrap()
+        );
+
+        // Use a small epsilon for floating-point comparison
+        let epsilon = 1e-9;
+        let diff: f64 =
+            pair_fastpair.distance.unwrap() - pair_eppstein.as_ref().unwrap().distance.unwrap();
+        assert!(diff.abs() < epsilon);
+
+        println!("FastPair result: {:?}", pair_fastpair);
+        println!("EppsteinDCP result: {:?}", pair_eppstein);
+    }
+}

src/algorithm/neighbour/mod.rs

@@ -1,4 +1,4 @@
-#![allow(clippy::ptr_arg, clippy::needless_range_loop)]
+#![allow(clippy::ptr_arg)]
 //! # Nearest Neighbors Search Algorithms and Data Structures
 //!
 //! Nearest neighbor search is a basic computational tool that is particularly relevant to machine learning,
@@ -39,11 +39,11 @@ use crate::numbers::basenum::Number;
 use serde::{Deserialize, Serialize};
 
 pub(crate) mod bbd_tree;
-/// a variant of fastpair using cosine distance
-pub mod cosinepair;
 /// tree data structure for fast nearest neighbor search
 pub mod cover_tree;
-/// fastpair closest neighbour algorithm
+/// eppstein pairwise closest neighbour algorithm
+pub mod eppstein;
+/// fastpair pairwise closest neighbour algorithm
 pub mod fastpair;
 /// very simple algorithm that sequentially checks each element of the list until a match is found or the whole list has been searched.
 pub mod linear_search;

src/algorithm/sort/quick_sort.rs

@@ -1,7 +1,6 @@
 use num_traits::Num;
 
 pub trait QuickArgSort {
-    #[allow(dead_code)]
     fn quick_argsort_mut(&mut self) -> Vec<usize>;
 
     #[allow(dead_code)]

src/cluster/agglomerative.rs

@@ -1,317 +0,0 @@
-//! # Agglomerative Hierarchical Clustering
-//!
-//! Agglomerative clustering is a "bottom-up" hierarchical clustering method. It works by placing each data point in its own cluster and then successively merging the two most similar clusters until a stopping criterion is met. This process creates a tree-based hierarchy of clusters known as a dendrogram.
-//!
-//! The similarity of two clusters is determined by a **linkage criterion**. This implementation uses **single-linkage**, where the distance between two clusters is defined as the minimum distance between any single point in the first cluster and any single point in the second cluster. The distance between points is the standard Euclidean distance.
-//!
-//! The algorithm first builds the full hierarchy of `N-1` merges. To obtain a specific number of clusters, `n_clusters`, the algorithm then effectively "cuts" the dendrogram at the point where `n_clusters` remain.
-//!
-//! ## Example:
-//!
-//! ```
-//! use smartcore::linalg::basic::matrix::DenseMatrix;
-//! use smartcore::cluster::agglomerative::{AgglomerativeClustering, AgglomerativeClusteringParameters};
-//!
-//! // A dataset with 2 distinct groups of points.
-//! let x = DenseMatrix::from_2d_array(&[
-//!         &[0.0, 0.0], &[1.0, 1.0], &[0.5, 0.5], // Cluster A
-//!         &[10.0, 10.0], &[11.0, 11.0], &[10.5, 10.5], // Cluster B
-//!     ]).unwrap();
-//!
-//! // Set parameters to find 2 clusters.
-//! let parameters = AgglomerativeClusteringParameters::default().with_n_clusters(2);
-//!
-//! // Fit the model to the data.
-//! let clustering = AgglomerativeClustering::<f64, usize, DenseMatrix<f64>, Vec<usize>>::fit(&x, parameters).unwrap();
-//!
-//! // Get the cluster assignments.
-//! let labels = clustering.labels; // e.g., [0, 0, 0, 1, 1, 1]
-//! ```
-//!
-//! ## References:
-//!
-//! * ["An Introduction to Statistical Learning", James G., Witten D., Hastie T., Tibshirani R., 10.3.2 Hierarchical Clustering](http://faculty.marshall.usc.edu/gareth-james/ISL/)
-//! * ["The Elements of Statistical Learning", Hastie T., Tibshirani R., Friedman J., 14.3.12 Hierarchical Clustering](https://hastie.su.domains/ElemStatLearn/)
-
-use std::collections::HashMap;
-use std::marker::PhantomData;
-
-use crate::api::UnsupervisedEstimator;
-use crate::error::{Failed, FailedError};
-use crate::linalg::basic::arrays::{Array1, Array2};
-use crate::numbers::basenum::Number;
-
-/// Parameters for the Agglomerative Clustering algorithm.
-#[derive(Debug, Clone, Copy)]
-pub struct AgglomerativeClusteringParameters {
-    /// The number of clusters to find.
-    pub n_clusters: usize,
-}
-
-impl AgglomerativeClusteringParameters {
-    /// Sets the number of clusters.
-    ///
-    /// # Arguments
-    /// * `n_clusters` - The desired number of clusters.
-    pub fn with_n_clusters(mut self, n_clusters: usize) -> Self {
-        self.n_clusters = n_clusters;
-        self
-    }
-}
-
-impl Default for AgglomerativeClusteringParameters {
-    fn default() -> Self {
-        AgglomerativeClusteringParameters { n_clusters: 2 }
-    }
-}
-
-/// Agglomerative Clustering model.
-///
-/// This implementation uses single-linkage clustering, which is mathematically
-/// equivalent to finding the Minimum Spanning Tree (MST) of the data points.
-/// The core logic is an efficient implementation of Kruskal's algorithm, which
-/// processes all pairwise distances in increasing order and uses a Disjoint
-/// Set Union (DSU) data structure to track cluster membership.
-#[derive(Debug)]
-pub struct AgglomerativeClustering<TX: Number, TY: Number, X: Array2<TX>, Y: Array1<TY>> {
-    /// The cluster label assigned to each sample.
-    pub labels: Vec<usize>,
-    _phantom_tx: PhantomData<TX>,
-    _phantom_ty: PhantomData<TY>,
-    _phantom_x: PhantomData<X>,
-    _phantom_y: PhantomData<Y>,
-}
-
-impl<TX: Number, TY: Number, X: Array2<TX>, Y: Array1<TY>> AgglomerativeClustering<TX, TY, X, Y> {
-    /// Fits the agglomerative clustering model to the data.
-    ///
-    /// # Arguments
-    /// * `data` - A reference to the input data matrix.
-    /// * `parameters` - The parameters for the clustering algorithm, including `n_clusters`.
-    ///
-    /// # Returns
-    /// A `Result` containing the fitted model with cluster labels, or an error if
-    pub fn fit(data: &X, parameters: AgglomerativeClusteringParameters) -> Result<Self, Failed> {
-        let (num_samples, _) = data.shape();
-        let n_clusters = parameters.n_clusters;
-        if n_clusters > num_samples {
-            return Err(Failed::because(
-                FailedError::ParametersError,
-                &format!(
-                    "n_clusters: {n_clusters} cannot be greater than n_samples: {num_samples}"
-                ),
-            ));
-        }
-
-        let mut distance_pairs = Vec::new();
-        for i in 0..num_samples {
-            for j in (i + 1)..num_samples {
-                let distance: f64 = data
-                    .get_row(i)
-                    .iterator(0)
-                    .zip(data.get_row(j).iterator(0))
-                    .map(|(&a, &b)| (a.to_f64().unwrap() - b.to_f64().unwrap()).powi(2))
-                    .sum::<f64>();
-
-                distance_pairs.push((distance, i, j));
-            }
-        }
-        distance_pairs.sort_unstable_by(|a, b| b.0.partial_cmp(&a.0).unwrap());
-        let mut parent = HashMap::new();
-        let mut children = HashMap::new();
-        for i in 0..num_samples {
-            parent.insert(i, i);
-            children.insert(i, vec![i]);
-        }
-
-        let mut merge_history = Vec::new();
-        let num_merges_needed = num_samples - 1;
-
-        while merge_history.len() < num_merges_needed {
-            let (_, p1, p2) = distance_pairs.pop().unwrap();
-
-            let root1 = parent[&p1];
-            let root2 = parent[&p2];
-
-            if root1 != root2 {
-                let root2_children = children.remove(&root2).unwrap();
-                for child in root2_children.iter() {
-                    parent.insert(*child, root1);
-                }
-                let root1_children = children.get_mut(&root1).unwrap();
-                root1_children.extend(root2_children);
-                merge_history.push((root1, root2));
-            }
-        }
-
-        let mut clusters = HashMap::new();
-        let mut assignments = HashMap::new();
-
-        for i in 0..num_samples {
-            clusters.insert(i, vec![i]);
-            assignments.insert(i, i);
-        }
-
-        let merges_to_apply = num_samples - n_clusters;
-
-        for (root1, root2) in merge_history[0..merges_to_apply].iter() {
-            let root1_cluster = assignments[root1];
-            let root2_cluster = assignments[root2];
-
-            let root2_assignments = clusters.remove(&root2_cluster).unwrap();
-            for assignment in root2_assignments.iter() {
-                assignments.insert(*assignment, root1_cluster);
-            }
-            let root1_assignments = clusters.get_mut(&root1_cluster).unwrap();
-            root1_assignments.extend(root2_assignments);
-        }
-
-        let mut labels: Vec<usize> = (0..num_samples).map(|_| 0).collect();
-        let mut cluster_keys: Vec<&usize> = clusters.keys().collect();
-        cluster_keys.sort();
-        for (i, key) in cluster_keys.into_iter().enumerate() {
-            for index in clusters[key].iter() {
-                labels[*index] = i;
-            }
-        }
-        Ok(AgglomerativeClustering {
-            labels,
-            _phantom_tx: PhantomData,
-            _phantom_ty: PhantomData,
-            _phantom_x: PhantomData,
-            _phantom_y: PhantomData,
-        })
-    }
-}
-
-impl<TX: Number, TY: Number, X: Array2<TX>, Y: Array1<TY>>
-    UnsupervisedEstimator<X, AgglomerativeClusteringParameters>
-    for AgglomerativeClustering<TX, TY, X, Y>
-{
-    fn fit(x: &X, parameters: AgglomerativeClusteringParameters) -> Result<Self, Failed> {
-        AgglomerativeClustering::fit(x, parameters)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::linalg::basic::matrix::DenseMatrix;
-    use std::collections::HashSet;
-
-    use super::*;
-
-    #[test]
-    fn test_simple_clustering() {
-        // Two distinct clusters, far apart.
-        let data = vec![
-            0.0, 0.0, 1.0, 1.0, 0.5, 0.5, // Cluster A
-            10.0, 10.0, 11.0, 11.0, 10.5, 10.5, // Cluster B
-        ];
-        let matrix = DenseMatrix::new(6, 2, data, false).unwrap();
-        let parameters = AgglomerativeClusteringParameters::default().with_n_clusters(2);
-        // Using f64 for TY as usize doesn't satisfy the Number trait bound.
-        let clustering = AgglomerativeClustering::<f64, f64, DenseMatrix<f64>, Vec<f64>>::fit(
-            &matrix, parameters,
-        )
-        .unwrap();
-
-        let labels = clustering.labels;
-
-        // Check that all points in the first group have the same label.
-        let first_group_label = labels[0];
-        assert!(labels[0..3].iter().all(|&l| l == first_group_label));
-
-        // Check that all points in the second group have the same label.
-        let second_group_label = labels[3];
-        assert!(labels[3..6].iter().all(|&l| l == second_group_label));
-
-        // Check that the two groups have different labels.
-        assert_ne!(first_group_label, second_group_label);
-    }
-
-    #[test]
-    fn test_four_clusters() {
-        // Four distinct clusters in the corners of a square.
-        let data = vec![
-            0.0, 0.0, 1.0, 1.0, // Cluster A
-            100.0, 100.0, 101.0, 101.0, // Cluster B
-            0.0, 100.0, 1.0, 101.0, // Cluster C
-            100.0, 0.0, 101.0, 1.0, // Cluster D
-        ];
-        let matrix = DenseMatrix::new(8, 2, data, false).unwrap();
-        let parameters = AgglomerativeClusteringParameters::default().with_n_clusters(4);
-        let clustering = AgglomerativeClustering::<f64, f64, DenseMatrix<f64>, Vec<f64>>::fit(
-            &matrix, parameters,
-        )
-        .unwrap();
-
-        let labels = clustering.labels;
-
-        // Verify that there are exactly 4 unique labels produced.
-        let unique_labels: HashSet<usize> = labels.iter().cloned().collect();
-        assert_eq!(unique_labels.len(), 4);
-
-        // Verify that points within each original group were assigned the same cluster label.
-        let label_a = labels[0];
-        assert_eq!(label_a, labels[1]);
-
-        let label_b = labels[2];
-        assert_eq!(label_b, labels[3]);
-
-        let label_c = labels[4];
-        assert_eq!(label_c, labels[5]);
-
-        let label_d = labels[6];
-        assert_eq!(label_d, labels[7]);
-
-        // Verify that all four groups received different labels.
-        assert_ne!(label_a, label_b);
-        assert_ne!(label_a, label_c);
-        assert_ne!(label_a, label_d);
-        assert_ne!(label_b, label_c);
-        assert_ne!(label_b, label_d);
-        assert_ne!(label_c, label_d);
-    }
-
-    #[test]
-    fn test_n_clusters_equal_to_samples() {
-        let data = vec![0.0, 0.0, 5.0, 5.0, 10.0, 10.0];
-        let matrix = DenseMatrix::new(3, 2, data, false).unwrap();
-        let parameters = AgglomerativeClusteringParameters::default().with_n_clusters(3);
-        let clustering = AgglomerativeClustering::<f64, f64, DenseMatrix<f64>, Vec<f64>>::fit(
-            &matrix, parameters,
-        )
-        .unwrap();
-
-        // Each point should be its own cluster. Sorting makes the test deterministic.
-        let mut labels = clustering.labels;
-        labels.sort();
-        assert_eq!(labels, vec![0, 1, 2]);
-    }
-
-    #[test]
-    fn test_one_cluster() {
-        let data = vec![0.0, 0.0, 5.0, 5.0, 10.0, 10.0];
-        let matrix = DenseMatrix::new(3, 2, data, false).unwrap();
-        let parameters = AgglomerativeClusteringParameters::default().with_n_clusters(1);
-        let clustering = AgglomerativeClustering::<f64, f64, DenseMatrix<f64>, Vec<f64>>::fit(
-            &matrix, parameters,
-        )
-        .unwrap();
-
-        // All points should be in the same cluster.
-        assert_eq!(clustering.labels, vec![0, 0, 0]);
-    }
-
-    #[test]
-    fn test_error_on_too_many_clusters() {
-        let data = vec![0.0, 0.0, 5.0, 5.0];
-        let matrix = DenseMatrix::new(2, 2, data, false).unwrap();
-        let parameters = AgglomerativeClusteringParameters::default().with_n_clusters(3);
-        let result = AgglomerativeClustering::<f64, f64, DenseMatrix<f64>, Vec<f64>>::fit(
-            &matrix, parameters,
-        );
-
-        assert!(result.is_err());
-    }
-}

src/cluster/mod.rs

@@ -1,10 +1,8 @@
-#![allow(clippy::ptr_arg, clippy::needless_range_loop)]
 //! # Clustering
 //!
 //! Clustering is the type of unsupervised learning where you divide the population or data points into a number of groups such that data points in the same groups
 //! are more similar to other data points in the same group than those in other groups. In simple words, the aim is to segregate groups with similar traits and assign them into clusters.
 
-pub mod agglomerative;
 pub mod dbscan;
 /// An iterative clustering algorithm that aims to find local maxima in each iteration.
 pub mod kmeans;

src/dataset/mod.rs

@@ -1,4 +1,3 @@
-#![allow(clippy::ptr_arg, clippy::needless_range_loop)]
 //! Datasets
 //!
 //! In this module you will find small datasets that are used in `smartcore` mostly for demonstration purposes.

src/ensemble/base_forest_regressor.rs

@@ -1,214 +0,0 @@
-use rand::Rng;
-use std::fmt::Debug;
-
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-use crate::error::{Failed, FailedError};
-use crate::linalg::basic::arrays::{Array1, Array2};
-use crate::numbers::basenum::Number;
-use crate::numbers::floatnum::FloatNumber;
-
-use crate::rand_custom::get_rng_impl;
-use crate::tree::base_tree_regressor::{BaseTreeRegressor, BaseTreeRegressorParameters, Splitter};
-
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone)]
-/// Parameters of the Forest Regressor
-/// Some parameters here are passed directly into base estimator.
-pub struct BaseForestRegressorParameters {
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// Tree max depth. See [Decision Tree Regressor](../../tree/decision_tree_regressor/index.html)
-    pub max_depth: Option<u16>,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// The minimum number of samples required to be at a leaf node. See [Decision Tree Regressor](../../tree/decision_tree_regressor/index.html)
-    pub min_samples_leaf: usize,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// The minimum number of samples required to split an internal node. See [Decision Tree Regressor](../../tree/decision_tree_regressor/index.html)
-    pub min_samples_split: usize,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// The number of trees in the forest.
-    pub n_trees: usize,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// Number of random sample of predictors to use as split candidates.
-    pub m: Option<usize>,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// Whether to keep samples used for tree generation. This is required for OOB prediction.
-    pub keep_samples: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// Seed used for bootstrap sampling and feature selection for each tree.
-    pub seed: u64,
-    #[cfg_attr(feature = "serde", serde(default))]
-    pub bootstrap: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
-    pub splitter: Splitter,
-}
-
-impl<TX: Number + FloatNumber + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>> PartialEq
-    for BaseForestRegressor<TX, TY, X, Y>
-{
-    fn eq(&self, other: &Self) -> bool {
-        if self.trees.as_ref().unwrap().len() != other.trees.as_ref().unwrap().len() {
-            false
-        } else {
-            self.trees
-                .iter()
-                .zip(other.trees.iter())
-                .all(|(a, b)| a == b)
-        }
-    }
-}
-
-/// Forest Regressor
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
-pub struct BaseForestRegressor<
-    TX: Number + FloatNumber + PartialOrd,
-    TY: Number,
-    X: Array2<TX>,
-    Y: Array1<TY>,
-> {
-    trees: Option<Vec<BaseTreeRegressor<TX, TY, X, Y>>>,
-    samples: Option<Vec<Vec<bool>>>,
-}
-
-impl<TX: Number + FloatNumber + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
-    BaseForestRegressor<TX, TY, X, Y>
-{
-    /// Build a forest of trees from the training set.
-    /// * `x` - _NxM_ matrix with _N_ observations and _M_ features in each observation.
-    /// * `y` - the target class values
-    pub fn fit(
-        x: &X,
-        y: &Y,
-        parameters: BaseForestRegressorParameters,
-    ) -> Result<BaseForestRegressor<TX, TY, X, Y>, Failed> {
-        let (n_rows, num_attributes) = x.shape();
-
-        if n_rows != y.shape() {
-            return Err(Failed::fit("Number of rows in X should = len(y)"));
-        }
-
-        let mtry = parameters
-            .m
-            .unwrap_or((num_attributes as f64).sqrt().floor() as usize);
-
-        let mut rng = get_rng_impl(Some(parameters.seed));
-        let mut trees: Vec<BaseTreeRegressor<TX, TY, X, Y>> = Vec::new();
-
-        let mut maybe_all_samples: Option<Vec<Vec<bool>>> = Option::None;
-        if parameters.keep_samples {
-            // TODO: use with_capacity here
-            maybe_all_samples = Some(Vec::new());
-        }
-
-        let mut samples: Vec<usize> = (0..n_rows).map(|_| 1).collect();
-
-        for _ in 0..parameters.n_trees {
-            if parameters.bootstrap {
-                samples =
-                    BaseForestRegressor::<TX, TY, X, Y>::sample_with_replacement(n_rows, &mut rng);
-            }
-
-            // keep samples is flag is on
-            if let Some(ref mut all_samples) = maybe_all_samples {
-                all_samples.push(samples.iter().map(|x| *x != 0).collect())
-            }
-
-            let params = BaseTreeRegressorParameters {
-                max_depth: parameters.max_depth,
-                min_samples_leaf: parameters.min_samples_leaf,
-                min_samples_split: parameters.min_samples_split,
-                seed: Some(parameters.seed),
-                splitter: parameters.splitter.clone(),
-            };
-            let tree = BaseTreeRegressor::fit_weak_learner(x, y, samples.clone(), mtry, params)?;
-            trees.push(tree);
-        }
-
-        Ok(BaseForestRegressor {
-            trees: Some(trees),
-            samples: maybe_all_samples,
-        })
-    }
-
-    /// Predict class for `x`
-    /// * `x` - _KxM_ data where _K_ is number of observations and _M_ is number of features.
-    pub fn predict(&self, x: &X) -> Result<Y, Failed> {
-        let mut result = Y::zeros(x.shape().0);
-
-        let (n, _) = x.shape();
-
-        for i in 0..n {
-            result.set(i, self.predict_for_row(x, i));
-        }
-
-        Ok(result)
-    }
-
-    fn predict_for_row(&self, x: &X, row: usize) -> TY {
-        let n_trees = self.trees.as_ref().unwrap().len();
-
-        let mut result = TY::zero();
-
-        for tree in self.trees.as_ref().unwrap().iter() {
-            result += tree.predict_for_row(x, row);
-        }
-
-        result / TY::from_usize(n_trees).unwrap()
-    }
-
-    /// Predict OOB classes for `x`. `x` is expected to be equal to the dataset used in training.
-    pub fn predict_oob(&self, x: &X) -> Result<Y, Failed> {
-        let (n, _) = x.shape();
-        if self.samples.is_none() {
-            Err(Failed::because(
-                FailedError::PredictFailed,
-                "Need samples=true for OOB predictions.",
-            ))
-        } else if self.samples.as_ref().unwrap()[0].len() != n {
-            Err(Failed::because(
-                FailedError::PredictFailed,
-                "Prediction matrix must match matrix used in training for OOB predictions.",
-            ))
-        } else {
-            let mut result = Y::zeros(n);
-
-            for i in 0..n {
-                result.set(i, self.predict_for_row_oob(x, i));
-            }
-
-            Ok(result)
-        }
-    }
-
-    fn predict_for_row_oob(&self, x: &X, row: usize) -> TY {
-        let mut n_trees = 0;
-        let mut result = TY::zero();
-
-        for (tree, samples) in self
-            .trees
-            .as_ref()
-            .unwrap()
-            .iter()
-            .zip(self.samples.as_ref().unwrap())
-        {
-            if !samples[row] {
-                result += tree.predict_for_row(x, row);
-                n_trees += 1;
-            }
-        }
-
-        // TODO: What to do if there are no oob trees?
-        result / TY::from(n_trees).unwrap()
-    }
-
-    fn sample_with_replacement(nrows: usize, rng: &mut impl Rng) -> Vec<usize> {
-        let mut samples = vec![0; nrows];
-        for _ in 0..nrows {
-            let xi = rng.gen_range(0..nrows);
-            samples[xi] += 1;
-        }
-        samples
-    }
-}

src/ensemble/extra_trees_regressor.rs

@@ -1,318 +0,0 @@
-//! # Extra Trees Regressor
-//! An Extra-Trees (Extremely Randomized Trees) regressor is an ensemble learning method that fits multiple randomized
-//! decision trees on the dataset and averages their predictions to improve accuracy and control over-fitting.
-//!
-//! It is similar to a standard Random Forest, but introduces more randomness in the way splits are chosen, which can
-//! reduce the variance of the model and often make the training process faster.
-//!
-//! The two key differences from a standard Random Forest are:
-//! 1. It uses the whole original dataset to build each tree instead of bootstrap samples.
-//! 2. When splitting a node, it chooses a random split point for each feature, rather than the most optimal one.
-//!
-//! See [ensemble models](../index.html) for more details.
-//!
-//! Bigger number of estimators in general improves performance of the algorithm with an increased cost of training time.
-//! The random sample of _m_ predictors is typically set to be \\(\sqrt{p}\\) from the full set of _p_ predictors.
-//!
-//! Example:
-//!
-//! ```
-//! use smartcore::linalg::basic::matrix::DenseMatrix;
-//! use smartcore::ensemble::extra_trees_regressor::*;
-//!
-//! // Longley dataset ([https://www.statsmodels.org/stable/datasets/generated/longley.html](https://www.statsmodels.org/stable/datasets/generated/longley.html))
-//! let x = DenseMatrix::from_2d_array(&[
-//!     &[234.289, 235.6, 159., 107.608, 1947., 60.323],
-//!     &[259.426, 232.5, 145.6, 108.632, 1948., 61.122],
-//!     &[258.054, 368.2, 161.6, 109.773, 1949., 60.171],
-//!     &[284.599, 335.1, 165., 110.929, 1950., 61.187],
-//!     &[328.975, 209.9, 309.9, 112.075, 1951., 63.221],
-//!     &[346.999, 193.2, 359.4, 113.27, 1952., 63.639],
-//!     &[365.385, 187., 354.7, 115.094, 1953., 64.989],
-//!     &[363.112, 357.8, 335., 116.219, 1954., 63.761],
-//!     &[397.469, 290.4, 304.8, 117.388, 1955., 66.019],
-//!     &[419.18, 282.2, 285.7, 118.734, 1956., 67.857],
-//!     &[442.769, 293.6, 279.8, 120.445, 1957., 68.169],
-//!     &[444.546, 468.1, 263.7, 121.95, 1958., 66.513],
-//!     &[482.704, 381.3, 255.2, 123.366, 1959., 68.655],
-//!     &[502.601, 393.1, 251.4, 125.368, 1960., 69.564],
-//!     &[518.173, 480.6, 257.2, 127.852, 1961., 69.331],
-//!     &[554.894, 400.7, 282.7, 130.081, 1962., 70.551],
-//! ]).unwrap();
-//! let y = vec![
-//!     83.0, 88.5, 88.2, 89.5, 96.2, 98.1, 99.0, 100.0, 101.2,
-//!     104.6, 108.4, 110.8, 112.6, 114.2, 115.7, 116.9
-//! ];
-//!
-//! let regressor = ExtraTreesRegressor::fit(&x, &y, Default::default()).unwrap();
-//!
-//! let y_hat = regressor.predict(&x).unwrap(); // use the same data for prediction
-//! ```
-//!
-//! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
-//! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
-
-use std::default::Default;
-use std::fmt::Debug;
-
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-use crate::api::{Predictor, SupervisedEstimator};
-use crate::ensemble::base_forest_regressor::{BaseForestRegressor, BaseForestRegressorParameters};
-use crate::error::Failed;
-use crate::linalg::basic::arrays::{Array1, Array2};
-use crate::numbers::basenum::Number;
-use crate::numbers::floatnum::FloatNumber;
-use crate::tree::base_tree_regressor::Splitter;
-
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone)]
-/// Parameters of the Extra Trees Regressor
-/// Some parameters here are passed directly into base estimator.
-pub struct ExtraTreesRegressorParameters {
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// Tree max depth. See [Decision Tree Regressor](../../tree/decision_tree_regressor/index.html)
-    pub max_depth: Option<u16>,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// The minimum number of samples required to be at a leaf node. See [Decision Tree Regressor](../../tree/decision_tree_regressor/index.html)
-    pub min_samples_leaf: usize,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// The minimum number of samples required to split an internal node. See [Decision Tree Regressor](../../tree/decision_tree_regressor/index.html)
-    pub min_samples_split: usize,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// The number of trees in the forest.
-    pub n_trees: usize,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// Number of random sample of predictors to use as split candidates.
-    pub m: Option<usize>,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// Whether to keep samples used for tree generation. This is required for OOB prediction.
-    pub keep_samples: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// Seed used for bootstrap sampling and feature selection for each tree.
-    pub seed: u64,
-}
-
-/// Extra Trees Regressor
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
-pub struct ExtraTreesRegressor<
-    TX: Number + FloatNumber + PartialOrd,
-    TY: Number,
-    X: Array2<TX>,
-    Y: Array1<TY>,
-> {
-    forest_regressor: Option<BaseForestRegressor<TX, TY, X, Y>>,
-}
-
-impl ExtraTreesRegressorParameters {
-    /// Tree max depth. See [Decision Tree Classifier](../../tree/decision_tree_classifier/index.html)
-    pub fn with_max_depth(mut self, max_depth: u16) -> Self {
-        self.max_depth = Some(max_depth);
-        self
-    }
-    /// The minimum number of samples required to be at a leaf node. See [Decision Tree Classifier](../../tree/decision_tree_classifier/index.html)
-    pub fn with_min_samples_leaf(mut self, min_samples_leaf: usize) -> Self {
-        self.min_samples_leaf = min_samples_leaf;
-        self
-    }
-    /// The minimum number of samples required to split an internal node. See [Decision Tree Classifier](../../tree/decision_tree_classifier/index.html)
-    pub fn with_min_samples_split(mut self, min_samples_split: usize) -> Self {
-        self.min_samples_split = min_samples_split;
-        self
-    }
-    /// The number of trees in the forest.
-    pub fn with_n_trees(mut self, n_trees: usize) -> Self {
-        self.n_trees = n_trees;
-        self
-    }
-    /// Number of random sample of predictors to use as split candidates.
-    pub fn with_m(mut self, m: usize) -> Self {
-        self.m = Some(m);
-        self
-    }
-
-    /// Whether to keep samples used for tree generation. This is required for OOB prediction.
-    pub fn with_keep_samples(mut self, keep_samples: bool) -> Self {
-        self.keep_samples = keep_samples;
-        self
-    }
-
-    /// Seed used for bootstrap sampling and feature selection for each tree.
-    pub fn with_seed(mut self, seed: u64) -> Self {
-        self.seed = seed;
-        self
-    }
-}
-impl Default for ExtraTreesRegressorParameters {
-    fn default() -> Self {
-        ExtraTreesRegressorParameters {
-            max_depth: Option::None,
-            min_samples_leaf: 1,
-            min_samples_split: 2,
-            n_trees: 10,
-            m: Option::None,
-            keep_samples: false,
-            seed: 0,
-        }
-    }
-}
-
-impl<TX: Number + FloatNumber + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
-    SupervisedEstimator<X, Y, ExtraTreesRegressorParameters> for ExtraTreesRegressor<TX, TY, X, Y>
-{
-    fn new() -> Self {
-        Self {
-            forest_regressor: Option::None,
-        }
-    }
-
-    fn fit(x: &X, y: &Y, parameters: ExtraTreesRegressorParameters) -> Result<Self, Failed> {
-        ExtraTreesRegressor::fit(x, y, parameters)
-    }
-}
-
-impl<TX: Number + FloatNumber + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
-    Predictor<X, Y> for ExtraTreesRegressor<TX, TY, X, Y>
-{
-    fn predict(&self, x: &X) -> Result<Y, Failed> {
-        self.predict(x)
-    }
-}
-
-impl<TX: Number + FloatNumber + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
-    ExtraTreesRegressor<TX, TY, X, Y>
-{
-    /// Build a forest of trees from the training set.
-    /// * `x` - _NxM_ matrix with _N_ observations and _M_ features in each observation.
-    /// * `y` - the target class values
-    pub fn fit(
-        x: &X,
-        y: &Y,
-        parameters: ExtraTreesRegressorParameters,
-    ) -> Result<ExtraTreesRegressor<TX, TY, X, Y>, Failed> {
-        let regressor_params = BaseForestRegressorParameters {
-            max_depth: parameters.max_depth,
-            min_samples_leaf: parameters.min_samples_leaf,
-            min_samples_split: parameters.min_samples_split,
-            n_trees: parameters.n_trees,
-            m: parameters.m,
-            keep_samples: parameters.keep_samples,
-            seed: parameters.seed,
-            bootstrap: false,
-            splitter: Splitter::Random,
-        };
-        let forest_regressor = BaseForestRegressor::fit(x, y, regressor_params)?;
-
-        Ok(ExtraTreesRegressor {
-            forest_regressor: Some(forest_regressor),
-        })
-    }
-
-    /// Predict class for `x`
-    /// * `x` - _KxM_ data where _K_ is number of observations and _M_ is number of features.
-    pub fn predict(&self, x: &X) -> Result<Y, Failed> {
-        let forest_regressor = self.forest_regressor.as_ref().unwrap();
-        forest_regressor.predict(x)
-    }
-
-    /// Predict OOB classes for `x`. `x` is expected to be equal to the dataset used in training.
-    pub fn predict_oob(&self, x: &X) -> Result<Y, Failed> {
-        let forest_regressor = self.forest_regressor.as_ref().unwrap();
-        forest_regressor.predict_oob(x)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::linalg::basic::matrix::DenseMatrix;
-    use crate::metrics::mean_squared_error;
-
-    #[test]
-    fn test_extra_trees_regressor_fit_predict() {
-        // Use a simpler, more predictable dataset for unit testing.
-        let x = DenseMatrix::from_2d_array(&[
-            &[1., 2.],
-            &[3., 4.],
-            &[5., 6.],
-            &[7., 8.],
-            &[9., 10.],
-            &[11., 12.],
-            &[13., 14.],
-            &[15., 16.],
-        ])
-        .unwrap();
-        let y = vec![1., 2., 3., 4., 5., 6., 7., 8.];
-
-        let parameters = ExtraTreesRegressorParameters::default()
-            .with_n_trees(100)
-            .with_seed(42);
-
-        let regressor = ExtraTreesRegressor::fit(&x, &y, parameters).unwrap();
-        let y_hat = regressor.predict(&x).unwrap();
-
-        assert_eq!(y_hat.len(), y.len());
-        // A basic check to ensure the model is learning something.
-        // The error should be significantly less than the variance of y.
-        let mse = mean_squared_error(&y, &y_hat);
-        // With this simple dataset, the error should be very low.
-        assert!(mse < 1.0);
-    }
-
-    #[test]
-    fn test_fit_predict_higher_dims() {
-        // Dataset with 10 features, but y is only dependent on the 3rd feature (index 2).
-        let x = DenseMatrix::from_2d_array(&[
-            // The 3rd column is the important one. The rest are noise.
-            &[0., 0., 10., 5., 8., 1., 4., 9., 2., 7.],
-            &[0., 0., 20., 1., 2., 3., 4., 5., 6., 7.],
-            &[0., 0., 30., 7., 6., 5., 4., 3., 2., 1.],
-            &[0., 0., 40., 9., 2., 4., 6., 8., 1., 3.],
-            &[0., 0., 55., 3., 1., 8., 6., 4., 2., 9.],
-            &[0., 0., 65., 2., 4., 7., 5., 3., 1., 8.],
-        ])
-        .unwrap();
-        let y = vec![10., 20., 30., 40., 55., 65.];
-
-        let parameters = ExtraTreesRegressorParameters::default()
-            .with_n_trees(100)
-            .with_seed(42);
-
-        let regressor = ExtraTreesRegressor::fit(&x, &y, parameters).unwrap();
-        let y_hat = regressor.predict(&x).unwrap();
-
-        assert_eq!(y_hat.len(), y.len());
-
-        let mse = mean_squared_error(&y, &y_hat);
-
-        // The model should be able to learn this simple relationship perfectly,
-        // ignoring the noise features. The MSE should be very low.
-        assert!(mse < 1.0);
-    }
-
-    #[test]
-    fn test_reproducibility() {
-        let x = DenseMatrix::from_2d_array(&[
-            &[1., 2.],
-            &[3., 4.],
-            &[5., 6.],
-            &[7., 8.],
-            &[9., 10.],
-            &[11., 12.],
-        ])
-        .unwrap();
-        let y = vec![1.0, 2.0, 3.0, 4.0, 5.0, 6.0];
-
-        let params = ExtraTreesRegressorParameters::default().with_seed(42);
-
-        let regressor1 = ExtraTreesRegressor::fit(&x, &y, params.clone()).unwrap();
-        let y_hat1 = regressor1.predict(&x).unwrap();
-
-        let regressor2 = ExtraTreesRegressor::fit(&x, &y, params.clone()).unwrap();
-        let y_hat2 = regressor2.predict(&x).unwrap();
-
-        assert_eq!(y_hat1, y_hat2);
-    }
-}

src/ensemble/mod.rs

@@ -16,8 +16,6 @@
 //!
 //! * ["An Introduction to Statistical Learning", James G., Witten D., Hastie T., Tibshirani R., 8.2 Bagging, Random Forests, Boosting](http://faculty.marshall.usc.edu/gareth-james/ISL/)
 
-mod base_forest_regressor;
-pub mod extra_trees_regressor;
 /// Random forest classifier
 pub mod random_forest_classifier;
 /// Random forest regressor

src/ensemble/random_forest_regressor.rs

@@ -43,6 +43,7 @@
 //! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
 //! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
 
+use rand::Rng;
 use std::default::Default;
 use std::fmt::Debug;
 
@@ -50,12 +51,15 @@ use std::fmt::Debug;
 use serde::{Deserialize, Serialize};
 
 use crate::api::{Predictor, SupervisedEstimator};
-use crate::ensemble::base_forest_regressor::{BaseForestRegressor, BaseForestRegressorParameters};
-use crate::error::Failed;
+use crate::error::{Failed, FailedError};
 use crate::linalg::basic::arrays::{Array1, Array2};
 use crate::numbers::basenum::Number;
 use crate::numbers::floatnum::FloatNumber;
-use crate::tree::base_tree_regressor::Splitter;
+
+use crate::rand_custom::get_rng_impl;
+use crate::tree::decision_tree_regressor::{
+    DecisionTreeRegressor, DecisionTreeRegressorParameters,
+};
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug, Clone)]
@@ -94,7 +98,8 @@ pub struct RandomForestRegressor<
     X: Array2<TX>,
     Y: Array1<TY>,
 > {
-    forest_regressor: Option<BaseForestRegressor<TX, TY, X, Y>>,
+    trees: Option<Vec<DecisionTreeRegressor<TX, TY, X, Y>>>,
+    samples: Option<Vec<Vec<bool>>>,
 }
 
 impl RandomForestRegressorParameters {
@@ -154,7 +159,14 @@ impl<TX: Number + FloatNumber + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1
     for RandomForestRegressor<TX, TY, X, Y>
 {
     fn eq(&self, other: &Self) -> bool {
-        self.forest_regressor == other.forest_regressor
+        if self.trees.as_ref().unwrap().len() != other.trees.as_ref().unwrap().len() {
+            false
+        } else {
+            self.trees
+                .iter()
+                .zip(other.trees.iter())
+                .all(|(a, b)| a == b)
+        }
     }
 }
 
@@ -164,7 +176,8 @@ impl<TX: Number + FloatNumber + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1
 {
     fn new() -> Self {
         Self {
-            forest_regressor: Option::None,
+            trees: Option::None,
+            samples: Option::None,
         }
     }
 
@@ -384,35 +397,128 @@ impl<TX: Number + FloatNumber + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1
         y: &Y,
         parameters: RandomForestRegressorParameters,
     ) -> Result<RandomForestRegressor<TX, TY, X, Y>, Failed> {
-        let regressor_params = BaseForestRegressorParameters {
-            max_depth: parameters.max_depth,
-            min_samples_leaf: parameters.min_samples_leaf,
-            min_samples_split: parameters.min_samples_split,
-            n_trees: parameters.n_trees,
-            m: parameters.m,
-            keep_samples: parameters.keep_samples,
-            seed: parameters.seed,
-            bootstrap: true,
-            splitter: Splitter::Best,
-        };
-        let forest_regressor = BaseForestRegressor::fit(x, y, regressor_params)?;
+        let (n_rows, num_attributes) = x.shape();
+
+        if n_rows != y.shape() {
+            return Err(Failed::fit("Number of rows in X should = len(y)"));
+        }
+
+        let mtry = parameters
+            .m
+            .unwrap_or((num_attributes as f64).sqrt().floor() as usize);
+
+        let mut rng = get_rng_impl(Some(parameters.seed));
+        let mut trees: Vec<DecisionTreeRegressor<TX, TY, X, Y>> = Vec::new();
+
+        let mut maybe_all_samples: Option<Vec<Vec<bool>>> = Option::None;
+        if parameters.keep_samples {
+            // TODO: use with_capacity here
+            maybe_all_samples = Some(Vec::new());
+        }
+
+        for _ in 0..parameters.n_trees {
+            let samples: Vec<usize> =
+                RandomForestRegressor::<TX, TY, X, Y>::sample_with_replacement(n_rows, &mut rng);
+
+            // keep samples is flag is on
+            if let Some(ref mut all_samples) = maybe_all_samples {
+                all_samples.push(samples.iter().map(|x| *x != 0).collect())
+            }
+
+            let params = DecisionTreeRegressorParameters {
+                max_depth: parameters.max_depth,
+                min_samples_leaf: parameters.min_samples_leaf,
+                min_samples_split: parameters.min_samples_split,
+                seed: Some(parameters.seed),
+            };
+            let tree = DecisionTreeRegressor::fit_weak_learner(x, y, samples, mtry, params)?;
+            trees.push(tree);
+        }
 
         Ok(RandomForestRegressor {
-            forest_regressor: Some(forest_regressor),
+            trees: Some(trees),
+            samples: maybe_all_samples,
         })
     }
 
     /// Predict class for `x`
     /// * `x` - _KxM_ data where _K_ is number of observations and _M_ is number of features.
     pub fn predict(&self, x: &X) -> Result<Y, Failed> {
-        let forest_regressor = self.forest_regressor.as_ref().unwrap();
-        forest_regressor.predict(x)
+        let mut result = Y::zeros(x.shape().0);
+
+        let (n, _) = x.shape();
+
+        for i in 0..n {
+            result.set(i, self.predict_for_row(x, i));
+        }
+
+        Ok(result)
+    }
+
+    fn predict_for_row(&self, x: &X, row: usize) -> TY {
+        let n_trees = self.trees.as_ref().unwrap().len();
+
+        let mut result = TY::zero();
+
+        for tree in self.trees.as_ref().unwrap().iter() {
+            result += tree.predict_for_row(x, row);
+        }
+
+        result / TY::from_usize(n_trees).unwrap()
     }
 
     /// Predict OOB classes for `x`. `x` is expected to be equal to the dataset used in training.
     pub fn predict_oob(&self, x: &X) -> Result<Y, Failed> {
-        let forest_regressor = self.forest_regressor.as_ref().unwrap();
-        forest_regressor.predict_oob(x)
+        let (n, _) = x.shape();
+        if self.samples.is_none() {
+            Err(Failed::because(
+                FailedError::PredictFailed,
+                "Need samples=true for OOB predictions.",
+            ))
+        } else if self.samples.as_ref().unwrap()[0].len() != n {
+            Err(Failed::because(
+                FailedError::PredictFailed,
+                "Prediction matrix must match matrix used in training for OOB predictions.",
+            ))
+        } else {
+            let mut result = Y::zeros(n);
+
+            for i in 0..n {
+                result.set(i, self.predict_for_row_oob(x, i));
+            }
+
+            Ok(result)
+        }
+    }
+
+    fn predict_for_row_oob(&self, x: &X, row: usize) -> TY {
+        let mut n_trees = 0;
+        let mut result = TY::zero();
+
+        for (tree, samples) in self
+            .trees
+            .as_ref()
+            .unwrap()
+            .iter()
+            .zip(self.samples.as_ref().unwrap())
+        {
+            if !samples[row] {
+                result += tree.predict_for_row(x, row);
+                n_trees += 1;
+            }
+        }
+
+        // TODO: What to do if there are no oob trees?
+        result / TY::from(n_trees).unwrap()
+    }
+
+    fn sample_with_replacement(nrows: usize, rng: &mut impl Rng) -> Vec<usize> {
+        let mut samples = vec![0; nrows];
+        for _ in 0..nrows {
+            let xi = rng.gen_range(0..nrows);
+            samples[xi] += 1;
+        }
+        samples
     }
 }
 

src/lib.rs

@@ -130,6 +130,5 @@ pub mod readers;
 pub mod svm;
 /// Supervised tree-based learning methods
 pub mod tree;
-pub mod xgboost;
 
 pub(crate) mod rand_custom;

src/linalg/basic/arrays.rs

@@ -619,7 +619,7 @@ pub trait MutArrayView1<T: Debug + Display + Copy + Sized>:
         T: Number + PartialOrd,
     {
         let stack_size = 64;
-        let mut jstack: i32 = -1;
+        let mut jstack = -1;
         let mut l = 0;
         let mut istack = vec![0; stack_size];
         let mut ir = self.shape() - 1;
@@ -2190,29 +2190,4 @@ mod tests {
 
         assert_eq!(result, [65, 581, 30])
     }
-
-    #[test]
-    fn test_argsort_mut_exact_boundary() {
-        // Test index == length - 1 case
-        let boundary =
-            DenseMatrix::from_2d_array(&[&[1.0, 2.0, 3.0, f64::MAX], &[3.0, f64::MAX, 0.0, 2.0]])
-                .unwrap();
-        let mut view0: Vec<f64> = boundary.get_col(0).iterator(0).copied().collect();
-        let indices = view0.argsort_mut();
-        assert_eq!(indices.last(), Some(&1));
-        assert_eq!(indices.first(), Some(&0));
-
-        let mut view1: Vec<f64> = boundary.get_col(3).iterator(0).copied().collect();
-        let indices = view1.argsort_mut();
-        assert_eq!(indices.last(), Some(&0));
-        assert_eq!(indices.first(), Some(&1));
-    }
-
-    #[test]
-    fn test_argsort_mut_filled_array() {
-        let matrix = DenseMatrix::<f64>::rand(1000, 1000);
-        let mut view: Vec<f64> = matrix.get_col(0).iterator(0).copied().collect();
-        let sorted = view.argsort_mut();
-        assert_eq!(sorted.len(), 1000);
-    }
 }

src/linalg/basic/matrix.rs

@@ -385,7 +385,7 @@ impl<T: Debug + Display + Copy + Sized> Array<T, (usize, usize)> for DenseMatrix
     }
 
     fn is_empty(&self) -> bool {
-        self.ncols < 1 || self.nrows < 1
+        self.ncols > 0 && self.nrows > 0
     }
 
     fn iterator<'b>(&'b self, axis: u8) -> Box<dyn Iterator<Item = &'b T> + 'b> {
@@ -663,7 +663,6 @@ mod tests {
     #[test]
     fn test_instantiate_err_view3() {
         let x = DenseMatrix::from_2d_array(&[&[1., 2., 3.], &[4., 5., 6.], &[7., 8., 9.]]).unwrap();
-        #[allow(clippy::reversed_empty_ranges)]
         let v = DenseMatrixView::new(&x, 0..3, 4..3);
         assert!(v.is_err());
     }

src/linear/elastic_net.rs

@@ -345,7 +345,6 @@ impl<TX: FloatNumber + RealNumber, TY: Number, X: Array2<TX>, Y: Array1<TY>>
                 l1_reg * gamma,
                 parameters.max_iter,
                 TX::from_f64(parameters.tol).unwrap(),
-                true,
             )?;
 
             for i in 0..p {
@@ -372,7 +371,6 @@ impl<TX: FloatNumber + RealNumber, TY: Number, X: Array2<TX>, Y: Array1<TY>>
                 l1_reg * gamma,
                 parameters.max_iter,
                 TX::from_f64(parameters.tol).unwrap(),
-                true,
             )?;
 
             for i in 0..p {

src/linear/lasso.rs

@@ -9,7 +9,7 @@
 //!
 //! Lasso coefficient estimates solve the problem:
 //!
-//! \\[\underset{\beta}{minimize} \space \space \frac{1}{n} \sum_{i=1}^n \left( y_i - \beta_0 - \sum_{j=1}^p \beta_jx_{ij} \right)^2 + \alpha \sum_{j=1}^p \lVert \beta_j \rVert_1\\]
+//! \\[\underset{\beta}{minimize} \space \space \sum_{i=1}^n \left( y_i - \beta_0 - \sum_{j=1}^p \beta_jx_{ij} \right)^2 + \alpha \sum_{j=1}^p \lVert \beta_j \rVert_1\\]
 //!
 //! This problem is solved with an interior-point method that is comparable to coordinate descent in solving large problems with modest accuracy,
 //! but is able to solve them with high accuracy with relatively small additional computational cost.
@@ -53,9 +53,6 @@ pub struct LassoParameters {
     #[cfg_attr(feature = "serde", serde(default))]
     /// The maximum number of iterations
     pub max_iter: usize,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// If false, force the intercept parameter (beta_0) to be zero.
-    pub fit_intercept: bool,
 }
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
@@ -89,12 +86,6 @@ impl LassoParameters {
         self.max_iter = max_iter;
         self
     }
-
-    /// If false, force the intercept parameter (beta_0) to be zero.
-    pub fn with_fit_intercept(mut self, fit_intercept: bool) -> Self {
-        self.fit_intercept = fit_intercept;
-        self
-    }
 }
 
 impl Default for LassoParameters {
@@ -104,7 +95,6 @@ impl Default for LassoParameters {
             normalize: true,
             tol: 1e-4,
             max_iter: 1000,
-            fit_intercept: true,
         }
     }
 }
@@ -128,8 +118,8 @@ impl<TX: FloatNumber + RealNumber, TY: Number, X: Array2<TX>, Y: Array1<TY>>
 {
     fn new() -> Self {
         Self {
-            coefficients: None,
-            intercept: None,
+            coefficients: Option::None,
+            intercept: Option::None,
             _phantom_ty: PhantomData,
             _phantom_y: PhantomData,
         }
@@ -165,9 +155,6 @@ pub struct LassoSearchParameters {
     #[cfg_attr(feature = "serde", serde(default))]
     /// The maximum number of iterations
     pub max_iter: Vec<usize>,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// If false, force the intercept parameter (beta_0) to be zero.
-    pub fit_intercept: Vec<bool>,
 }
 
 /// Lasso grid search iterator
@@ -177,7 +164,6 @@ pub struct LassoSearchParametersIterator {
     current_normalize: usize,
     current_tol: usize,
     current_max_iter: usize,
-    current_fit_intercept: usize,
 }
 
 impl IntoIterator for LassoSearchParameters {
@@ -191,7 +177,6 @@ impl IntoIterator for LassoSearchParameters {
             current_normalize: 0,
             current_tol: 0,
             current_max_iter: 0,
-            current_fit_intercept: 0,
         }
     }
 }
@@ -204,7 +189,6 @@ impl Iterator for LassoSearchParametersIterator {
             && self.current_normalize == self.lasso_search_parameters.normalize.len()
             && self.current_tol == self.lasso_search_parameters.tol.len()
             && self.current_max_iter == self.lasso_search_parameters.max_iter.len()
-            && self.current_fit_intercept == self.lasso_search_parameters.fit_intercept.len()
         {
             return None;
         }
@@ -214,7 +198,6 @@ impl Iterator for LassoSearchParametersIterator {
             normalize: self.lasso_search_parameters.normalize[self.current_normalize],
             tol: self.lasso_search_parameters.tol[self.current_tol],
             max_iter: self.lasso_search_parameters.max_iter[self.current_max_iter],
-            fit_intercept: self.lasso_search_parameters.fit_intercept[self.current_fit_intercept],
         };
 
         if self.current_alpha + 1 < self.lasso_search_parameters.alpha.len() {
@@ -231,19 +214,11 @@ impl Iterator for LassoSearchParametersIterator {
             self.current_normalize = 0;
             self.current_tol = 0;
             self.current_max_iter += 1;
-        } else if self.current_fit_intercept + 1 < self.lasso_search_parameters.fit_intercept.len()
-        {
-            self.current_alpha = 0;
-            self.current_normalize = 0;
-            self.current_tol = 0;
-            self.current_max_iter = 0;
-            self.current_fit_intercept += 1;
         } else {
             self.current_alpha += 1;
             self.current_normalize += 1;
             self.current_tol += 1;
             self.current_max_iter += 1;
-            self.current_fit_intercept += 1;
         }
 
         Some(next)
@@ -259,7 +234,6 @@ impl Default for LassoSearchParameters {
             normalize: vec![default_params.normalize],
             tol: vec![default_params.tol],
             max_iter: vec![default_params.max_iter],
-            fit_intercept: vec![default_params.fit_intercept],
         }
     }
 }
@@ -272,7 +246,7 @@ impl<TX: FloatNumber + RealNumber, TY: Number, X: Array2<TX>, Y: Array1<TY>> Las
     pub fn fit(x: &X, y: &Y, parameters: LassoParameters) -> Result<Lasso<TX, TY, X, Y>, Failed> {
         let (n, p) = x.shape();
 
-        if n < p {
+        if n <= p {
             return Err(Failed::fit(
                 "Number of rows in X should be >= number of columns in X",
             ));
@@ -309,23 +283,19 @@ impl<TX: FloatNumber + RealNumber, TY: Number, X: Array2<TX>, Y: Array1<TY>> Las
                 l1_reg,
                 parameters.max_iter,
                 TX::from_f64(parameters.tol).unwrap(),
-                parameters.fit_intercept,
             )?;
 
             for (j, col_std_j) in col_std.iter().enumerate().take(p) {
                 w[j] /= *col_std_j;
             }
 
-            let b = if parameters.fit_intercept {
-                let mut xw_mean = TX::zero();
-                for (i, col_mean_i) in col_mean.iter().enumerate().take(p) {
-                    xw_mean += w[i] * *col_mean_i;
-                }
+            let mut b = TX::zero();
 
-                Some(TX::from_f64(y.mean_by()).unwrap() - xw_mean)
-            } else {
-                None
-            };
+            for (i, col_mean_i) in col_mean.iter().enumerate().take(p) {
+                b += w[i] * *col_mean_i;
+            }
+
+            b = TX::from_f64(y.mean_by()).unwrap() - b;
             (X::from_column(&w), b)
         } else {
             let mut optimizer = InteriorPointOptimizer::new(x, p);
@@ -336,21 +306,13 @@ impl<TX: FloatNumber + RealNumber, TY: Number, X: Array2<TX>, Y: Array1<TY>> Las
                 l1_reg,
                 parameters.max_iter,
                 TX::from_f64(parameters.tol).unwrap(),
-                parameters.fit_intercept,
             )?;
 
-            (
-                X::from_column(&w),
-                if parameters.fit_intercept {
-                    Some(TX::from_f64(y.mean_by()).unwrap())
-                } else {
-                    None
-                },
-            )
+            (X::from_column(&w), TX::from_f64(y.mean_by()).unwrap())
         };
 
         Ok(Lasso {
-            intercept: b,
+            intercept: Some(b),
             coefficients: Some(w),
             _phantom_ty: PhantomData,
             _phantom_y: PhantomData,
@@ -407,7 +369,6 @@ impl<TX: FloatNumber + RealNumber, TY: Number, X: Array2<TX>, Y: Array1<TY>> Las
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::linalg::basic::arrays::Array;
     use crate::linalg::basic::matrix::DenseMatrix;
     use crate::metrics::mean_absolute_error;
 
@@ -416,28 +377,30 @@ mod tests {
         let parameters = LassoSearchParameters {
             alpha: vec![0., 1.],
             max_iter: vec![10, 100],
-            fit_intercept: vec![false, true],
             ..Default::default()
         };
-
-        let mut iter = parameters.clone().into_iter();
-        for current_fit_intercept in 0..parameters.fit_intercept.len() {
-            for current_max_iter in 0..parameters.max_iter.len() {
-                for current_alpha in 0..parameters.alpha.len() {
-                    let next = iter.next().unwrap();
-                    assert_eq!(next.alpha, parameters.alpha[current_alpha]);
-                    assert_eq!(next.max_iter, parameters.max_iter[current_max_iter]);
-                    assert_eq!(
-                        next.fit_intercept,
-                        parameters.fit_intercept[current_fit_intercept]
-                    );
-                }
-            }
-        }
+        let mut iter = parameters.into_iter();
+        let next = iter.next().unwrap();
+        assert_eq!(next.alpha, 0.);
+        assert_eq!(next.max_iter, 10);
+        let next = iter.next().unwrap();
+        assert_eq!(next.alpha, 1.);
+        assert_eq!(next.max_iter, 10);
+        let next = iter.next().unwrap();
+        assert_eq!(next.alpha, 0.);
+        assert_eq!(next.max_iter, 100);
+        let next = iter.next().unwrap();
+        assert_eq!(next.alpha, 1.);
+        assert_eq!(next.max_iter, 100);
         assert!(iter.next().is_none());
     }
 
-    fn get_example_x_y() -> (DenseMatrix<f64>, Vec<f64>) {
+    #[cfg_attr(
+        all(target_arch = "wasm32", not(target_os = "wasi")),
+        wasm_bindgen_test::wasm_bindgen_test
+    )]
+    #[test]
+    fn lasso_fit_predict() {
         let x = DenseMatrix::from_2d_array(&[
             &[234.289, 235.6, 159.0, 107.608, 1947., 60.323],
             &[259.426, 232.5, 145.6, 108.632, 1948., 61.122],
@@ -463,17 +426,6 @@ mod tests {
             114.2, 115.7, 116.9,
         ];
 
-        (x, y)
-    }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn lasso_fit_predict() {
-        let (x, y) = get_example_x_y();
-
         let y_hat = Lasso::fit(&x, &y, Default::default())
             .and_then(|lr| lr.predict(&x))
             .unwrap();
@@ -488,7 +440,6 @@ mod tests {
                 normalize: false,
                 tol: 1e-4,
                 max_iter: 1000,
-                fit_intercept: true,
             },
         )
         .and_then(|lr| lr.predict(&x))
@@ -497,76 +448,35 @@ mod tests {
         assert!(mean_absolute_error(&y_hat, &y) < 2.0);
     }
 
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn test_full_rank_x() {
-        // x: randn(3,3) * 10, demean, then round to 2 decimal points
-        // y = x @ [10.0, 0.2, -3.0], round to 2 decimal points
-        let param = LassoParameters::default()
-            .with_normalize(false)
-            .with_alpha(200.0);
-        let x = DenseMatrix::from_2d_array(&[
-            &[-8.9, -2.24, 8.89],
-            &[-4.02, 8.89, 12.33],
-            &[12.92, -6.65, -21.22],
-        ])
-        .unwrap();
-
-        let y = vec![-116.12, -75.41, 191.53];
-        let w = Lasso::fit(&x, &y, param)
-            .unwrap()
-            .coefficients()
-            .iterator(0)
-            .copied()
-            .collect();
-
-        let expected_w = vec![5.20289531, 0., -5.32823882]; // by coordinate descent
-        assert!(mean_absolute_error(&w, &expected_w) < 1e-3); // actual mean_absolute_error is about 2e-4
-    }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn test_fit_intercept() {
-        let (x, y) = get_example_x_y();
-        let fit_result = Lasso::fit(
-            &x,
-            &y,
-            LassoParameters {
-                alpha: 0.1,
-                normalize: false,
-                tol: 1e-8,
-                max_iter: 1000,
-                fit_intercept: false,
-            },
-        )
-        .unwrap();
-
-        let w = fit_result.coefficients().iterator(0).copied().collect();
-        // by sklearn LassoLars. coordinate descent doesn't converge well
-        let expected_w = vec![
-            0.18335684,
-            0.02106526,
-            0.00703214,
-            -1.35952542,
-            0.09295222,
-            0.,
-        ];
-        assert!(mean_absolute_error(&w, &expected_w) < 1e-6);
-        assert_eq!(fit_result.intercept, None);
-    }
-
     // TODO: serialization for the new DenseMatrix needs to be implemented
     // #[cfg_attr(all(target_arch = "wasm32", not(target_os = "wasi")), wasm_bindgen_test::wasm_bindgen_test)]
     // #[test]
     // #[cfg(feature = "serde")]
     // fn serde() {
-    //     let (x, y) = get_lasso_sample_x_y();
+    //     let x = DenseMatrix::from_2d_array(&[
+    //         &[234.289, 235.6, 159.0, 107.608, 1947., 60.323],
+    //         &[259.426, 232.5, 145.6, 108.632, 1948., 61.122],
+    //         &[258.054, 368.2, 161.6, 109.773, 1949., 60.171],
+    //         &[284.599, 335.1, 165.0, 110.929, 1950., 61.187],
+    //         &[328.975, 209.9, 309.9, 112.075, 1951., 63.221],
+    //         &[346.999, 193.2, 359.4, 113.270, 1952., 63.639],
+    //         &[365.385, 187.0, 354.7, 115.094, 1953., 64.989],
+    //         &[363.112, 357.8, 335.0, 116.219, 1954., 63.761],
+    //         &[397.469, 290.4, 304.8, 117.388, 1955., 66.019],
+    //         &[419.180, 282.2, 285.7, 118.734, 1956., 67.857],
+    //         &[442.769, 293.6, 279.8, 120.445, 1957., 68.169],
+    //         &[444.546, 468.1, 263.7, 121.950, 1958., 66.513],
+    //         &[482.704, 381.3, 255.2, 123.366, 1959., 68.655],
+    //         &[502.601, 393.1, 251.4, 125.368, 1960., 69.564],
+    //         &[518.173, 480.6, 257.2, 127.852, 1961., 69.331],
+    //         &[554.894, 400.7, 282.7, 130.081, 1962., 70.551],
+    //     ]);
+
+    //     let y = vec![
+    //         83.0, 88.5, 88.2, 89.5, 96.2, 98.1, 99.0, 100.0, 101.2, 104.6, 108.4, 110.8, 112.6,
+    //         114.2, 115.7, 116.9,
+    //     ];
+
     //     let lr = Lasso::fit(&x, &y, Default::default()).unwrap();
 
     //     let deserialized_lr: Lasso<f64, f64, DenseMatrix<f64>, Vec<f64>> =

src/linear/lasso_optimizer.rs

@@ -45,7 +45,6 @@ impl<T: FloatNumber, X: Array2<T>> InteriorPointOptimizer<T, X> {
         lambda: T,
         max_iter: usize,
         tol: T,
-        fit_intercept: bool,
     ) -> Result<Vec<T>, Failed> {
         let (n, p) = x.shape();
         let p_f64 = T::from_usize(p).unwrap();
@@ -53,7 +52,6 @@ impl<T: FloatNumber, X: Array2<T>> InteriorPointOptimizer<T, X> {
         let lambda = lambda.max(T::epsilon());
 
         //parameters
-        let max_ls_iter = 100;
         let pcgmaxi = 5000;
         let min_pcgtol = T::from_f64(0.1).unwrap();
         let eta = T::from_f64(1E-3).unwrap();
@@ -63,12 +61,9 @@ impl<T: FloatNumber, X: Array2<T>> InteriorPointOptimizer<T, X> {
         let mu = T::two();
 
         // let y = M::from_row_vector(y.sub_scalar(y.mean_by())).transpose();
-        let y = if fit_intercept {
-            y.sub_scalar(T::from_f64(y.mean_by()).unwrap())
-        } else {
-            y.to_owned()
-        };
+        let y = y.sub_scalar(T::from_f64(y.mean_by()).unwrap());
 
+        let mut max_ls_iter = 100;
         let mut pitr = 0;
         let mut w = Vec::zeros(p);
         let mut neww = w.clone();
@@ -170,7 +165,7 @@ impl<T: FloatNumber, X: Array2<T>> InteriorPointOptimizer<T, X> {
             s = T::one();
             let gdx = grad.dot(&dxu);
 
-            let mut lsiter = 0;
+            let lsiter = 0;
             while lsiter < max_ls_iter {
                 for i in 0..p {
                     neww[i] = w[i] + s * dx[i];
@@ -195,7 +190,7 @@ impl<T: FloatNumber, X: Array2<T>> InteriorPointOptimizer<T, X> {
                     }
                 }
                 s = beta * s;
-                lsiter += 1;
+                max_ls_iter += 1;
             }
 
             if lsiter == max_ls_iter {

src/metrics/distance/cosine.rs

@@ -1,219 +0,0 @@
-//! # Cosine Distance Metric
-//!
-//! The cosine distance between two points \\( x \\) and \\( y \\) in n-space is defined as:
-//!
-//! \\[ d(x, y) = 1 - \frac{x \cdot y}{||x|| ||y||} \\]
-//!
-//! where \\( x \cdot y \\) is the dot product of the vectors, and \\( ||x|| \\) and \\( ||y|| \\)
-//! are their respective magnitudes (Euclidean norms).
-//!
-//! Cosine distance measures the angular dissimilarity between vectors, ranging from 0 to 2.
-//! A value of 0 indicates identical direction (parallel vectors), while larger values indicate
-//! greater angular separation.
-//!
-//! Example:
-//!
-//! ```
-//! use smartcore::metrics::distance::Distance;
-//! use smartcore::metrics::distance::cosine::Cosine;
-//!
-//! let x = vec![1., 1.];
-//! let y = vec![2., 2.];
-//!
-//! let cosine_dist: f64 = Cosine::new().distance(&x, &y);
-//! ```
-//!
-//! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
-//! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-use std::marker::PhantomData;
-
-use crate::linalg::basic::arrays::ArrayView1;
-use crate::numbers::basenum::Number;
-
-use super::Distance;
-
-/// Cosine distance is a measure of the angular dissimilarity between two non-zero vectors in n-space.
-/// It is defined as 1 minus the cosine similarity of the vectors.
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone)]
-pub struct Cosine<T> {
-    _t: PhantomData<T>,
-}
-
-impl<T: Number> Default for Cosine<T> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl<T: Number> Cosine<T> {
-    /// Instantiate the initial structure
-    pub fn new() -> Cosine<T> {
-        Cosine { _t: PhantomData }
-    }
-
-    /// Calculate the dot product of two vectors using smartcore's ArrayView1 trait
-    #[inline]
-    pub(crate) fn dot_product<A: ArrayView1<T>>(x: &A, y: &A) -> f64 {
-        if x.shape() != y.shape() {
-            panic!("Input vector sizes are different.");
-        }
-
-        // Use the built-in dot product method from ArrayView1 trait
-        x.dot(y).to_f64().unwrap()
-    }
-
-    /// Calculate the squared magnitude (norm squared) of a vector
-    #[inline]
-    #[allow(dead_code)]
-    pub(crate) fn squared_magnitude<A: ArrayView1<T>>(x: &A) -> f64 {
-        x.iterator(0)
-            .map(|&a| {
-                let val = a.to_f64().unwrap();
-                val * val
-            })
-            .sum()
-    }
-
-    /// Calculate the magnitude (Euclidean norm) of a vector using smartcore's norm2 method
-    #[inline]
-    pub(crate) fn magnitude<A: ArrayView1<T>>(x: &A) -> f64 {
-        // Use the built-in norm2 method from ArrayView1 trait
-        x.norm2()
-    }
-
-    /// Calculate cosine similarity between two vectors
-    #[inline]
-    pub(crate) fn cosine_similarity<A: ArrayView1<T>>(x: &A, y: &A) -> f64 {
-        let dot_product = Self::dot_product(x, y);
-        let magnitude_x = Self::magnitude(x);
-        let magnitude_y = Self::magnitude(y);
-
-        if magnitude_x == 0.0 || magnitude_y == 0.0 {
-            return f64::MIN;
-        }
-
-        dot_product / (magnitude_x * magnitude_y)
-    }
-}
-
-impl<T: Number, A: ArrayView1<T>> Distance<A> for Cosine<T> {
-    fn distance(&self, x: &A, y: &A) -> f64 {
-        let similarity = Cosine::cosine_similarity(x, y);
-        1.0 - similarity
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn cosine_distance_identical_vectors() {
-        let a = vec![1, 2, 3];
-        let b = vec![1, 2, 3];
-
-        let dist: f64 = Cosine::new().distance(&a, &b);
-
-        assert!((dist - 0.0).abs() < 1e-8);
-    }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn cosine_distance_orthogonal_vectors() {
-        let a = vec![1, 0];
-        let b = vec![0, 1];
-
-        let dist: f64 = Cosine::new().distance(&a, &b);
-
-        assert!((dist - 1.0).abs() < 1e-8);
-    }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn cosine_distance_opposite_vectors() {
-        let a = vec![1, 2, 3];
-        let b = vec![-1, -2, -3];
-
-        let dist: f64 = Cosine::new().distance(&a, &b);
-
-        assert!((dist - 2.0).abs() < 1e-8);
-    }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn cosine_distance_general_case() {
-        let a = vec![1.0, 2.0, 3.0];
-        let b = vec![2.0, 1.0, 3.0];
-
-        let dist: f64 = Cosine::new().distance(&a, &b);
-
-        // Expected cosine similarity: (1*2 + 2*1 + 3*3) / (sqrt(1+4+9) * sqrt(4+1+9))
-        // = (2 + 2 + 9) / (sqrt(14) * sqrt(14)) = 13/14 ≈ 0.9286
-        // So cosine distance = 1 - 13/14 = 1/14 ≈ 0.0714
-        let expected_dist = 1.0 - (13.0 / 14.0);
-        assert!((dist - expected_dist).abs() < 1e-8);
-    }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    #[should_panic(expected = "Input vector sizes are different.")]
-    fn cosine_distance_different_sizes() {
-        let a = vec![1, 2];
-        let b = vec![1, 2, 3];
-
-        let _dist: f64 = Cosine::new().distance(&a, &b);
-    }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn cosine_distance_zero_vector() {
-        let a = vec![0, 0, 0];
-        let b = vec![1, 2, 3];
-
-        let dist: f64 = Cosine::new().distance(&a, &b);
-        assert!(dist > 1e300)
-    }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn cosine_distance_float_precision() {
-        let a = vec![1.0f32, 2.0, 3.0];
-        let b = vec![4.0f32, 5.0, 6.0];
-
-        let dist: f64 = Cosine::new().distance(&a, &b);
-
-        // Calculate expected value manually
-        let dot_product = 1.0 * 4.0 + 2.0 * 5.0 + 3.0 * 6.0; // = 32
-        let mag_a = (1.0 * 1.0 + 2.0 * 2.0 + 3.0 * 3.0_f64).sqrt(); // = sqrt(14)
-        let mag_b = (4.0 * 4.0 + 5.0 * 5.0 + 6.0 * 6.0_f64).sqrt(); // = sqrt(77)
-        let expected_similarity = dot_product / (mag_a * mag_b);
-        let expected_distance = 1.0 - expected_similarity;
-
-        assert!((dist - expected_distance).abs() < 1e-6);
-    }
-}

src/metrics/distance/mod.rs

@@ -13,8 +13,6 @@
 //! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
 //! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
 
-/// Cosine distance
-pub mod cosine;
 /// Euclidean Distance is the straight-line distance between two points in Euclidean spacere that presents the shortest distance between these points.
 pub mod euclidian;
 /// Hamming Distance between two strings is the number of positions at which the corresponding symbols are different.

src/metrics/precision.rs

@@ -4,9 +4,7 @@
 //!
 //! \\[precision = \frac{tp}{tp + fp}\\]
 //!
-//! where tp (true positive) - correct result, fp (false positive) - unexpected result.
-//! For binary classification, this is precision for the positive class (assumed to be 1.0).
-//! For multiclass, this is macro-averaged precision (average of per-class precisions).
+//! where tp (true positive) - correct result, fp (false positive) - unexpected result
 //!
 //! Example:
 //!
@@ -21,8 +19,7 @@
 //!
 //! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
 //! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
-
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
 use std::marker::PhantomData;
 
 #[cfg(feature = "serde")]
@@ -64,63 +61,33 @@ impl<T: RealNumber> Metrics<T> for Precision<T> {
             );
         }
 
-        let n = y_true.shape();
-
-        let mut classes_set: HashSet<u64> = HashSet::new();
-        for i in 0..n {
-            classes_set.insert(y_true.get(i).to_f64_bits());
+        let mut classes = HashSet::new();
+        for i in 0..y_true.shape() {
+            classes.insert(y_true.get(i).to_f64_bits());
         }
-        let classes: usize = classes_set.len();
+        let classes = classes.len();
 
-        if classes == 2 {
-            // Binary case: precision for positive class (assumed T::one())
-            let positive = T::one();
-            let mut tp: usize = 0;
-            let mut fp_count: usize = 0;
-            for i in 0..n {
-                let t = *y_true.get(i);
-                let p = *y_pred.get(i);
-                if p == t {
-                    if t == positive {
+        let mut tp = 0;
+        let mut fp = 0;
+        for i in 0..y_true.shape() {
+            if y_pred.get(i) == y_true.get(i) {
+                if classes == 2 {
+                    if *y_true.get(i) == T::one() {
                         tp += 1;
                     }
-                } else if t != positive {
-                    fp_count += 1;
-                }
-            }
-            if tp + fp_count == 0 {
-                0.0
-            } else {
-                tp as f64 / (tp + fp_count) as f64
-            }
-        } else {
-            // Multiclass case: macro-averaged precision
-            let mut predicted: HashMap<u64, usize> = HashMap::new();
-            let mut tp_map: HashMap<u64, usize> = HashMap::new();
-            for i in 0..n {
-                let p_bits = y_pred.get(i).to_f64_bits();
-                *predicted.entry(p_bits).or_insert(0) += 1;
-                if *y_true.get(i) == *y_pred.get(i) {
-                    *tp_map.entry(p_bits).or_insert(0) += 1;
-                }
-            }
-            let mut precision_sum = 0.0;
-            for &bits in &classes_set {
-                let pred_count = *predicted.get(&bits).unwrap_or(&0);
-                let tp = *tp_map.get(&bits).unwrap_or(&0);
-                let prec = if pred_count > 0 {
-                    tp as f64 / pred_count as f64
                 } else {
-                    0.0
-                };
-                precision_sum += prec;
-            }
-            if classes == 0 {
-                0.0
+                    tp += 1;
+                }
+            } else if classes == 2 {
+                if *y_true.get(i) == T::one() {
+                    fp += 1;
+                }
             } else {
-                precision_sum / classes as f64
+                fp += 1;
             }
         }
+
+        tp as f64 / (tp as f64 + fp as f64)
     }
 }
 
@@ -147,7 +114,7 @@ mod tests {
         let y_pred: Vec<f64> = vec![0., 0., 1., 1., 1., 1.];
 
         let score3: f64 = Precision::new().get_score(&y_true, &y_pred);
-        assert!((score3 - 0.5).abs() < 1e-8);
+        assert!((score3 - 0.6666666666).abs() < 1e-8);
     }
 
     #[cfg_attr(
@@ -165,36 +132,4 @@ mod tests {
         assert!((score1 - 0.333333333).abs() < 1e-8);
         assert!((score2 - 1.0).abs() < 1e-8);
     }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn precision_multiclass_imbalanced() {
-        let y_true: Vec<f64> = vec![0., 0., 1., 2., 2., 2.];
-        let y_pred: Vec<f64> = vec![0., 1., 1., 2., 0., 2.];
-
-        let score: f64 = Precision::new().get_score(&y_true, &y_pred);
-        let expected = (0.5 + 0.5 + 1.0) / 3.0;
-        assert!((score - expected).abs() < 1e-8);
-    }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn precision_multiclass_unpredicted_class() {
-        let y_true: Vec<f64> = vec![0., 0., 1., 2., 2., 2., 3.];
-        let y_pred: Vec<f64> = vec![0., 1., 1., 2., 0., 2., 0.];
-
-        let score: f64 = Precision::new().get_score(&y_true, &y_pred);
-        // Class 0: pred=3, tp=1 -> 1/3 ≈0.333
-        // Class 1: pred=2, tp=1 -> 0.5
-        // Class 2: pred=2, tp=2 -> 1.0
-        // Class 3: pred=0, tp=0 -> 0.0
-        let expected = (1.0 / 3.0 + 0.5 + 1.0 + 0.0) / 4.0;
-        assert!((score - expected).abs() < 1e-8);
-    }
 }

src/metrics/recall.rs

@@ -4,9 +4,7 @@
 //!
 //! \\[recall = \frac{tp}{tp + fn}\\]
 //!
-//! where tp (true positive) - correct result, fn (false negative) - missing result.
-//! For binary classification, this is recall for the positive class (assumed to be 1.0).
-//! For multiclass, this is macro-averaged recall (average of per-class recalls).
+//! where tp (true positive) - correct result, fn (false negative) - missing result
 //!
 //! Example:
 //!
@@ -22,7 +20,8 @@
 //! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
 //! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
 
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
+use std::convert::TryInto;
 use std::marker::PhantomData;
 
 #[cfg(feature = "serde")]
@@ -53,7 +52,7 @@ impl<T: RealNumber> Metrics<T> for Recall<T> {
         }
     }
     /// Calculated recall score
-    /// * `y_true` - ground truth (correct) labels.
+    /// * `y_true` - cround truth (correct) labels.
     /// * `y_pred` - predicted labels, as returned by a classifier.
     fn get_score(&self, y_true: &dyn ArrayView1<T>, y_pred: &dyn ArrayView1<T>) -> f64 {
         if y_true.shape() != y_pred.shape() {
@@ -64,57 +63,32 @@ impl<T: RealNumber> Metrics<T> for Recall<T> {
             );
         }
 
-        let n = y_true.shape();
-
-        let mut classes_set = HashSet::new();
-        for i in 0..n {
-            classes_set.insert(y_true.get(i).to_f64_bits());
+        let mut classes = HashSet::new();
+        for i in 0..y_true.shape() {
+            classes.insert(y_true.get(i).to_f64_bits());
         }
-        let classes: usize = classes_set.len();
+        let classes: i64 = classes.len().try_into().unwrap();
 
-        if classes == 2 {
-            // Binary case: recall for positive class (assumed T::one())
-            let positive = T::one();
-            let mut tp: usize = 0;
-            let mut fn_count: usize = 0;
-            for i in 0..n {
-                let t = *y_true.get(i);
-                let p = *y_pred.get(i);
-                if p == t {
-                    if t == positive {
+        let mut tp = 0;
+        let mut fne = 0;
+        for i in 0..y_true.shape() {
+            if y_pred.get(i) == y_true.get(i) {
+                if classes == 2 {
+                    if *y_true.get(i) == T::one() {
                         tp += 1;
                     }
-                } else if t == positive {
-                    fn_count += 1;
+                } else {
+                    tp += 1;
                 }
-            }
-            if tp + fn_count == 0 {
-                0.0
-            } else {
-                tp as f64 / (tp + fn_count) as f64
-            }
-        } else {
-            // Multiclass case: macro-averaged recall
-            let mut support: HashMap<u64, usize> = HashMap::new();
-            let mut tp_map: HashMap<u64, usize> = HashMap::new();
-            for i in 0..n {
-                let t_bits = y_true.get(i).to_f64_bits();
-                *support.entry(t_bits).or_insert(0) += 1;
-                if *y_true.get(i) == *y_pred.get(i) {
-                    *tp_map.entry(t_bits).or_insert(0) += 1;
+            } else if classes == 2 {
+                if *y_true.get(i) != T::one() {
+                    fne += 1;
                 }
-            }
-            let mut recall_sum = 0.0;
-            for (&bits, &sup) in &support {
-                let tp = *tp_map.get(&bits).unwrap_or(&0);
-                recall_sum += tp as f64 / sup as f64;
-            }
-            if support.is_empty() {
-                0.0
             } else {
-                recall_sum / support.len() as f64
+                fne += 1;
             }
         }
+        tp as f64 / (tp as f64 + fne as f64)
     }
 }
 
@@ -141,7 +115,7 @@ mod tests {
         let y_pred: Vec<f64> = vec![0., 0., 1., 1., 1., 1.];
 
         let score3: f64 = Recall::new().get_score(&y_true, &y_pred);
-        assert!((score3 - (2.0 / 3.0)).abs() < 1e-8);
+        assert!((score3 - 0.5).abs() < 1e-8);
     }
 
     #[cfg_attr(
@@ -159,18 +133,4 @@ mod tests {
         assert!((score1 - 0.333333333).abs() < 1e-8);
         assert!((score2 - 1.0).abs() < 1e-8);
     }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn recall_multiclass_imbalanced() {
-        let y_true: Vec<f64> = vec![0., 0., 1., 2., 2., 2.];
-        let y_pred: Vec<f64> = vec![0., 1., 1., 2., 0., 2.];
-
-        let score: f64 = Recall::new().get_score(&y_true, &y_pred);
-        let expected = (0.5 + 1.0 + (2.0 / 3.0)) / 3.0;
-        assert!((score - expected).abs() < 1e-8);
-    }
 }

src/naive_bayes/bernoulli.rs

@@ -257,7 +257,8 @@ impl<TY: Number + Ord + Unsigned> BernoulliNBDistribution<TY> {
     /// Fits the distribution to a NxM matrix where N is number of samples and M is number of features.
     /// * `x` - training data.
     /// * `y` - vector with target values (classes) of length N.
-    /// * `priors` - Optional vector with prior probabilities of the classes. If not defined, priors are adjusted according to the data.
+    /// * `priors` - Optional vector with prior probabilities of the classes. If not defined,
+    ///     priors are adjusted according to the data.
     /// * `alpha` - Additive (Laplace/Lidstone) smoothing parameter.
     /// * `binarize` - Threshold for binarizing.
     fn fit<TX: Number + PartialOrd, X: Array2<TX>, Y: Array1<TY>>(

src/naive_bayes/gaussian.rs

@@ -174,7 +174,8 @@ impl<TY: Number + Ord + Unsigned> GaussianNBDistribution<TY> {
     /// Fits the distribution to a NxM matrix where N is number of samples and M is number of features.
     /// * `x` - training data.
     /// * `y` - vector with target values (classes) of length N.
-    /// * `priors` - Optional vector with prior probabilities of the classes. If not defined, priors are adjusted according to the data.
+    /// * `priors` - Optional vector with prior probabilities of the classes. If not defined,
+    ///     priors are adjusted according to the data.
     pub fn fit<TX: Number + RealNumber, X: Array2<TX>, Y: Array1<TY>>(
         x: &X,
         y: &Y,

src/naive_bayes/multinomial.rs

@@ -207,7 +207,8 @@ impl<TY: Number + Ord + Unsigned> MultinomialNBDistribution<TY> {
     /// Fits the distribution to a NxM matrix where N is number of samples and M is number of features.
     /// * `x` - training data.
     /// * `y` - vector with target values (classes) of length N.
-    /// * `priors` - Optional vector with prior probabilities of the classes. If not defined, priors are adjusted according to the data.
+    /// * `priors` - Optional vector with prior probabilities of the classes. If not defined,
+    ///     priors are adjusted according to the data.
     /// * `alpha` - Additive (Laplace/Lidstone) smoothing parameter.
     pub fn fit<TX: Number + Unsigned, X: Array2<TX>, Y: Array1<TY>>(
         x: &X,

src/neighbors/knn_regressor.rs

@@ -1,7 +1,6 @@
-//! # K Nearest Neighbors Regressor with Feature Sparsing
+//! # K Nearest Neighbors Regressor
 //!
 //! Regressor that predicts estimated values as a function of k nearest neightbours.
-//! Now supports feature sparsing - the ability to consider only a subset of features during prediction.
 //!
 //! `KNNRegressor` relies on 2 backend algorithms to speedup KNN queries:
 //! * [`LinearSearch`](../../algorithm/neighbour/linear_search/index.html)
@@ -30,10 +29,6 @@
 //!
 //! let knn = KNNRegressor::fit(&x, &y, Default::default()).unwrap();
 //! let y_hat = knn.predict(&x).unwrap();
-//! 
-//! // Predict using only features at indices 0
-//! let feature_indices = vec![0];
-//! let y_hat_sparse = knn.predict_sparse(&x, &feature_indices).unwrap();
 //! ```
 //!
 //! variable `y_hat` will hold predicted value
@@ -82,13 +77,12 @@ pub struct KNNRegressorParameters<T: Number, D: Distance<Vec<T>>> {
 pub struct KNNRegressor<TX: Number, TY: Number, X: Array2<TX>, Y: Array1<TY>, D: Distance<Vec<TX>>>
 {
     y: Option<Y>,
-    x: Option<X>, // Store training data for sparse feature prediction
     knn_algorithm: Option<KNNAlgorithm<TX, D>>,
-    distance: Option<D>, // Store distance function for sparse prediction
     weight: Option<KNNWeightFunction>,
     k: Option<usize>,
     _phantom_tx: PhantomData<TX>,
     _phantom_ty: PhantomData<TY>,
+    _phantom_x: PhantomData<X>,
 }
 
 impl<TX: Number, TY: Number, X: Array2<TX>, Y: Array1<TY>, D: Distance<Vec<TX>>>
@@ -98,20 +92,12 @@ impl<TX: Number, TY: Number, X: Array2<TX>, Y: Array1<TY>, D: Distance<Vec<TX>>>
         self.y.as_ref().unwrap()
     }
 
-    fn x(&self) -> &X {
-        self.x.as_ref().unwrap()
-    }
-
     fn knn_algorithm(&self) -> &KNNAlgorithm<TX, D> {
         self.knn_algorithm
             .as_ref()
             .expect("Missing parameter: KNNAlgorithm")
     }
 
-    fn distance(&self) -> &D {
-        self.distance.as_ref().expect("Missing parameter: distance")
-    }
-
     fn weight(&self) -> &KNNWeightFunction {
         self.weight.as_ref().expect("Missing parameter: weight")
     }
@@ -190,13 +176,12 @@ impl<TX: Number, TY: Number, X: Array2<TX>, Y: Array1<TY>, D: Distance<Vec<TX>>>
     fn new() -> Self {
         Self {
             y: Option::None,
-            x: Option::None,
             knn_algorithm: Option::None,
-            distance: Option::None,
             weight: Option::None,
             k: Option::None,
             _phantom_tx: PhantomData,
             _phantom_ty: PhantomData,
+            _phantom_x: PhantomData,
         }
     }
 
@@ -246,17 +231,16 @@ impl<TX: Number, TY: Number, X: Array2<TX>, Y: Array1<TY>, D: Distance<Vec<TX>>>
             )));
         }
 
-        let knn_algo = parameters.algorithm.fit(data, parameters.distance.clone())?;
+        let knn_algo = parameters.algorithm.fit(data, parameters.distance)?;
 
         Ok(KNNRegressor {
             y: Some(y.clone()),
-            x: Some(x.clone()),
             k: Some(parameters.k),
             knn_algorithm: Some(knn_algo),
-            distance: Some(parameters.distance),
             weight: Some(parameters.weight),
             _phantom_tx: PhantomData,
             _phantom_ty: PhantomData,
+            _phantom_x: PhantomData,
         })
     }
 
@@ -278,45 +262,6 @@ impl<TX: Number, TY: Number, X: Array2<TX>, Y: Array1<TY>, D: Distance<Vec<TX>>>
         Ok(result)
     }
 
-    /// Predict the target for the provided data using only specified features.
-    /// * `x` - data of shape NxM where N is number of data points to estimate and M is number of features.
-    /// * `feature_indices` - indices of features to consider (e.g., [0, 2, 4] to use only features at positions 0, 2, and 4)
-    ///
-    /// Returns a vector of size N with estimates.
-    pub fn predict_sparse(&self, x: &X, feature_indices: &[usize]) -> Result<Y, Failed> {
-        let (n_samples, n_features) = x.shape();
-        
-        // Validate feature indices
-        for &idx in feature_indices {
-            if idx >= n_features {
-                return Err(Failed::predict(&format!(
-                    "Feature index {} out of bounds (max: {})",
-                    idx,
-                    n_features - 1
-                )));
-            }
-        }
-
-        if feature_indices.is_empty() {
-            return Err(Failed::predict(
-                "feature_indices cannot be empty"
-            ));
-        }
-
-        let mut result = Y::zeros(n_samples);
-
-        let mut row_vec = vec![TX::zero(); feature_indices.len()];
-        for (i, row) in x.row_iter().enumerate() {
-            // Extract only the specified features
-            for (j, &feat_idx) in feature_indices.iter().enumerate() {
-                row_vec[j] = *row.get(feat_idx);
-            }
-            result.set(i, self.predict_for_row_sparse(&row_vec, feature_indices)?);
-        }
-
-        Ok(result)
-    }
-
     fn predict_for_row(&self, row: &Vec<TX>) -> Result<TY, Failed> {
         let search_result = self.knn_algorithm().find(row, self.k.unwrap())?;
         let mut result = TY::zero();
@@ -332,50 +277,6 @@ impl<TX: Number, TY: Number, X: Array2<TX>, Y: Array1<TY>, D: Distance<Vec<TX>>>
 
         Ok(result)
     }
-
-    fn predict_for_row_sparse(
-        &self,
-        row: &Vec<TX>,
-        feature_indices: &[usize],
-    ) -> Result<TY, Failed> {
-        let training_data = self.x();
-        let (n_training_samples, _) = training_data.shape();
-        let k = self.k.unwrap();
-
-        // Manually compute distances using only specified features
-        let mut distances: Vec<(usize, f64)> = Vec::with_capacity(n_training_samples);
-
-        for i in 0..n_training_samples {
-            let train_row = training_data.get_row(i);
-            
-            // Extract sparse features from training data
-            let mut train_sparse = Vec::with_capacity(feature_indices.len());
-            for &feat_idx in feature_indices {
-                train_sparse.push(*train_row.get(feat_idx));
-            }
-
-            // Compute distance using only selected features
-            let dist = self.distance().distance(row, &train_sparse);
-            distances.push((i, dist));
-        }
-
-        // Sort by distance and take k nearest
-        distances.sort_by(|a, b| a.1.partial_cmp(&b.1).unwrap_or(std::cmp::Ordering::Equal));
-        let k_nearest: Vec<(usize, f64)> = distances.into_iter().take(k).collect();
-
-        // Compute weighted prediction
-        let mut result = TY::zero();
-        let weights = self
-            .weight()
-            .calc_weights(k_nearest.iter().map(|v| v.1).collect());
-        let w_sum: f64 = weights.iter().copied().sum();
-
-        for (neighbor, w) in k_nearest.iter().zip(weights.iter()) {
-            result += *self.y().get(neighbor.0) * TY::from_f64(*w / w_sum).unwrap();
-        }
-
-        Ok(result)
-    }
 }
 
 #[cfg(test)]
@@ -431,91 +332,6 @@ mod tests {
         }
     }
 
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn knn_predict_sparse() {
-        // Training data with 3 features
-        let x = DenseMatrix::from_2d_array(&[
-            &[1., 2., 10.],
-            &[3., 4., 20.],
-            &[5., 6., 30.],
-            &[7., 8., 40.],
-            &[9., 10., 50.],
-        ])
-        .unwrap();
-        let y: Vec<f64> = vec![1., 2., 3., 4., 5.];
-
-        let knn = KNNRegressor::fit(&x, &y, Default::default()).unwrap();
-
-        // Test data
-        let x_test = DenseMatrix::from_2d_array(&[
-            &[1., 2., 999.], // Third feature is very different
-            &[5., 6., 999.],
-        ])
-        .unwrap();
-
-        // Predict using only first two features (ignore the third)
-        let feature_indices = vec![0, 1];
-        let y_hat_sparse = knn.predict_sparse(&x_test, &feature_indices).unwrap();
-
-        // Should get good predictions since we're ignoring the mismatched third feature
-        assert_eq!(2, Vec::len(&y_hat_sparse));
-        assert!((y_hat_sparse[0] - 2.0).abs() < 1.0); // Should be close to 1-2
-        assert!((y_hat_sparse[1] - 3.0).abs() < 1.0); // Should be close to 3
-    }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn knn_predict_sparse_single_feature() {
-        let x = DenseMatrix::from_2d_array(&[
-            &[1., 100., 1000.],
-            &[2., 200., 2000.],
-            &[3., 300., 3000.],
-            &[4., 400., 4000.],
-            &[5., 500., 5000.],
-        ])
-        .unwrap();
-        let y: Vec<f64> = vec![1., 2., 3., 4., 5.];
-
-        let knn = KNNRegressor::fit(&x, &y, Default::default()).unwrap();
-
-        let x_test = DenseMatrix::from_2d_array(&[&[1.5, 999., 9999.]]).unwrap();
-
-        // Use only first feature
-        let y_hat = knn.predict_sparse(&x_test, &[0]).unwrap();
-        
-        // Should predict based on first feature only
-        assert_eq!(1, Vec::len(&y_hat));
-        assert!((y_hat[0] - 1.5).abs() < 1.0);
-    }
-
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn knn_predict_sparse_invalid_indices() {
-        let x = DenseMatrix::from_2d_array(&[&[1., 2.], &[3., 4.]]).unwrap();
-        let y: Vec<f64> = vec![1., 2.];
-
-        let knn = KNNRegressor::fit(&x, &y, Default::default()).unwrap();
-        let x_test = DenseMatrix::from_2d_array(&[&[1., 2.]]).unwrap();
-
-        // Index out of bounds
-        let result = knn.predict_sparse(&x_test, &[5]);
-        assert!(result.is_err());
-
-        // Empty indices
-        let result = knn.predict_sparse(&x_test, &[]);
-        assert!(result.is_err());
-    }
-
     #[cfg_attr(
         all(target_arch = "wasm32", not(target_os = "wasi")),
         wasm_bindgen_test::wasm_bindgen_test
@@ -534,4 +350,4 @@ mod tests {
 
         assert_eq!(knn, deserialized_knn);
     }
-}
+}

src/neighbors/mod.rs

@@ -64,7 +64,7 @@ impl KNNWeightFunction {
             KNNWeightFunction::Distance => {
                 // if there are any points that has zero distance from one or more training points,
                 // those training points are weighted as 1.0 and the other points as 0.0
-                if distances.contains(&0f64) {
+                if distances.iter().any(|&e| e == 0f64) {
                     distances
                         .iter()
                         .map(|e| if *e == 0f64 { 1f64 } else { 0f64 })

src/optimization/line_search.rs

@@ -6,8 +6,8 @@ pub trait LineSearchMethod<T: Float> {
     /// Find alpha that satisfies strong Wolfe conditions.
     fn search(
         &self,
-        f: &dyn Fn(T) -> T,
-        df: &dyn Fn(T) -> T,
+        f: &(dyn Fn(T) -> T),
+        df: &(dyn Fn(T) -> T),
         alpha: T,
         f0: T,
         df0: T,
@@ -55,8 +55,8 @@ impl<T: Float> Default for Backtracking<T> {
 impl<T: Float> LineSearchMethod<T> for Backtracking<T> {
     fn search(
         &self,
-        f: &dyn Fn(T) -> T,
-        _: &dyn Fn(T) -> T,
+        f: &(dyn Fn(T) -> T),
+        _: &(dyn Fn(T) -> T),
         alpha: T,
         f0: T,
         df0: T,

src/preprocessing/categorical.rs

@@ -24,7 +24,7 @@
 //! //    &[1.5, 1.0, 0.0, 1.5, 0.0, 0.0, 1.0, 0.0]
 //! //    &[1.5, 0.0, 1.0, 1.5, 0.0, 0.0, 0.0, 1.0]
 //! ```
-use std::iter::repeat_n;
+use std::iter;
 
 use crate::error::Failed;
 use crate::linalg::basic::arrays::Array2;
@@ -75,7 +75,11 @@ fn find_new_idxs(num_params: usize, cat_sizes: &[usize], cat_idxs: &[usize]) ->
     let offset = (0..1).chain(offset_);
 
     let new_param_idxs: Vec<usize> = (0..num_params)
-        .zip(repeats.zip(offset).flat_map(|(r, o)| repeat_n(o, r)))
+        .zip(
+            repeats
+                .zip(offset)
+                .flat_map(|(r, o)| iter::repeat(o).take(r)),
+        )
         .map(|(idx, ofst)| idx + ofst)
         .collect();
     new_param_idxs
@@ -120,7 +124,7 @@ impl OneHotEncoder {
                 let (nrows, _) = data.shape();
 
                 // col buffer to avoid allocations
-                let mut col_buf: Vec<T> = repeat_n(T::zero(), nrows).collect();
+                let mut col_buf: Vec<T> = iter::repeat(T::zero()).take(nrows).collect();
 
                 let mut res: Vec<CategoryMapper<CategoricalFloat>> = Vec::with_capacity(idxs.len());
 

src/svm/mod.rs

@@ -25,18 +25,14 @@
 /// search parameters
 pub mod svc;
 pub mod svr;
-// search parameters space
-pub mod search;
+// /// search parameters space
+// pub mod search;
 
 use core::fmt::Debug;
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-// Only import typetag if not compiling for wasm32 and serde is enabled
-#[cfg(all(feature = "serde", not(target_arch = "wasm32")))]
-use typetag;
-
 use crate::error::{Failed, FailedError};
 use crate::linalg::basic::arrays::{Array1, ArrayView1};
 
@@ -52,301 +48,205 @@ pub trait Kernel: Debug {
     fn apply(&self, x_i: &Vec<f64>, x_j: &Vec<f64>) -> Result<f64, Failed>;
 }
 
-/// A enumerator for all the kernels type to support.
-/// This allows kernel selection and parameterization ergonomic, type-safe, and ready for use in parameter structs like SVRParameters.
-/// You can construct kernels using the provided variants and builder-style methods.
-///
-/// # Examples
-///
-/// ```
-/// use smartcore::svm::Kernels;
-///
-/// let linear = Kernels::linear();
-/// let rbf = Kernels::rbf().with_gamma(0.5);
-/// let poly = Kernels::polynomial().with_degree(3.0).with_gamma(0.5).with_coef0(1.0);
-/// let sigmoid = Kernels::sigmoid().with_gamma(0.2).with_coef0(0.0);
-/// ```
+/// Pre-defined kernel functions
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone, PartialEq)]
-pub enum Kernels {
-    /// Linear kernel (default).
-    ///
-    /// Computes the standard dot product between vectors.
-    Linear,
-
-    /// Radial Basis Function (RBF) kernel.
-    ///
-    /// Formula: K(x, y) = exp(-gamma * ||x-y||²)
-    RBF {
-        /// Controls the width of the Gaussian RBF kernel.
-        ///
-        /// Larger values of gamma lead to higher bias and lower variance.
-        /// This parameter is inversely proportional to the radius of influence
-        /// of samples selected by the model as support vectors.
-        gamma: Option<f64>,
-    },
-
-    /// Polynomial kernel.
-    ///
-    /// Formula: K(x, y) = (gamma * <x, y> + coef0)^degree
-    Polynomial {
-        /// The degree of the polynomial kernel.
-        ///
-        /// Integer values are typical (2 = quadratic, 3 = cubic), but any positive real value is valid.
-        /// Higher degree values create decision boundaries with higher complexity.
-        degree: Option<f64>,
-
-        /// Kernel coefficient for the dot product.
-        ///
-        /// Controls the influence of higher-degree versus lower-degree terms in the polynomial.
-        /// If None, a default value will be used.
-        gamma: Option<f64>,
-
-        /// Independent term in the polynomial kernel.
-        ///
-        /// Controls the influence of higher-degree versus lower-degree terms.
-        /// If None, a default value of 1.0 will be used.
-        coef0: Option<f64>,
-    },
-
-    /// Sigmoid kernel.
-    ///
-    /// Formula: K(x, y) = tanh(gamma * <x, y> + coef0)
-    Sigmoid {
-        /// Kernel coefficient for the dot product.
-        ///
-        /// Controls the scaling of the dot product in the sigmoid function.
-        /// If None, a default value will be used.
-        gamma: Option<f64>,
-
-        /// Independent term in the sigmoid kernel.
-        ///
-        /// Acts as a threshold/bias term in the sigmoid function.
-        /// If None, a default value of 1.0 will be used.
-        coef0: Option<f64>,
-    },
-}
+#[derive(Debug, Clone)]
+pub struct Kernels;
 
 impl Kernels {
-    /// Create a linear kernel.
-    ///
-    /// The linear kernel computes the dot product between two vectors:
-    /// K(x, y) = <x, y>
-    pub fn linear() -> Self {
-        Kernels::Linear
+    /// Return a default linear
+    pub fn linear() -> LinearKernel {
+        LinearKernel
     }
-
-    /// Create an RBF kernel with unspecified gamma.
-    ///
-    /// The RBF kernel is defined as:
-    /// K(x, y) = exp(-gamma * ||x-y||²)
-    ///
-    /// You should specify gamma using `with_gamma()` before using this kernel.
-    pub fn rbf() -> Self {
-        Kernels::RBF { gamma: None }
+    /// Return a default RBF
+    pub fn rbf() -> RBFKernel {
+        RBFKernel::default()
     }
-
-    /// Create a polynomial kernel with default parameters.
-    ///
-    /// The polynomial kernel is defined as:
-    /// K(x, y) = (gamma * <x, y> + coef0)^degree
-    ///
-    /// Default values:
-    /// - gamma: None (must be specified)
-    /// - degree: None (must be specified)
-    /// - coef0: 1.0
-    pub fn polynomial() -> Self {
-        Kernels::Polynomial {
-            gamma: None,
-            degree: None,
-            coef0: Some(1.0),
-        }
+    /// Return a default polynomial
+    pub fn polynomial() -> PolynomialKernel {
+        PolynomialKernel::default()
     }
-
-    /// Create a sigmoid kernel with default parameters.
-    ///
-    /// The sigmoid kernel is defined as:
-    /// K(x, y) = tanh(gamma * <x, y> + coef0)
-    ///
-    /// Default values:
-    /// - gamma: None (must be specified)
-    /// - coef0: 1.0
-    ///
-    pub fn sigmoid() -> Self {
-        Kernels::Sigmoid {
-            gamma: None,
-            coef0: Some(1.0),
-        }
+    /// Return a default sigmoid
+    pub fn sigmoid() -> SigmoidKernel {
+        SigmoidKernel::default()
     }
+}
 
-    /// Set the `gamma` parameter for RBF, polynomial, or sigmoid kernels.
-    ///
-    /// The gamma parameter has different interpretations depending on the kernel:
-    /// - For RBF: Controls the width of the Gaussian. Larger values mean tighter fit.
-    /// - For Polynomial: Scaling factor for the dot product.
-    /// - For Sigmoid: Scaling factor for the dot product.
-    ///
-    pub fn with_gamma(self, gamma: f64) -> Self {
-        match self {
-            Kernels::RBF { .. } => Kernels::RBF { gamma: Some(gamma) },
-            Kernels::Polynomial { degree, coef0, .. } => Kernels::Polynomial {
-                gamma: Some(gamma),
-                degree,
-                coef0,
-            },
-            Kernels::Sigmoid { coef0, .. } => Kernels::Sigmoid {
-                gamma: Some(gamma),
-                coef0,
-            },
-            other => other,
-        }
+/// Linear Kernel
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
+pub struct LinearKernel;
+
+/// Radial basis function (Gaussian) kernel
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Default, Clone, PartialEq)]
+pub struct RBFKernel {
+    /// kernel coefficient
+    pub gamma: Option<f64>,
+}
+
+#[allow(dead_code)]
+impl RBFKernel {
+    /// assign gamma parameter to kernel (required)
+    /// ```rust
+    /// use smartcore::svm::RBFKernel;
+    /// let knl = RBFKernel::default().with_gamma(0.7);
+    /// ```
+    pub fn with_gamma(mut self, gamma: f64) -> Self {
+        self.gamma = Some(gamma);
+        self
     }
+}
 
-    /// Set the `degree` parameter for the polynomial kernel.
-    ///
-    /// The degree parameter controls the flexibility of the decision boundary.
-    /// Higher degrees create more complex boundaries but may lead to overfitting.
-    ///
-    pub fn with_degree(self, degree: f64) -> Self {
-        match self {
-            Kernels::Polynomial { gamma, coef0, .. } => Kernels::Polynomial {
-                degree: Some(degree),
-                gamma,
-                coef0,
-            },
-            other => other,
-        }
-    }
+/// Polynomial kernel
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq)]
+pub struct PolynomialKernel {
+    /// degree of the polynomial
+    pub degree: Option<f64>,
+    /// kernel coefficient
+    pub gamma: Option<f64>,
+    /// independent term in kernel function
+    pub coef0: Option<f64>,
+}
 
-    /// Set the `coef0` parameter for polynomial or sigmoid kernels.
-    ///
-    /// The coef0 parameter is the independent term in the kernel function:
-    /// - For Polynomial: Controls the influence of higher-degree vs. lower-degree terms.
-    /// - For Sigmoid: Acts as a threshold/bias term.
-    ///
-    pub fn with_coef0(self, coef0: f64) -> Self {
-        match self {
-            Kernels::Polynomial { degree, gamma, .. } => Kernels::Polynomial {
-                degree,
-                gamma,
-                coef0: Some(coef0),
-            },
-            Kernels::Sigmoid { gamma, .. } => Kernels::Sigmoid {
-                gamma,
-                coef0: Some(coef0),
-            },
-            other => other,
+impl Default for PolynomialKernel {
+    fn default() -> Self {
+        Self {
+            gamma: Option::None,
+            degree: Option::None,
+            coef0: Some(1f64),
         }
     }
 }
 
-/// Implementation of the [`Kernel`] trait for the [`Kernels`] enum in smartcore.
-///
-/// This method computes the value of the kernel function between two feature vectors `x_i` and `x_j`,
-/// according to the variant and parameters of the [`Kernels`] enum. This enables flexible and type-safe
-/// selection of kernel functions for SVM and SVR models in smartcore.
-///
-/// # Supported Kernels
-///
-/// - [`Kernels::Linear`]: Computes the standard dot product between `x_i` and `x_j`.
-/// - [`Kernels::RBF`]: Computes the Radial Basis Function (Gaussian) kernel. Requires `gamma`.
-/// - [`Kernels::Polynomial`]: Computes the polynomial kernel. Requires `degree`, `gamma`, and `coef0`.
-/// - [`Kernels::Sigmoid`]: Computes the sigmoid kernel. Requires `gamma` and `coef0`.
-///
-/// # Parameters
-///
-/// - `x_i`: First input vector (feature vector).
-/// - `x_j`: Second input vector (feature vector).
-///
-/// # Returns
-///
-/// - `Ok(f64)`: The computed kernel value.
-/// - `Err(Failed)`: If any required kernel parameter is missing.
-///
-/// # Errors
-///
-/// Returns `Err(Failed)` if a required parameter (such as `gamma`, `degree`, or `coef0`)
-/// is `None` for the selected kernel variant.
-///
-/// # Example
-///
-/// ```
-/// use smartcore::svm::Kernels;
-/// use smartcore::svm::Kernel;
-///
-/// let x = vec![1.0, 2.0, 3.0];
-/// let y = vec![4.0, 5.0, 6.0];
-/// let kernel = Kernels::rbf().with_gamma(0.5);
-/// let value = kernel.apply(&x, &y).unwrap();
-/// ```
-///
-/// # Notes
-///
-/// - This implementation follows smartcore's philosophy: pure Rust, no macros, no unsafe code,
-///   and an accessible, pythonic API surface for both ML practitioners and Rust beginners.
-/// - All kernel parameters must be set before calling `apply`; missing parameters will result in an error.
-///
-/// See the [`Kernels`] enum documentation for more details on each kernel type and its parameters.
-#[cfg_attr(all(feature = "serde", not(target_arch = "wasm32")), typetag::serde)]
-impl Kernel for Kernels {
-    fn apply(&self, x_i: &Vec<f64>, x_j: &Vec<f64>) -> Result<f64, Failed> {
-        match self {
-            Kernels::Linear => Ok(x_i.dot(x_j)),
-            Kernels::RBF { gamma } => {
-                let gamma = gamma.ok_or_else(|| {
-                    Failed::because(FailedError::ParametersError, "gamma not set")
-                })?;
-                let v_diff = x_i.sub(x_j);
-                Ok((-gamma * v_diff.mul(&v_diff).sum()).exp())
-            }
-            Kernels::Polynomial {
-                degree,
-                gamma,
-                coef0,
-            } => {
-                let degree = degree.ok_or_else(|| {
-                    Failed::because(FailedError::ParametersError, "degree not set")
-                })?;
-                let gamma = gamma.ok_or_else(|| {
-                    Failed::because(FailedError::ParametersError, "gamma not set")
-                })?;
-                let coef0 = coef0.ok_or_else(|| {
-                    Failed::because(FailedError::ParametersError, "coef0 not set")
-                })?;
-                let dot = x_i.dot(x_j);
-                Ok((gamma * dot + coef0).powf(degree))
-            }
-            Kernels::Sigmoid { gamma, coef0 } => {
-                let gamma = gamma.ok_or_else(|| {
-                    Failed::because(FailedError::ParametersError, "gamma not set")
-                })?;
-                let coef0 = coef0.ok_or_else(|| {
-                    Failed::because(FailedError::ParametersError, "coef0 not set")
-                })?;
-                let dot = x_i.dot(x_j);
-                Ok((gamma * dot + coef0).tanh())
-            }
+impl PolynomialKernel {
+    /// set parameters for kernel
+    /// ```rust
+    /// use smartcore::svm::PolynomialKernel;
+    /// let knl = PolynomialKernel::default().with_params(3.0, 0.7, 1.0);
+    /// ```
+    pub fn with_params(mut self, degree: f64, gamma: f64, coef0: f64) -> Self {
+        self.degree = Some(degree);
+        self.gamma = Some(gamma);
+        self.coef0 = Some(coef0);
+        self
+    }
+    /// set gamma parameter for kernel
+    /// ```rust
+    /// use smartcore::svm::PolynomialKernel;
+    /// let knl = PolynomialKernel::default().with_gamma(0.7);
+    /// ```
+    pub fn with_gamma(mut self, gamma: f64) -> Self {
+        self.gamma = Some(gamma);
+        self
+    }
+    /// set degree parameter for kernel
+    /// ```rust
+    /// use smartcore::svm::PolynomialKernel;
+    /// let knl = PolynomialKernel::default().with_degree(3.0, 100);
+    /// ```
+    pub fn with_degree(self, degree: f64, n_features: usize) -> Self {
+        self.with_params(degree, 1f64, 1f64 / n_features as f64)
+    }
+}
+
+/// Sigmoid (hyperbolic tangent) kernel
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq)]
+pub struct SigmoidKernel {
+    /// kernel coefficient
+    pub gamma: Option<f64>,
+    /// independent term in kernel function
+    pub coef0: Option<f64>,
+}
+
+impl Default for SigmoidKernel {
+    fn default() -> Self {
+        Self {
+            gamma: Option::None,
+            coef0: Some(1f64),
         }
     }
 }
 
+impl SigmoidKernel {
+    /// set parameters for kernel
+    /// ```rust
+    /// use smartcore::svm::SigmoidKernel;
+    /// let knl = SigmoidKernel::default().with_params(0.7, 1.0);
+    /// ```
+    pub fn with_params(mut self, gamma: f64, coef0: f64) -> Self {
+        self.gamma = Some(gamma);
+        self.coef0 = Some(coef0);
+        self
+    }
+    /// set gamma parameter for kernel
+    /// ```rust
+    /// use smartcore::svm::SigmoidKernel;
+    /// let knl = SigmoidKernel::default().with_gamma(0.7);
+    /// ```
+    pub fn with_gamma(mut self, gamma: f64) -> Self {
+        self.gamma = Some(gamma);
+        self
+    }
+}
+
+#[cfg_attr(all(feature = "serde", not(target_arch = "wasm32")), typetag::serde)]
+impl Kernel for LinearKernel {
+    fn apply(&self, x_i: &Vec<f64>, x_j: &Vec<f64>) -> Result<f64, Failed> {
+        Ok(x_i.dot(x_j))
+    }
+}
+
+#[cfg_attr(all(feature = "serde", not(target_arch = "wasm32")), typetag::serde)]
+impl Kernel for RBFKernel {
+    fn apply(&self, x_i: &Vec<f64>, x_j: &Vec<f64>) -> Result<f64, Failed> {
+        if self.gamma.is_none() {
+            return Err(Failed::because(
+                FailedError::ParametersError,
+                "gamma should be set, use {Kernel}::default().with_gamma(..)",
+            ));
+        }
+        let v_diff = x_i.sub(x_j);
+        Ok((-self.gamma.unwrap() * v_diff.mul(&v_diff).sum()).exp())
+    }
+}
+
+#[cfg_attr(all(feature = "serde", not(target_arch = "wasm32")), typetag::serde)]
+impl Kernel for PolynomialKernel {
+    fn apply(&self, x_i: &Vec<f64>, x_j: &Vec<f64>) -> Result<f64, Failed> {
+        if self.gamma.is_none() || self.coef0.is_none() || self.degree.is_none() {
+            return Err(Failed::because(
+                FailedError::ParametersError, "gamma, coef0, degree should be set, 
+                                                        use {Kernel}::default().with_{parameter}(..)")
+            );
+        }
+        let dot = x_i.dot(x_j);
+        Ok((self.gamma.unwrap() * dot + self.coef0.unwrap()).powf(self.degree.unwrap()))
+    }
+}
+
+#[cfg_attr(all(feature = "serde", not(target_arch = "wasm32")), typetag::serde)]
+impl Kernel for SigmoidKernel {
+    fn apply(&self, x_i: &Vec<f64>, x_j: &Vec<f64>) -> Result<f64, Failed> {
+        if self.gamma.is_none() || self.coef0.is_none() {
+            return Err(Failed::because(
+                FailedError::ParametersError, "gamma, coef0, degree should be set, 
+                                                        use {Kernel}::default().with_{parameter}(..)")
+            );
+        }
+        let dot = x_i.dot(x_j);
+        Ok(self.gamma.unwrap() * dot + self.coef0.unwrap().tanh())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::svm::Kernels;
 
-    #[test]
-    fn rbf_kernel() {
-        let v1 = vec![1., 2., 3.];
-        let v2 = vec![4., 5., 6.];
-        let result = Kernels::rbf()
-            .with_gamma(0.055)
-            .apply(&v1, &v2)
-            .unwrap()
-            .abs();
-        assert!((0.2265f64 - result) < 1e-4);
-    }
-
     #[cfg_attr(
         all(target_arch = "wasm32", not(target_os = "wasi")),
         wasm_bindgen_test::wasm_bindgen_test
@@ -364,7 +264,7 @@ mod tests {
         wasm_bindgen_test::wasm_bindgen_test
     )]
     #[test]
-    fn test_rbf_kernel() {
+    fn rbf_kernel() {
         let v1 = vec![1., 2., 3.];
         let v2 = vec![4., 5., 6.];
 
@@ -387,10 +287,7 @@ mod tests {
         let v2 = vec![4., 5., 6.];
 
         let result = Kernels::polynomial()
-            .with_gamma(0.5)
-            .with_degree(3.0)
-            .with_coef0(1.0)
-            //.with_params(3.0, 0.5, 1.0)
+            .with_params(3.0, 0.5, 1.0)
             .apply(&v1, &v2)
             .unwrap()
             .abs();
@@ -408,8 +305,7 @@ mod tests {
         let v2 = vec![4., 5., 6.];
 
         let result = Kernels::sigmoid()
-            .with_gamma(0.01)
-            .with_coef0(0.1)
+            .with_params(0.01, 0.1)
             .apply(&v1, &v2)
             .unwrap()
             .abs();

src/svm/search/mod.rs

@@ -1,5 +1,3 @@
-//! SVC and Grid Search
-
 /// SVC search parameters
 pub mod svc_params;
 /// SVC search parameters

src/svm/search/svr_params.rs

@@ -1,293 +1,112 @@
-//! # SVR Grid Search Parameters
-//!
-//! This module provides utilities for defining and iterating over grid search parameter spaces
-//! for Support Vector Regression (SVR) models in [smartcore](https://github.com/smartcorelib/smartcore).
-//!
-//! The main struct, [`SVRSearchParameters`], allows users to specify multiple values for each
-//! SVR hyperparameter (epsilon, regularization parameter C, tolerance, and kernel function).
-//! The provided iterator yields all possible combinations (the Cartesian product) of these parameters,
-//! enabling exhaustive grid search for hyperparameter tuning.
-//!
-//!
-//! ## Example
-//! ```
-//! use smartcore::svm::Kernels;
-//! use smartcore::svm::search::svr_params::SVRSearchParameters;
-//! use smartcore::linalg::basic::matrix::DenseMatrix;
-//!
-//! let params = SVRSearchParameters::<f64, DenseMatrix<f64>> {
-//!     eps: vec![0.1, 0.2],
-//!     c: vec![1.0, 10.0],
-//!     tol: vec![1e-3],
-//!     kernel: vec![Kernels::linear(), Kernels::rbf().with_gamma(0.5)],
-//!     m: std::marker::PhantomData,
-//! };
-//!
-//! // for param_set in params.into_iter() {
-//!     // Use param_set (of type svr::SVRParameters) to fit and evaluate your SVR model.
-//! // }
-//! ```
-//!
-//!
-//! ## Note
-//! This module is intended for use with smartcore version 0.4 or later. The API is not compatible with older versions[1].
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
+// /// SVR grid search parameters
+// #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+// #[derive(Debug, Clone)]
+// pub struct SVRSearchParameters<T: Number + RealNumber, M: Matrix<T>, K: Kernel<T, M::RowVector>> {
+//     /// Epsilon in the epsilon-SVR model.
+//     pub eps: Vec<T>,
+//     /// Regularization parameter.
+//     pub c: Vec<T>,
+//     /// Tolerance for stopping eps.
+//     pub tol: Vec<T>,
+//     /// The kernel function.
+//     pub kernel: Vec<K>,
+//     /// Unused parameter.
+//     m: PhantomData<M>,
+// }
 
-use crate::linalg::basic::arrays::Array2;
-use crate::numbers::basenum::Number;
-use crate::numbers::floatnum::FloatNumber;
-use crate::numbers::realnum::RealNumber;
-use crate::svm::{svr, Kernels};
-use std::marker::PhantomData;
+// /// SVR grid search iterator
+// pub struct SVRSearchParametersIterator<T: Number + RealNumber, M: Matrix<T>, K: Kernel<T, M::RowVector>> {
+//     svr_search_parameters: SVRSearchParameters<T, M, K>,
+//     current_eps: usize,
+//     current_c: usize,
+//     current_tol: usize,
+//     current_kernel: usize,
+// }
 
-/// ## SVR grid search parameters
-/// A struct representing a grid of hyperparameters for SVR grid search in smartcore.
-///
-/// Each field is a vector of possible values for the corresponding SVR hyperparameter.
-/// The [`IntoIterator`] implementation yields every possible combination of these parameters
-/// as an `svr::SVRParameters` struct, suitable for use in model selection routines.
-///
-/// # Type Parameters
-/// - `T`: Numeric type for parameters (e.g., `f64`)
-/// - `M`: Matrix type implementing [`Array2<T>`]
-///
-/// # Fields
-/// - `eps`: Vector of epsilon values for the epsilon-insensitive loss in SVR.
-/// - `c`: Vector of regularization parameters (C) for SVR.
-/// - `tol`: Vector of tolerance values for the stopping criterion.
-/// - `kernel`: Vector of kernel function variants (see [`Kernels`]).
-/// - `m`: Phantom data for the matrix type parameter.
-///
-/// # Example
-/// ```
-/// use smartcore::svm::Kernels;
-/// use smartcore::svm::search::svr_params::SVRSearchParameters;
-/// use smartcore::linalg::basic::matrix::DenseMatrix;
-///
-/// let params = SVRSearchParameters::<f64, DenseMatrix<f64>> {
-///     eps: vec![0.1, 0.2],
-///     c: vec![1.0, 10.0],
-///     tol: vec![1e-3],
-///     kernel: vec![Kernels::linear(), Kernels::rbf().with_gamma(0.5)],
-///     m: std::marker::PhantomData,
-/// };
-/// ```
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone)]
-pub struct SVRSearchParameters<T: Number + RealNumber, M: Array2<T>> {
-    /// Epsilon in the epsilon-SVR model.
-    pub eps: Vec<T>,
-    /// Regularization parameter.
-    pub c: Vec<T>,
-    /// Tolerance for stopping eps.
-    pub tol: Vec<T>,
-    /// The kernel function.
-    pub kernel: Vec<Kernels>,
-    /// Unused parameter.
-    pub m: PhantomData<M>,
-}
+// impl<T: Number + RealNumber, M: Matrix<T>, K: Kernel<T, M::RowVector>> IntoIterator
+//     for SVRSearchParameters<T, M, K>
+// {
+//     type Item = SVRParameters<T, M, K>;
+//     type IntoIter = SVRSearchParametersIterator<T, M, K>;
 
-/// SVR grid search iterator
-pub struct SVRSearchParametersIterator<T: Number + RealNumber, M: Array2<T>> {
-    svr_search_parameters: SVRSearchParameters<T, M>,
-    current_eps: usize,
-    current_c: usize,
-    current_tol: usize,
-    current_kernel: usize,
-}
+//     fn into_iter(self) -> Self::IntoIter {
+//         SVRSearchParametersIterator {
+//             svr_search_parameters: self,
+//             current_eps: 0,
+//             current_c: 0,
+//             current_tol: 0,
+//             current_kernel: 0,
+//         }
+//     }
+// }
 
-impl<T: Number + FloatNumber + RealNumber, M: Array2<T>> IntoIterator
-    for SVRSearchParameters<T, M>
-{
-    type Item = svr::SVRParameters<T>;
-    type IntoIter = SVRSearchParametersIterator<T, M>;
+// impl<T: Number + RealNumber, M: Matrix<T>, K: Kernel<T, M::RowVector>> Iterator
+//     for SVRSearchParametersIterator<T, M, K>
+// {
+//     type Item = SVRParameters<T, M, K>;
 
-    fn into_iter(self) -> Self::IntoIter {
-        SVRSearchParametersIterator {
-            svr_search_parameters: self,
-            current_eps: 0,
-            current_c: 0,
-            current_tol: 0,
-            current_kernel: 0,
-        }
-    }
-}
+//     fn next(&mut self) -> Option<Self::Item> {
+//         if self.current_eps == self.svr_search_parameters.eps.len()
+//             && self.current_c == self.svr_search_parameters.c.len()
+//             && self.current_tol == self.svr_search_parameters.tol.len()
+//             && self.current_kernel == self.svr_search_parameters.kernel.len()
+//         {
+//             return None;
+//         }
 
-impl<T: Number + FloatNumber + RealNumber, M: Array2<T>> Iterator
-    for SVRSearchParametersIterator<T, M>
-{
-    type Item = svr::SVRParameters<T>;
+//         let next = SVRParameters::<T, M, K> {
+//             eps: self.svr_search_parameters.eps[self.current_eps],
+//             c: self.svr_search_parameters.c[self.current_c],
+//             tol: self.svr_search_parameters.tol[self.current_tol],
+//             kernel: self.svr_search_parameters.kernel[self.current_kernel].clone(),
+//             m: PhantomData,
+//         };
 
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.current_eps == self.svr_search_parameters.eps.len()
-            && self.current_c == self.svr_search_parameters.c.len()
-            && self.current_tol == self.svr_search_parameters.tol.len()
-            && self.current_kernel == self.svr_search_parameters.kernel.len()
-        {
-            return None;
-        }
+//         if self.current_eps + 1 < self.svr_search_parameters.eps.len() {
+//             self.current_eps += 1;
+//         } else if self.current_c + 1 < self.svr_search_parameters.c.len() {
+//             self.current_eps = 0;
+//             self.current_c += 1;
+//         } else if self.current_tol + 1 < self.svr_search_parameters.tol.len() {
+//             self.current_eps = 0;
+//             self.current_c = 0;
+//             self.current_tol += 1;
+//         } else if self.current_kernel + 1 < self.svr_search_parameters.kernel.len() {
+//             self.current_eps = 0;
+//             self.current_c = 0;
+//             self.current_tol = 0;
+//             self.current_kernel += 1;
+//         } else {
+//             self.current_eps += 1;
+//             self.current_c += 1;
+//             self.current_tol += 1;
+//             self.current_kernel += 1;
+//         }
 
-        let next = svr::SVRParameters::<T> {
-            eps: self.svr_search_parameters.eps[self.current_eps],
-            c: self.svr_search_parameters.c[self.current_c],
-            tol: self.svr_search_parameters.tol[self.current_tol],
-            kernel: Some(self.svr_search_parameters.kernel[self.current_kernel].clone()),
-        };
+//         Some(next)
+//     }
+// }
 
-        if self.current_eps + 1 < self.svr_search_parameters.eps.len() {
-            self.current_eps += 1;
-        } else if self.current_c + 1 < self.svr_search_parameters.c.len() {
-            self.current_eps = 0;
-            self.current_c += 1;
-        } else if self.current_tol + 1 < self.svr_search_parameters.tol.len() {
-            self.current_eps = 0;
-            self.current_c = 0;
-            self.current_tol += 1;
-        } else if self.current_kernel + 1 < self.svr_search_parameters.kernel.len() {
-            self.current_eps = 0;
-            self.current_c = 0;
-            self.current_tol = 0;
-            self.current_kernel += 1;
-        } else {
-            self.current_eps += 1;
-            self.current_c += 1;
-            self.current_tol += 1;
-            self.current_kernel += 1;
-        }
+// impl<T: Number + RealNumber, M: Matrix<T>> Default for SVRSearchParameters<T, M, LinearKernel> {
+//     fn default() -> Self {
+//         let default_params: SVRParameters<T, M, LinearKernel> = SVRParameters::default();
 
-        Some(next)
-    }
-}
+//         SVRSearchParameters {
+//             eps: vec![default_params.eps],
+//             c: vec![default_params.c],
+//             tol: vec![default_params.tol],
+//             kernel: vec![default_params.kernel],
+//             m: PhantomData,
+//         }
+//     }
+// }
 
-impl<T: Number + FloatNumber + RealNumber, M: Array2<T>> Default for SVRSearchParameters<T, M> {
-    fn default() -> Self {
-        let default_params: svr::SVRParameters<T> = svr::SVRParameters::default();
-
-        SVRSearchParameters {
-            eps: vec![default_params.eps],
-            c: vec![default_params.c],
-            tol: vec![default_params.tol],
-            kernel: vec![default_params.kernel.unwrap_or_else(Kernels::linear)],
-            m: PhantomData,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::linalg::basic::matrix::DenseMatrix;
-    use crate::svm::Kernels;
-
-    type T = f64;
-    type M = DenseMatrix<T>;
-
-    #[test]
-    fn test_default_parameters() {
-        let params = SVRSearchParameters::<T, M>::default();
-        assert_eq!(params.eps.len(), 1);
-        assert_eq!(params.c.len(), 1);
-        assert_eq!(params.tol.len(), 1);
-        assert_eq!(params.kernel.len(), 1);
-        // Check that the default kernel is linear
-        assert_eq!(params.kernel[0], Kernels::linear());
-    }
-
-    #[test]
-    fn test_single_grid_iteration() {
-        let params = SVRSearchParameters::<T, M> {
-            eps: vec![0.1],
-            c: vec![1.0],
-            tol: vec![1e-3],
-            kernel: vec![Kernels::rbf().with_gamma(0.5)],
-            m: PhantomData,
-        };
-        let mut iter = params.into_iter();
-        let param = iter.next().unwrap();
-        assert_eq!(param.eps, 0.1);
-        assert_eq!(param.c, 1.0);
-        assert_eq!(param.tol, 1e-3);
-        assert_eq!(param.kernel, Some(Kernels::rbf().with_gamma(0.5)));
-        assert!(iter.next().is_none());
-    }
-
-    #[test]
-    fn test_cartesian_grid_iteration() {
-        let params = SVRSearchParameters::<T, M> {
-            eps: vec![0.1, 0.2],
-            c: vec![1.0, 2.0],
-            tol: vec![1e-3],
-            kernel: vec![Kernels::linear(), Kernels::rbf().with_gamma(0.5)],
-            m: PhantomData,
-        };
-        let expected_count =
-            params.eps.len() * params.c.len() * params.tol.len() * params.kernel.len();
-        let results: Vec<_> = params.into_iter().collect();
-        assert_eq!(results.len(), expected_count);
-
-        // Check that all parameter combinations are present
-        let mut seen = vec![];
-        for p in &results {
-            seen.push((p.eps, p.c, p.tol, p.kernel.clone().unwrap()));
-        }
-        for &eps in &[0.1, 0.2] {
-            for &c in &[1.0, 2.0] {
-                for &tol in &[1e-3] {
-                    for kernel in &[Kernels::linear(), Kernels::rbf().with_gamma(0.5)] {
-                        assert!(seen.contains(&(eps, c, tol, kernel.clone())));
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn test_empty_grid() {
-        let params = SVRSearchParameters::<T, M> {
-            eps: vec![],
-            c: vec![],
-            tol: vec![],
-            kernel: vec![],
-            m: PhantomData,
-        };
-        let mut iter = params.into_iter();
-        assert!(iter.next().is_none());
-    }
-
-    #[test]
-    fn test_kernel_enum_variants() {
-        let lin = Kernels::linear();
-        let rbf = Kernels::rbf().with_gamma(0.2);
-        let poly = Kernels::polynomial()
-            .with_degree(2.0)
-            .with_gamma(1.0)
-            .with_coef0(0.5);
-        let sig = Kernels::sigmoid().with_gamma(0.3).with_coef0(0.1);
-
-        assert_eq!(lin, Kernels::Linear);
-        match rbf {
-            Kernels::RBF { gamma } => assert_eq!(gamma, Some(0.2)),
-            _ => panic!("Not RBF"),
-        }
-        match poly {
-            Kernels::Polynomial {
-                degree,
-                gamma,
-                coef0,
-            } => {
-                assert_eq!(degree, Some(2.0));
-                assert_eq!(gamma, Some(1.0));
-                assert_eq!(coef0, Some(0.5));
-            }
-            _ => panic!("Not Polynomial"),
-        }
-        match sig {
-            Kernels::Sigmoid { gamma, coef0 } => {
-                assert_eq!(gamma, Some(0.3));
-                assert_eq!(coef0, Some(0.1));
-            }
-            _ => panic!("Not Sigmoid"),
-        }
-    }
-}
+// #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+// #[derive(Debug)]
+// #[cfg_attr(
+//     feature = "serde",
+//     serde(bound(
+//         serialize = "M::RowVector: Serialize, K: Serialize, T: Serialize",
+//         deserialize = "M::RowVector: Deserialize<'de>, K: Deserialize<'de>, T: Deserialize<'de>",
+//     ))
+// )]

src/svm/svc.rs

@@ -58,11 +58,10 @@
 //!            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
 //!
 //! let knl = Kernels::linear();
-//! let parameters = &SVCParameters::default().with_c(200.0).with_kernel(knl);
-//! let svc = SVC::fit(&x, &y, parameters).unwrap();
+//! let params = &SVCParameters::default().with_c(200.0).with_kernel(knl);
+//! let svc = SVC::fit(&x, &y, params).unwrap();
 //!
 //! let y_hat = svc.predict(&x).unwrap();
-//!
 //! ```
 //!
 //! ## References:
@@ -85,194 +84,12 @@ use serde::{Deserialize, Serialize};
 
 use crate::api::{PredictorBorrow, SupervisedEstimatorBorrow};
 use crate::error::{Failed, FailedError};
-use crate::linalg::basic::arrays::{Array, Array1, Array2, MutArray};
+use crate::linalg::basic::arrays::{Array1, Array2, MutArray};
 use crate::numbers::basenum::Number;
 use crate::numbers::realnum::RealNumber;
 use crate::rand_custom::get_rng_impl;
 use crate::svm::Kernel;
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
-/// Configuration for a multi-class Support Vector Machine (SVM) classifier.
-/// This struct holds the indices of the data points relevant to a specific binary
-/// classification problem within a multi-class context, and the two classes
-/// being discriminated.
-struct MultiClassConfig<TY: Number + Ord> {
-    /// The indices of the data points from the original dataset that belong to the two `classes`.
-    indices: Vec<usize>,
-    /// A tuple representing the two classes that this configuration is designed to distinguish.
-    classes: (TY, TY),
-}
-
-impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>>
-    SupervisedEstimatorBorrow<'a, X, Y, SVCParameters<TX, TY, X, Y>>
-    for MultiClassSVC<'a, TX, TY, X, Y>
-{
-    /// Creates a new, empty `MultiClassSVC` instance.
-    fn new() -> Self {
-        Self {
-            classifiers: Option::None,
-        }
-    }
-
-    /// Fits the `MultiClassSVC` model to the provided data and parameters.
-    ///
-    /// This method delegates the fitting process to the inherent `MultiClassSVC::fit` method.
-    ///
-    /// # Arguments
-    /// * `x` - A reference to the input features (2D array).
-    /// * `y` - A reference to the target labels (1D array).
-    /// * `parameters` - A reference to the `SVCParameters` controlling the SVM training.
-    ///
-    /// # Returns
-    /// A `Result` indicating success (`Self`) or failure (`Failed`).
-    fn fit(
-        x: &'a X,
-        y: &'a Y,
-        parameters: &'a SVCParameters<TX, TY, X, Y>,
-    ) -> Result<Self, Failed> {
-        MultiClassSVC::fit(x, y, parameters)
-    }
-}
-
-impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>>
-    PredictorBorrow<'a, X, TX> for MultiClassSVC<'a, TX, TY, X, Y>
-{
-    /// Predicts the class labels for new data points.
-    ///
-    /// This method delegates the prediction process to the inherent `MultiClassSVC::predict` method.
-    ///
-    /// # Arguments
-    /// * `x` - A reference to the input features (2D array) for which to make predictions.
-    ///
-    /// # Returns
-    /// A `Result` containing a `Vec` of predicted class labels (`TX`) or a `Failed` error.
-    fn predict(&self, x: &'a X) -> Result<Vec<TX>, Failed> {
-        Ok(self.predict(x).unwrap())
-    }
-}
-
-/// A multi-class Support Vector Machine (SVM) classifier.
-///
-/// This struct implements a multi-class SVM using the "one-vs-one" strategy,
-/// where a separate binary SVC classifier is trained for every pair of classes.
-///
-/// # Type Parameters
-/// * `'a` - Lifetime parameter for borrowed data.
-/// * `TX` - The numeric type of the input features (must implement `Number` and `RealNumber`).
-/// * `TY` - The numeric type of the target labels (must implement `Number` and `Ord`).
-/// * `X` - The type representing the 2D array of input features (e.g., a matrix).
-/// * `Y` - The type representing the 1D array of target labels (e.g., a vector).
-pub struct MultiClassSVC<
-    'a,
-    TX: Number + RealNumber,
-    TY: Number + Ord,
-    X: Array2<TX>,
-    Y: Array1<TY>,
-> {
-    /// An optional vector of binary `SVC` classifiers.
-    classifiers: Option<Vec<SVC<'a, TX, TY, X, Y>>>,
-}
-
-impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>>
-    MultiClassSVC<'a, TX, TY, X, Y>
-{
-    /// Fits the `MultiClassSVC` model to the provided data using a one-vs-one strategy.
-    ///
-    /// This method identifies all unique classes in the target labels `y` and then
-    /// trains a binary `SVC` for every unique pair of classes. For each pair, it
-    /// extracts the relevant data points and their labels, and then trains a
-    /// specialized `SVC` for that binary classification task.
-    ///
-    /// # Arguments
-    /// * `x` - A reference to the input features (2D array).
-    /// * `y` - A reference to the target labels (1D array).
-    /// * `parameters` - A reference to the `SVCParameters` controlling the SVM training for each individual binary classifier.
-    ///  
-    ///
-    /// # Returns
-    /// A `Result` indicating success (`MultiClassSVC`) or failure (`Failed`).
-    pub fn fit(
-        x: &'a X,
-        y: &'a Y,
-        parameters: &'a SVCParameters<TX, TY, X, Y>,
-    ) -> Result<MultiClassSVC<'a, TX, TY, X, Y>, Failed> {
-        let unique_classes = y.unique();
-        let mut classifiers = Vec::new();
-        // Iterate through all unique pairs of classes (one-vs-one strategy)
-        for i in 0..unique_classes.len() {
-            for j in i..unique_classes.len() {
-                if i == j {
-                    continue;
-                }
-                let class0 = unique_classes[j];
-                let class1 = unique_classes[i];
-
-                let mut indices = Vec::new();
-                // Collect indices of data points belonging to the current pair of classes
-                for (index, v) in y.iterator(0).enumerate() {
-                    if *v == class0 || *v == class1 {
-                        indices.push(index)
-                    }
-                }
-                let classes = (class0, class1);
-                let multiclass_config = MultiClassConfig { classes, indices };
-                // Fit a binary SVC for the current pair of classes
-                let svc = SVC::multiclass_fit(x, y, parameters, multiclass_config).unwrap();
-                classifiers.push(svc);
-            }
-        }
-        Ok(Self {
-            classifiers: Some(classifiers),
-        })
-    }
-
-    /// Predicts the class labels for new data points using the trained multi-class SVM.
-    ///
-    /// This method uses a "voting" scheme (majority vote) among all the binary
-    /// classifiers to determine the final prediction for each data point.
-    ///
-    /// # Arguments
-    /// * `x` - A reference to the input features (2D array) for which to make predictions.
-    ///
-    /// # Returns
-    /// A `Result` containing a `Vec` of predicted class labels (`TX`) or a `Failed` error.
-    ///
-    pub fn predict(&self, x: &X) -> Result<Vec<TX>, Failed> {
-        // Initialize a HashMap for each data point to store votes for each class
-        let mut polls = vec![HashMap::new(); x.shape().0];
-        // Retrieve the trained binary classifiers
-        let classifiers = self.classifiers.as_ref().unwrap();
-
-        // Iterate through each binary classifier
-        for i in 0..classifiers.len() {
-            let svc = classifiers.get(i).unwrap();
-            let predictions = svc.predict(x).unwrap(); // call SVC::predict for each binary classifier
-
-            // For each prediction from the current binary classifier
-            for (j, prediction) in predictions.iter().enumerate() {
-                let prediction = prediction.to_i32().unwrap();
-                let poll = polls.get_mut(j).unwrap(); // Get the poll for the current data point
-                                                      // Increment the vote for the predicted class
-                if let Some(count) = poll.get_mut(&prediction) {
-                    *count += 1
-                } else {
-                    poll.insert(prediction, 1);
-                }
-            }
-        }
-
-        // Determine the final prediction for each data point based on majority vote
-        Ok(polls
-            .iter()
-            .map(|v| {
-                // Find the class with the maximum votes for each data point
-                TX::from(*v.iter().max_by_key(|(_, class)| *class).unwrap().0).unwrap()
-            })
-            .collect())
-    }
-}
-
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug)]
 /// SVC Parameters
@@ -306,7 +123,7 @@ pub struct SVCParameters<TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX
 )]
 /// Support Vector Classifier
 pub struct SVC<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>> {
-    classes: Option<(TY, TY)>,
+    classes: Option<Vec<TY>>,
     instances: Option<Vec<Vec<TX>>>,
     #[cfg_attr(feature = "serde", serde(skip))]
     parameters: Option<&'a SVCParameters<TX, TY, X, Y>>,
@@ -335,9 +152,7 @@ struct Cache<TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1
 struct Optimizer<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>> {
     x: &'a X,
     y: &'a Y,
-    indices: Option<Vec<usize>>,
     parameters: &'a SVCParameters<TX, TY, X, Y>,
-    classes: &'a (TY, TY),
     svmin: usize,
     svmax: usize,
     gmin: TX,
@@ -365,12 +180,12 @@ impl<TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>>
         self.tol = tol;
         self
     }
-
     /// The kernel function.
     pub fn with_kernel<K: Kernel + 'static>(mut self, kernel: K) -> Self {
         self.kernel = Some(Box::new(kernel));
         self
     }
+
     /// Seed for the pseudo random number generator.
     pub fn with_seed(mut self, seed: Option<u64>) -> Self {
         self.seed = seed;
@@ -426,98 +241,17 @@ impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>
 impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX> + 'a, Y: Array1<TY> + 'a>
     SVC<'a, TX, TY, X, Y>
 {
-    /// Fits a binary Support Vector Classifier (SVC) to the provided data.
-    ///
-    /// This is the primary `fit` method for a standalone binary SVC. It expects
-    /// the target labels `y` to contain exactly two unique classes. If more or
-    /// fewer than two classes are found, it returns an error. It then extracts
-    /// these two classes and proceeds to optimize and fit the SVC model.
-    ///
-    /// # Arguments
-    /// * `x` - A reference to the input features (2D array) of the training data.
-    /// * `y` - A reference to the target labels (1D array) of the training data. `y` must contain exactly two unique class labels.
-    /// * `parameters` - A reference to the `SVCParameters` controlling the training process.
-    ///
-    /// # Returns
-    /// A `Result` which is:
-    /// - `Ok(SVC<'a, TX, TY, X, Y>)`: A new, fitted binary SVC instance.
-    /// - `Err(Failed)`: If the number of unique classes in `y` is not exactly two, or if the underlying optimization fails.
+    /// Fits SVC to your data.
+    /// * `x` - _NxM_ matrix with _N_ observations and _M_ features in each observation.
+    /// * `y` - class labels
+    /// * `parameters` - optional parameters, use `Default::default()` to set parameters to default values.
     pub fn fit(
         x: &'a X,
         y: &'a Y,
         parameters: &'a SVCParameters<TX, TY, X, Y>,
     ) -> Result<SVC<'a, TX, TY, X, Y>, Failed> {
-        let classes = y.unique();
-        // Validate that there are exactly two unique classes in the target labels.
-        if classes.len() != 2 {
-            return Err(Failed::fit(&format!(
-                "Incorrect number of classes: {}. A binary SVC requires exactly two classes.",
-                classes.len()
-            )));
-        }
-        let classes = (classes[0], classes[1]);
-        let svc = Self::optimize_and_fit(x, y, parameters, classes, None);
-        svc
-    }
+        let (n, _) = x.shape();
 
-    /// Fits a binary Support Vector Classifier (SVC) specifically for multi-class scenarios.
-    ///
-    /// This function is intended to be called by a multi-class strategy (e.g., one-vs-one)
-    /// to train individual binary SVCs. It takes a `MultiClassConfig` which specifies
-    /// the two classes this SVC should discriminate and the subset of data indices
-    /// relevant to these classes. It then delegates the actual optimization and fitting
-    /// to `optimize_and_fit`.
-    ///
-    /// # Arguments
-    /// * `x` - A reference to the input features (2D array) of the training data.
-    /// * `y` - A reference to the target labels (1D array) of the training data.
-    /// * `parameters` - A reference to the `SVCParameters` controlling the training process (e.g., kernel, C-value, tolerance).
-    /// * `multiclass_config` - A `MultiClassConfig` struct containing:
-    ///     - `classes`: A tuple `(class0, class1)` specifying the two classes this SVC should distinguish.
-    ///     - `indices`: A `Vec<usize>` containing the indices of the data points in `x` and `y that belong to either `class0` or `class1`.`
-    ///
-    /// # Returns
-    /// A `Result` which is:
-    /// - `Ok(SVC<'a, TX, TY, X, Y>)`: A new, fitted binary SVC instance.
-    /// - `Err(Failed)`: If the fitting process encounters an error (e.g., invalid parameters).
-    fn multiclass_fit(
-        x: &'a X,
-        y: &'a Y,
-        parameters: &'a SVCParameters<TX, TY, X, Y>,
-        multiclass_config: MultiClassConfig<TY>,
-    ) -> Result<SVC<'a, TX, TY, X, Y>, Failed> {
-        let classes = multiclass_config.classes;
-        let indices = multiclass_config.indices;
-        let svc = Self::optimize_and_fit(x, y, parameters, classes, Some(indices));
-        svc
-    }
-
-    /// Internal function to optimize and fit the Support Vector Classifier.
-    ///
-    /// This is the core logic for training a binary SVC. It performs several checks
-    /// (e.g., kernel presence, data shape consistency) and then initializes an
-    /// `Optimizer` to find the support vectors, weights (`w`), and bias (`b`).
-    ///
-    /// # Arguments
-    /// * `x` - A reference to the input features (2D array) of the training data.
-    /// * `y` - A reference to the target labels (1D array) of the training data.
-    /// * `parameters` - A reference to the `SVCParameters` defining the SVM model's configuration.
-    /// * `classes` - A tuple `(class0, class1)` representing the two distinct class labels that the SVC will learn to separate.
-    /// * `indices` - An `Option<Vec<usize>>`. If `Some`, it contains the specific indices of data points from `x` and `y` that should be used for training this binary classifier. If `None`, all data points in `x` and `y` are considered.
-    /// # Returns
-    /// A `Result` which is:
-    /// - `Ok(SVC<'a, TX, TY, X, Y>)`: A new `SVC` instance populated with the learned model components (support vectors, weights, bias).
-    /// - `Err(Failed)`: If any of the validation checks fail (e.g., missing kernel, mismatched data shapes), or if the optimization process fails.
-    fn optimize_and_fit(
-        x: &'a X,
-        y: &'a Y,
-        parameters: &'a SVCParameters<TX, TY, X, Y>,
-        classes: (TY, TY),
-        indices: Option<Vec<usize>>,
-    ) -> Result<SVC<'a, TX, TY, X, Y>, Failed> {
-        let (n_samples, _) = x.shape();
-
-        // Validate that a kernel has been defined in the parameters.
         if parameters.kernel.is_none() {
             return Err(Failed::because(
                 FailedError::ParametersError,
@@ -525,39 +259,55 @@ impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX> + 'a, Y: Array
             ));
         }
 
-        // Validate that the number of samples in X matches the number of labels in Y.
-        if n_samples != y.shape() {
+        if n != y.shape() {
             return Err(Failed::fit(
-                "Number of rows of X doesn't match number of rows of Y",
+                "Number of rows of X doesn\'t match number of rows of Y",
             ));
         }
 
-        let optimizer: Optimizer<'_, TX, TY, X, Y> =
-            Optimizer::new(x, y, indices, parameters, &classes);
+        let classes = y.unique();
+
+        if classes.len() != 2 {
+            return Err(Failed::fit(&format!(
+                "Incorrect number of classes: {}",
+                classes.len()
+            )));
+        }
+
+        // Make sure class labels are either 1 or -1
+        for e in y.iterator(0) {
+            let y_v = e.to_i32().unwrap();
+            if y_v != -1 && y_v != 1 {
+                return Err(Failed::because(
+                    FailedError::ParametersError,
+                    "Class labels must be 1 or -1",
+                ));
+            }
+        }
+
+        let optimizer: Optimizer<'_, TX, TY, X, Y> = Optimizer::new(x, y, parameters);
 
-        // Perform the optimization to find the support vectors, weight vector, and bias.
-        // This is where the core SVM algorithm (e.g., SMO) would run.
         let (support_vectors, weight, b) = optimizer.optimize();
 
-        // Construct and return the fitted SVC model.
         Ok(SVC::<'a> {
-            classes: Some(classes), // Store the two classes the SVC was trained on.
-            instances: Some(support_vectors), // Store the data points that are support vectors.
-            parameters: Some(parameters), // Reference to the parameters used for fitting.
-            w: Some(weight),        // The learned weight vector (for linear kernels).
-            b: Some(b),             // The learned bias term.
-            phantomdata: PhantomData, // Placeholder for type parameters not directly stored.
+            classes: Some(classes),
+            instances: Some(support_vectors),
+            parameters: Some(parameters),
+            w: Some(weight),
+            b: Some(b),
+            phantomdata: PhantomData,
         })
     }
+
     /// Predicts estimated class labels from `x`
     /// * `x` - _KxM_ data where _K_ is number of observations and _M_ is number of features.
     pub fn predict(&self, x: &'a X) -> Result<Vec<TX>, Failed> {
         let mut y_hat: Vec<TX> = self.decision_function(x)?;
 
         for i in 0..y_hat.len() {
-            let cls_idx = match *y_hat.get(i) > TX::zero() {
-                false => TX::from(self.classes.as_ref().unwrap().0).unwrap(),
-                true => TX::from(self.classes.as_ref().unwrap().1).unwrap(),
+            let cls_idx = match *y_hat.get(i).unwrap() > TX::zero() {
+                false => TX::from(self.classes.as_ref().unwrap()[0]).unwrap(),
+                true => TX::from(self.classes.as_ref().unwrap()[1]).unwrap(),
             };
 
             y_hat.set(i, cls_idx);
@@ -695,18 +445,14 @@ impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>
     fn new(
         x: &'a X,
         y: &'a Y,
-        indices: Option<Vec<usize>>,
         parameters: &'a SVCParameters<TX, TY, X, Y>,
-        classes: &'a (TY, TY),
     ) -> Optimizer<'a, TX, TY, X, Y> {
         let (n, _) = x.shape();
 
         Optimizer {
             x,
             y,
-            indices,
             parameters,
-            classes,
             svmin: 0,
             svmax: 0,
             gmin: <TX as Bounded>::max_value(),
@@ -732,12 +478,7 @@ impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>
             for i in self.permutate(n) {
                 x.clear();
                 x.extend(self.x.get_row(i).iterator(0).take(n).copied());
-                let y = if *self.y.get(i) == self.classes.1 {
-                    1
-                } else {
-                    -1
-                } as f64;
-                self.process(i, &x, y, &mut cache);
+                self.process(i, &x, *self.y.get(i), &mut cache);
                 loop {
                     self.reprocess(tol, &mut cache);
                     self.find_min_max_gradient();
@@ -773,16 +514,14 @@ impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>
         for i in self.permutate(n) {
             x.clear();
             x.extend(self.x.get_row(i).iterator(0).take(n).copied());
-            let y = if *self.y.get(i) == self.classes.1 {
-                1
-            } else {
-                -1
-            } as f64;
-            if y == 1.0 && cp < few {
-                if self.process(i, &x, y, cache) {
+            if *self.y.get(i) == TY::one() && cp < few {
+                if self.process(i, &x, *self.y.get(i), cache) {
                     cp += 1;
                 }
-            } else if y == -1.0 && cn < few && self.process(i, &x, y, cache) {
+            } else if *self.y.get(i) == TY::from(-1).unwrap()
+                && cn < few
+                && self.process(i, &x, *self.y.get(i), cache)
+            {
                 cn += 1;
             }
 
@@ -792,14 +531,14 @@ impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>
         }
     }
 
-    fn process(&mut self, i: usize, x: &[TX], y: f64, cache: &mut Cache<TX, TY, X, Y>) -> bool {
+    fn process(&mut self, i: usize, x: &[TX], y: TY, cache: &mut Cache<TX, TY, X, Y>) -> bool {
         for j in 0..self.sv.len() {
             if self.sv[j].index == i {
                 return true;
             }
         }
 
-        let mut g = y;
+        let mut g: f64 = y.to_f64().unwrap();
 
         let mut cache_values: Vec<((usize, usize), TX)> = Vec::new();
 
@@ -820,8 +559,8 @@ impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>
         self.find_min_max_gradient();
 
         if self.gmin < self.gmax
-            && ((y > 0.0 && g < self.gmin.to_f64().unwrap())
-                || (y < 0.0 && g > self.gmax.to_f64().unwrap()))
+            && ((y > TY::zero() && g < self.gmin.to_f64().unwrap())
+                || (y < TY::zero() && g > self.gmax.to_f64().unwrap()))
         {
             return false;
         }
@@ -851,7 +590,7 @@ impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>
             ),
         );
 
-        if y > 0.0 {
+        if y > TY::zero() {
             self.smo(None, Some(0), TX::zero(), cache);
         } else {
             self.smo(Some(0), None, TX::zero(), cache);
@@ -908,6 +647,7 @@ impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>
         let gmin = self.gmin;
 
         let mut idxs_to_drop: HashSet<usize> = HashSet::new();
+
         self.sv.retain(|v| {
             if v.alpha == 0f64
                 && ((TX::from(v.grad).unwrap() >= gmax && TX::zero() >= TX::from(v.cmax).unwrap())
@@ -926,11 +666,7 @@ impl<'a, TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>
 
     fn permutate(&self, n: usize) -> Vec<usize> {
         let mut rng = get_rng_impl(self.parameters.seed);
-        let mut range = if let Some(indices) = self.indices.clone() {
-            indices
-        } else {
-            (0..n).collect::<Vec<usize>>()
-        };
+        let mut range: Vec<usize> = (0..n).collect();
         range.shuffle(&mut rng);
         range
     }
@@ -1229,12 +965,12 @@ mod tests {
         ];
 
         let knl = Kernels::linear();
-        let parameters = SVCParameters::default()
+        let params = SVCParameters::default()
             .with_c(200.0)
             .with_kernel(knl)
             .with_seed(Some(100));
 
-        let y_hat = SVC::fit(&x, &y, &parameters)
+        let y_hat = SVC::fit(&x, &y, &params)
             .and_then(|lr| lr.predict(&x))
             .unwrap();
         let acc = accuracy(&y, &(y_hat.iter().map(|e| e.to_i32().unwrap()).collect()));
@@ -1334,56 +1070,6 @@ mod tests {
         assert!(acc >= 0.9, "accuracy ({acc}) is not larger or equal to 0.9");
     }
 
-    #[cfg_attr(
-        all(target_arch = "wasm32", not(target_os = "wasi")),
-        wasm_bindgen_test::wasm_bindgen_test
-    )]
-    #[test]
-    fn svc_multiclass_fit_predict() {
-        let x = DenseMatrix::from_2d_array(&[
-            &[5.1, 3.5, 1.4, 0.2],
-            &[4.9, 3.0, 1.4, 0.2],
-            &[4.7, 3.2, 1.3, 0.2],
-            &[4.6, 3.1, 1.5, 0.2],
-            &[5.0, 3.6, 1.4, 0.2],
-            &[5.4, 3.9, 1.7, 0.4],
-            &[4.6, 3.4, 1.4, 0.3],
-            &[5.0, 3.4, 1.5, 0.2],
-            &[4.4, 2.9, 1.4, 0.2],
-            &[4.9, 3.1, 1.5, 0.1],
-            &[7.0, 3.2, 4.7, 1.4],
-            &[6.4, 3.2, 4.5, 1.5],
-            &[6.9, 3.1, 4.9, 1.5],
-            &[5.5, 2.3, 4.0, 1.3],
-            &[6.5, 2.8, 4.6, 1.5],
-            &[5.7, 2.8, 4.5, 1.3],
-            &[6.3, 3.3, 4.7, 1.6],
-            &[4.9, 2.4, 3.3, 1.0],
-            &[6.6, 2.9, 4.6, 1.3],
-            &[5.2, 2.7, 3.9, 1.4],
-        ])
-        .unwrap();
-
-        let y: Vec<i32> = vec![0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2];
-
-        let knl = Kernels::linear();
-        let parameters = SVCParameters::default()
-            .with_c(200.0)
-            .with_kernel(knl)
-            .with_seed(Some(100));
-
-        let y_hat = MultiClassSVC::fit(&x, &y, &parameters)
-            .and_then(|lr| lr.predict(&x))
-            .unwrap();
-
-        let acc = accuracy(&y, &(y_hat.iter().map(|e| e.to_i32().unwrap()).collect()));
-
-        assert!(
-            acc >= 0.9,
-            "Multiclass accuracy ({acc}) is not larger or equal to 0.9"
-        );
-    }
-
     #[cfg_attr(
         all(target_arch = "wasm32", not(target_os = "wasi")),
         wasm_bindgen_test::wasm_bindgen_test
@@ -1420,8 +1106,8 @@ mod tests {
         ];
 
         let knl = Kernels::linear();
-        let parameters = SVCParameters::default().with_kernel(knl);
-        let svc = SVC::fit(&x, &y, &parameters).unwrap();
+        let params = SVCParameters::default().with_kernel(knl);
+        let svc = SVC::fit(&x, &y, &params).unwrap();
 
         // serialization
         let deserialized_svc: SVC<'_, f64, i32, _, _> =

src/svm/svr.rs

@@ -51,9 +51,9 @@
 //!
 //! let knl = Kernels::linear();
 //! let params = &SVRParameters::default().with_eps(2.0).with_c(10.0).with_kernel(knl);
-//! let svr = SVR::fit(&x, &y, params).unwrap();
+//! // let svr = SVR::fit(&x, &y, params).unwrap();
 //!
-//! let y_hat = svr.predict(&x).unwrap();
+//! // let y_hat = svr.predict(&x).unwrap();
 //! ```
 //!
 //! ## References:
@@ -80,12 +80,11 @@ use crate::error::{Failed, FailedError};
 use crate::linalg::basic::arrays::{Array1, Array2, MutArray};
 use crate::numbers::basenum::Number;
 use crate::numbers::floatnum::FloatNumber;
+use crate::svm::Kernel;
 
-use crate::svm::{Kernel, Kernels};
-
-/// SVR Parameters
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug)]
+/// SVR Parameters
 pub struct SVRParameters<T: Number + FloatNumber + PartialOrd> {
     /// Epsilon in the epsilon-SVR model.
     pub eps: T,
@@ -98,7 +97,7 @@ pub struct SVRParameters<T: Number + FloatNumber + PartialOrd> {
         all(feature = "serde", target_arch = "wasm32"),
         serde(skip_serializing, skip_deserializing)
     )]
-    pub kernel: Option<Kernels>,
+    pub kernel: Option<Box<dyn Kernel>>,
 }
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
@@ -161,8 +160,8 @@ impl<T: Number + FloatNumber + PartialOrd> SVRParameters<T> {
         self
     }
     /// The kernel function.
-    pub fn with_kernel(mut self, kernel: Kernels) -> Self {
-        self.kernel = Some(kernel);
+    pub fn with_kernel<K: Kernel + 'static>(mut self, kernel: K) -> Self {
+        self.kernel = Some(Box::new(kernel));
         self
     }
 }
@@ -598,25 +597,25 @@ mod tests {
     use super::*;
     use crate::linalg::basic::matrix::DenseMatrix;
     use crate::metrics::mean_squared_error;
-    use crate::svm::search::svr_params::SVRSearchParameters;
     use crate::svm::Kernels;
 
-    #[test]
-    fn search_parameters() {
-        let parameters: SVRSearchParameters<f64, DenseMatrix<f64>> = SVRSearchParameters {
-            eps: vec![0., 1.],
-            kernel: vec![Kernels::linear()],
-            ..Default::default()
-        };
-        let mut iter = parameters.into_iter();
-        let next = iter.next().unwrap();
-        assert_eq!(next.eps, 0.);
-        // assert_eq!(next.kernel, LinearKernel {});
-        // let next = iter.next().unwrap();
-        // assert_eq!(next.eps, 1.);
-        // assert_eq!(next.kernel, LinearKernel {});
-        // assert!(iter.next().is_none());
-    }
+    // #[test]
+    // fn search_parameters() {
+    //     let parameters: SVRSearchParameters<f64, DenseMatrix<f64>, LinearKernel> =
+    //         SVRSearchParameters {
+    //             eps: vec![0., 1.],
+    //             kernel: vec![LinearKernel {}],
+    //             ..Default::default()
+    //         };
+    //     let mut iter = parameters.into_iter();
+    //     let next = iter.next().unwrap();
+    //     assert_eq!(next.eps, 0.);
+    //     assert_eq!(next.kernel, LinearKernel {});
+    //     let next = iter.next().unwrap();
+    //     assert_eq!(next.eps, 1.);
+    //     assert_eq!(next.kernel, LinearKernel {});
+    //     assert!(iter.next().is_none());
+    // }
 
     #[cfg_attr(
         all(target_arch = "wasm32", not(target_os = "wasi")),
@@ -649,7 +648,7 @@ mod tests {
             114.2, 115.7, 116.9,
         ];
 
-        let knl: Kernels = Kernels::linear();
+        let knl = Kernels::linear();
         let y_hat = SVR::fit(
             &x,
             &y,

src/tree/base_tree_regressor.rs

@@ -1,551 +0,0 @@
-use std::collections::LinkedList;
-use std::default::Default;
-use std::fmt::Debug;
-use std::marker::PhantomData;
-
-use rand::seq::SliceRandom;
-use rand::Rng;
-
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-use crate::error::Failed;
-use crate::linalg::basic::arrays::{Array1, Array2, MutArrayView1};
-use crate::numbers::basenum::Number;
-use crate::rand_custom::get_rng_impl;
-
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone, Default)]
-pub enum Splitter {
-    Random,
-    #[default]
-    Best,
-}
-
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone)]
-/// Parameters of Regression base_tree
-pub struct BaseTreeRegressorParameters {
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// The maximum depth of the base_tree.
-    pub max_depth: Option<u16>,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// The minimum number of samples required to be at a leaf node.
-    pub min_samples_leaf: usize,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// The minimum number of samples required to split an internal node.
-    pub min_samples_split: usize,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// Controls the randomness of the estimator
-    pub seed: Option<u64>,
-    #[cfg_attr(feature = "serde", serde(default))]
-    /// Determines the strategy used to choose the split at each node.
-    pub splitter: Splitter,
-}
-
-/// Regression base_tree
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
-pub struct BaseTreeRegressor<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>> {
-    nodes: Vec<Node>,
-    parameters: Option<BaseTreeRegressorParameters>,
-    depth: u16,
-    _phantom_tx: PhantomData<TX>,
-    _phantom_ty: PhantomData<TY>,
-    _phantom_x: PhantomData<X>,
-    _phantom_y: PhantomData<Y>,
-}
-
-impl<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
-    BaseTreeRegressor<TX, TY, X, Y>
-{
-    /// Get nodes, return a shared reference
-    fn nodes(&self) -> &Vec<Node> {
-        self.nodes.as_ref()
-    }
-    /// Get parameters, return a shared reference
-    fn parameters(&self) -> &BaseTreeRegressorParameters {
-        self.parameters.as_ref().unwrap()
-    }
-    /// Get estimate of intercept, return value
-    fn depth(&self) -> u16 {
-        self.depth
-    }
-}
-
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone)]
-struct Node {
-    output: f64,
-    split_feature: usize,
-    split_value: Option<f64>,
-    split_score: Option<f64>,
-    true_child: Option<usize>,
-    false_child: Option<usize>,
-}
-
-impl Node {
-    fn new(output: f64) -> Self {
-        Node {
-            output,
-            split_feature: 0,
-            split_value: Option::None,
-            split_score: Option::None,
-            true_child: Option::None,
-            false_child: Option::None,
-        }
-    }
-}
-
-impl PartialEq for Node {
-    fn eq(&self, other: &Self) -> bool {
-        (self.output - other.output).abs() < f64::EPSILON
-            && self.split_feature == other.split_feature
-            && match (self.split_value, other.split_value) {
-                (Some(a), Some(b)) => (a - b).abs() < f64::EPSILON,
-                (None, None) => true,
-                _ => false,
-            }
-            && match (self.split_score, other.split_score) {
-                (Some(a), Some(b)) => (a - b).abs() < f64::EPSILON,
-                (None, None) => true,
-                _ => false,
-            }
-    }
-}
-
-impl<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>> PartialEq
-    for BaseTreeRegressor<TX, TY, X, Y>
-{
-    fn eq(&self, other: &Self) -> bool {
-        if self.depth != other.depth || self.nodes().len() != other.nodes().len() {
-            false
-        } else {
-            self.nodes()
-                .iter()
-                .zip(other.nodes().iter())
-                .all(|(a, b)| a == b)
-        }
-    }
-}
-
-struct NodeVisitor<'a, TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>> {
-    x: &'a X,
-    y: &'a Y,
-    node: usize,
-    samples: Vec<usize>,
-    order: &'a [Vec<usize>],
-    true_child_output: f64,
-    false_child_output: f64,
-    level: u16,
-    _phantom_tx: PhantomData<TX>,
-    _phantom_ty: PhantomData<TY>,
-}
-
-impl<'a, TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
-    NodeVisitor<'a, TX, TY, X, Y>
-{
-    fn new(
-        node_id: usize,
-        samples: Vec<usize>,
-        order: &'a [Vec<usize>],
-        x: &'a X,
-        y: &'a Y,
-        level: u16,
-    ) -> Self {
-        NodeVisitor {
-            x,
-            y,
-            node: node_id,
-            samples,
-            order,
-            true_child_output: 0f64,
-            false_child_output: 0f64,
-            level,
-            _phantom_tx: PhantomData,
-            _phantom_ty: PhantomData,
-        }
-    }
-}
-
-impl<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
-    BaseTreeRegressor<TX, TY, X, Y>
-{
-    /// Build a decision base_tree regressor from the training data.
-    /// * `x` - _NxM_ matrix with _N_ observations and _M_ features in each observation.
-    /// * `y` - the target values
-    pub fn fit(
-        x: &X,
-        y: &Y,
-        parameters: BaseTreeRegressorParameters,
-    ) -> Result<BaseTreeRegressor<TX, TY, X, Y>, Failed> {
-        let (x_nrows, num_attributes) = x.shape();
-        if x_nrows != y.shape() {
-            return Err(Failed::fit("Size of x should equal size of y"));
-        }
-
-        let samples = vec![1; x_nrows];
-        BaseTreeRegressor::fit_weak_learner(x, y, samples, num_attributes, parameters)
-    }
-
-    pub(crate) fn fit_weak_learner(
-        x: &X,
-        y: &Y,
-        samples: Vec<usize>,
-        mtry: usize,
-        parameters: BaseTreeRegressorParameters,
-    ) -> Result<BaseTreeRegressor<TX, TY, X, Y>, Failed> {
-        let y_m = y.clone();
-
-        let y_ncols = y_m.shape();
-        let (_, num_attributes) = x.shape();
-
-        let mut nodes: Vec<Node> = Vec::new();
-        let mut rng = get_rng_impl(parameters.seed);
-
-        let mut n = 0;
-        let mut sum = 0f64;
-        for (i, sample_i) in samples.iter().enumerate().take(y_ncols) {
-            n += *sample_i;
-            sum += *sample_i as f64 * y_m.get(i).to_f64().unwrap();
-        }
-
-        let root = Node::new(sum / (n as f64));
-        nodes.push(root);
-        let mut order: Vec<Vec<usize>> = Vec::new();
-
-        for i in 0..num_attributes {
-            let mut col_i: Vec<TX> = x.get_col(i).iterator(0).copied().collect();
-            order.push(col_i.argsort_mut());
-        }
-
-        let mut base_tree = BaseTreeRegressor {
-            nodes,
-            parameters: Some(parameters),
-            depth: 0u16,
-            _phantom_tx: PhantomData,
-            _phantom_ty: PhantomData,
-            _phantom_x: PhantomData,
-            _phantom_y: PhantomData,
-        };
-
-        let mut visitor = NodeVisitor::<TX, TY, X, Y>::new(0, samples, &order, x, &y_m, 1);
-
-        let mut visitor_queue: LinkedList<NodeVisitor<'_, TX, TY, X, Y>> = LinkedList::new();
-
-        if base_tree.find_best_cutoff(&mut visitor, mtry, &mut rng) {
-            visitor_queue.push_back(visitor);
-        }
-
-        while base_tree.depth() < base_tree.parameters().max_depth.unwrap_or(u16::MAX) {
-            match visitor_queue.pop_front() {
-                Some(node) => base_tree.split(node, mtry, &mut visitor_queue, &mut rng),
-                None => break,
-            };
-        }
-
-        Ok(base_tree)
-    }
-
-    /// Predict regression value for `x`.
-    /// * `x` - _KxM_ data where _K_ is number of observations and _M_ is number of features.
-    pub fn predict(&self, x: &X) -> Result<Y, Failed> {
-        let mut result = Y::zeros(x.shape().0);
-
-        let (n, _) = x.shape();
-
-        for i in 0..n {
-            result.set(i, self.predict_for_row(x, i));
-        }
-
-        Ok(result)
-    }
-
-    pub(crate) fn predict_for_row(&self, x: &X, row: usize) -> TY {
-        let mut result = 0f64;
-        let mut queue: LinkedList<usize> = LinkedList::new();
-
-        queue.push_back(0);
-
-        while !queue.is_empty() {
-            match queue.pop_front() {
-                Some(node_id) => {
-                    let node = &self.nodes()[node_id];
-                    if node.true_child.is_none() && node.false_child.is_none() {
-                        result = node.output;
-                    } else if x.get((row, node.split_feature)).to_f64().unwrap()
-                        <= node.split_value.unwrap_or(f64::NAN)
-                    {
-                        queue.push_back(node.true_child.unwrap());
-                    } else {
-                        queue.push_back(node.false_child.unwrap());
-                    }
-                }
-                None => break,
-            };
-        }
-
-        TY::from_f64(result).unwrap()
-    }
-
-    fn find_best_cutoff(
-        &mut self,
-        visitor: &mut NodeVisitor<'_, TX, TY, X, Y>,
-        mtry: usize,
-        rng: &mut impl Rng,
-    ) -> bool {
-        let (_, n_attr) = visitor.x.shape();
-
-        let n: usize = visitor.samples.iter().sum();
-
-        if n < self.parameters().min_samples_split {
-            return false;
-        }
-
-        let sum = self.nodes()[visitor.node].output * n as f64;
-
-        let mut variables = (0..n_attr).collect::<Vec<_>>();
-
-        if mtry < n_attr {
-            variables.shuffle(rng);
-        }
-
-        let parent_gain =
-            n as f64 * self.nodes()[visitor.node].output * self.nodes()[visitor.node].output;
-
-        let splitter = self.parameters().splitter.clone();
-
-        for variable in variables.iter().take(mtry) {
-            match splitter {
-                Splitter::Random => {
-                    self.find_random_split(visitor, n, sum, parent_gain, *variable, rng);
-                }
-                Splitter::Best => {
-                    self.find_best_split(visitor, n, sum, parent_gain, *variable);
-                }
-            }
-        }
-
-        self.nodes()[visitor.node].split_score.is_some()
-    }
-
-    fn find_random_split(
-        &mut self,
-        visitor: &mut NodeVisitor<'_, TX, TY, X, Y>,
-        n: usize,
-        sum: f64,
-        parent_gain: f64,
-        j: usize,
-        rng: &mut impl Rng,
-    ) {
-        let (min_val, max_val) = {
-            let mut min_opt = None;
-            let mut max_opt = None;
-            for &i in &visitor.order[j] {
-                if visitor.samples[i] > 0 {
-                    min_opt = Some(*visitor.x.get((i, j)));
-                    break;
-                }
-            }
-            for &i in visitor.order[j].iter().rev() {
-                if visitor.samples[i] > 0 {
-                    max_opt = Some(*visitor.x.get((i, j)));
-                    break;
-                }
-            }
-            if min_opt.is_none() {
-                return;
-            }
-            (min_opt.unwrap(), max_opt.unwrap())
-        };
-
-        if min_val >= max_val {
-            return;
-        }
-
-        let split_value = rng.gen_range(min_val.to_f64().unwrap()..max_val.to_f64().unwrap());
-
-        let mut true_sum = 0f64;
-        let mut true_count = 0;
-        for &i in &visitor.order[j] {
-            if visitor.samples[i] > 0 {
-                if visitor.x.get((i, j)).to_f64().unwrap() <= split_value {
-                    true_sum += visitor.samples[i] as f64 * visitor.y.get(i).to_f64().unwrap();
-                    true_count += visitor.samples[i];
-                } else {
-                    break;
-                }
-            }
-        }
-
-        let false_count = n - true_count;
-
-        if true_count < self.parameters().min_samples_leaf
-            || false_count < self.parameters().min_samples_leaf
-        {
-            return;
-        }
-
-        let true_mean = if true_count > 0 {
-            true_sum / true_count as f64
-        } else {
-            0.0
-        };
-        let false_mean = if false_count > 0 {
-            (sum - true_sum) / false_count as f64
-        } else {
-            0.0
-        };
-        let gain = (true_count as f64 * true_mean * true_mean
-            + false_count as f64 * false_mean * false_mean)
-            - parent_gain;
-
-        if self.nodes[visitor.node].split_score.is_none()
-            || gain > self.nodes[visitor.node].split_score.unwrap()
-        {
-            self.nodes[visitor.node].split_feature = j;
-            self.nodes[visitor.node].split_value = Some(split_value);
-            self.nodes[visitor.node].split_score = Some(gain);
-            visitor.true_child_output = true_mean;
-            visitor.false_child_output = false_mean;
-        }
-    }
-
-    fn find_best_split(
-        &mut self,
-        visitor: &mut NodeVisitor<'_, TX, TY, X, Y>,
-        n: usize,
-        sum: f64,
-        parent_gain: f64,
-        j: usize,
-    ) {
-        let mut true_sum = 0f64;
-        let mut true_count = 0;
-        let mut prevx = Option::None;
-
-        for i in visitor.order[j].iter() {
-            if visitor.samples[*i] > 0 {
-                let x_ij = *visitor.x.get((*i, j));
-
-                if prevx.is_none() || x_ij == prevx.unwrap() {
-                    prevx = Some(x_ij);
-                    true_count += visitor.samples[*i];
-                    true_sum += visitor.samples[*i] as f64 * visitor.y.get(*i).to_f64().unwrap();
-                    continue;
-                }
-
-                let false_count = n - true_count;
-
-                if true_count < self.parameters().min_samples_leaf
-                    || false_count < self.parameters().min_samples_leaf
-                {
-                    prevx = Some(x_ij);
-                    true_count += visitor.samples[*i];
-                    true_sum += visitor.samples[*i] as f64 * visitor.y.get(*i).to_f64().unwrap();
-                    continue;
-                }
-
-                let true_mean = true_sum / true_count as f64;
-                let false_mean = (sum - true_sum) / false_count as f64;
-
-                let gain = (true_count as f64 * true_mean * true_mean
-                    + false_count as f64 * false_mean * false_mean)
-                    - parent_gain;
-
-                if self.nodes()[visitor.node].split_score.is_none()
-                    || gain > self.nodes()[visitor.node].split_score.unwrap()
-                {
-                    self.nodes[visitor.node].split_feature = j;
-                    self.nodes[visitor.node].split_value =
-                        Option::Some((x_ij + prevx.unwrap()).to_f64().unwrap() / 2f64);
-                    self.nodes[visitor.node].split_score = Option::Some(gain);
-
-                    visitor.true_child_output = true_mean;
-                    visitor.false_child_output = false_mean;
-                }
-
-                prevx = Some(x_ij);
-                true_sum += visitor.samples[*i] as f64 * visitor.y.get(*i).to_f64().unwrap();
-                true_count += visitor.samples[*i];
-            }
-        }
-    }
-
-    fn split<'a>(
-        &mut self,
-        mut visitor: NodeVisitor<'a, TX, TY, X, Y>,
-        mtry: usize,
-        visitor_queue: &mut LinkedList<NodeVisitor<'a, TX, TY, X, Y>>,
-        rng: &mut impl Rng,
-    ) -> bool {
-        let (n, _) = visitor.x.shape();
-        let mut tc = 0;
-        let mut fc = 0;
-        let mut true_samples: Vec<usize> = vec![0; n];
-
-        for (i, true_sample) in true_samples.iter_mut().enumerate().take(n) {
-            if visitor.samples[i] > 0 {
-                if visitor
-                    .x
-                    .get((i, self.nodes()[visitor.node].split_feature))
-                    .to_f64()
-                    .unwrap()
-                    <= self.nodes()[visitor.node].split_value.unwrap_or(f64::NAN)
-                {
-                    *true_sample = visitor.samples[i];
-                    tc += *true_sample;
-                    visitor.samples[i] = 0;
-                } else {
-                    fc += visitor.samples[i];
-                }
-            }
-        }
-
-        if tc < self.parameters().min_samples_leaf || fc < self.parameters().min_samples_leaf {
-            self.nodes[visitor.node].split_feature = 0;
-            self.nodes[visitor.node].split_value = Option::None;
-            self.nodes[visitor.node].split_score = Option::None;
-
-            return false;
-        }
-
-        let true_child_idx = self.nodes().len();
-
-        self.nodes.push(Node::new(visitor.true_child_output));
-        let false_child_idx = self.nodes().len();
-        self.nodes.push(Node::new(visitor.false_child_output));
-
-        self.nodes[visitor.node].true_child = Some(true_child_idx);
-        self.nodes[visitor.node].false_child = Some(false_child_idx);
-
-        self.depth = u16::max(self.depth, visitor.level + 1);
-
-        let mut true_visitor = NodeVisitor::<TX, TY, X, Y>::new(
-            true_child_idx,
-            true_samples,
-            visitor.order,
-            visitor.x,
-            visitor.y,
-            visitor.level + 1,
-        );
-
-        if self.find_best_cutoff(&mut true_visitor, mtry, rng) {
-            visitor_queue.push_back(true_visitor);
-        }
-
-        let mut false_visitor = NodeVisitor::<TX, TY, X, Y>::new(
-            false_child_idx,
-            visitor.samples,
-            visitor.order,
-            visitor.x,
-            visitor.y,
-            visitor.level + 1,
-        );
-
-        if self.find_best_cutoff(&mut false_visitor, mtry, rng) {
-            visitor_queue.push_back(false_visitor);
-        }
-
-        true
-    }
-}

src/tree/decision_tree_classifier.rs

@@ -674,20 +674,15 @@ impl<TX: Number + PartialOrd, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>>
     ) -> bool {
         let (n_rows, n_attr) = visitor.x.shape();
 
-        let mut label = None;
+        let mut label = Option::None;
         let mut is_pure = true;
         for i in 0..n_rows {
             if visitor.samples[i] > 0 {
-                match label {
-                    None => {
-                        label = Some(visitor.y[i]);
-                    }
-                    Some(current_label) => {
-                        if visitor.y[i] != current_label {
-                            is_pure = false;
-                            break;
-                        }
-                    }
+                if label.is_none() {
+                    label = Option::Some(visitor.y[i]);
+                } else if visitor.y[i] != label.unwrap() {
+                    is_pure = false;
+                    break;
                 }
             }
         }

src/tree/decision_tree_regressor.rs

@@ -58,17 +58,22 @@
 //! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
 //! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
 
+use std::collections::LinkedList;
 use std::default::Default;
 use std::fmt::Debug;
+use std::marker::PhantomData;
+
+use rand::seq::SliceRandom;
+use rand::Rng;
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use super::base_tree_regressor::{BaseTreeRegressor, BaseTreeRegressorParameters, Splitter};
 use crate::api::{Predictor, SupervisedEstimator};
 use crate::error::Failed;
-use crate::linalg::basic::arrays::{Array1, Array2};
+use crate::linalg::basic::arrays::{Array1, Array2, MutArrayView1};
 use crate::numbers::basenum::Number;
+use crate::rand_custom::get_rng_impl;
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug, Clone)]
@@ -93,7 +98,41 @@ pub struct DecisionTreeRegressorParameters {
 #[derive(Debug)]
 pub struct DecisionTreeRegressor<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
 {
-    tree_regressor: Option<BaseTreeRegressor<TX, TY, X, Y>>,
+    nodes: Vec<Node>,
+    parameters: Option<DecisionTreeRegressorParameters>,
+    depth: u16,
+    _phantom_tx: PhantomData<TX>,
+    _phantom_ty: PhantomData<TY>,
+    _phantom_x: PhantomData<X>,
+    _phantom_y: PhantomData<Y>,
+}
+
+impl<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
+    DecisionTreeRegressor<TX, TY, X, Y>
+{
+    /// Get nodes, return a shared reference
+    fn nodes(&self) -> &Vec<Node> {
+        self.nodes.as_ref()
+    }
+    /// Get parameters, return a shared reference
+    fn parameters(&self) -> &DecisionTreeRegressorParameters {
+        self.parameters.as_ref().unwrap()
+    }
+    /// Get estimate of intercept, return value
+    fn depth(&self) -> u16 {
+        self.depth
+    }
+}
+
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone)]
+struct Node {
+    output: f64,
+    split_feature: usize,
+    split_value: Option<f64>,
+    split_score: Option<f64>,
+    true_child: Option<usize>,
+    false_child: Option<usize>,
 }
 
 impl DecisionTreeRegressorParameters {
@@ -257,11 +296,87 @@ impl Default for DecisionTreeRegressorSearchParameters {
     }
 }
 
+impl Node {
+    fn new(output: f64) -> Self {
+        Node {
+            output,
+            split_feature: 0,
+            split_value: Option::None,
+            split_score: Option::None,
+            true_child: Option::None,
+            false_child: Option::None,
+        }
+    }
+}
+
+impl PartialEq for Node {
+    fn eq(&self, other: &Self) -> bool {
+        (self.output - other.output).abs() < f64::EPSILON
+            && self.split_feature == other.split_feature
+            && match (self.split_value, other.split_value) {
+                (Some(a), Some(b)) => (a - b).abs() < f64::EPSILON,
+                (None, None) => true,
+                _ => false,
+            }
+            && match (self.split_score, other.split_score) {
+                (Some(a), Some(b)) => (a - b).abs() < f64::EPSILON,
+                (None, None) => true,
+                _ => false,
+            }
+    }
+}
+
 impl<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>> PartialEq
     for DecisionTreeRegressor<TX, TY, X, Y>
 {
     fn eq(&self, other: &Self) -> bool {
-        self.tree_regressor == other.tree_regressor
+        if self.depth != other.depth || self.nodes().len() != other.nodes().len() {
+            false
+        } else {
+            self.nodes()
+                .iter()
+                .zip(other.nodes().iter())
+                .all(|(a, b)| a == b)
+        }
+    }
+}
+
+struct NodeVisitor<'a, TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>> {
+    x: &'a X,
+    y: &'a Y,
+    node: usize,
+    samples: Vec<usize>,
+    order: &'a [Vec<usize>],
+    true_child_output: f64,
+    false_child_output: f64,
+    level: u16,
+    _phantom_tx: PhantomData<TX>,
+    _phantom_ty: PhantomData<TY>,
+}
+
+impl<'a, TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
+    NodeVisitor<'a, TX, TY, X, Y>
+{
+    fn new(
+        node_id: usize,
+        samples: Vec<usize>,
+        order: &'a [Vec<usize>],
+        x: &'a X,
+        y: &'a Y,
+        level: u16,
+    ) -> Self {
+        NodeVisitor {
+            x,
+            y,
+            node: node_id,
+            samples,
+            order,
+            true_child_output: 0f64,
+            false_child_output: 0f64,
+            level,
+            _phantom_tx: PhantomData,
+            _phantom_ty: PhantomData,
+        }
     }
 }
 
@@ -271,7 +386,13 @@ impl<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
 {
     fn new() -> Self {
         Self {
-            tree_regressor: None,
+            nodes: vec![],
+            parameters: Option::None,
+            depth: 0u16,
+            _phantom_tx: PhantomData,
+            _phantom_ty: PhantomData,
+            _phantom_x: PhantomData,
+            _phantom_y: PhantomData,
         }
     }
 
@@ -299,23 +420,283 @@ impl<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
         y: &Y,
         parameters: DecisionTreeRegressorParameters,
     ) -> Result<DecisionTreeRegressor<TX, TY, X, Y>, Failed> {
-        let tree_parameters = BaseTreeRegressorParameters {
-            max_depth: parameters.max_depth,
-            min_samples_leaf: parameters.min_samples_leaf,
-            min_samples_split: parameters.min_samples_split,
-            seed: parameters.seed,
-            splitter: Splitter::Best,
+        let (x_nrows, num_attributes) = x.shape();
+        if x_nrows != y.shape() {
+            return Err(Failed::fit("Size of x should equal size of y"));
+        }
+
+        let samples = vec![1; x_nrows];
+        DecisionTreeRegressor::fit_weak_learner(x, y, samples, num_attributes, parameters)
+    }
+
+    pub(crate) fn fit_weak_learner(
+        x: &X,
+        y: &Y,
+        samples: Vec<usize>,
+        mtry: usize,
+        parameters: DecisionTreeRegressorParameters,
+    ) -> Result<DecisionTreeRegressor<TX, TY, X, Y>, Failed> {
+        let y_m = y.clone();
+
+        let y_ncols = y_m.shape();
+        let (_, num_attributes) = x.shape();
+
+        let mut nodes: Vec<Node> = Vec::new();
+        let mut rng = get_rng_impl(parameters.seed);
+
+        let mut n = 0;
+        let mut sum = 0f64;
+        for (i, sample_i) in samples.iter().enumerate().take(y_ncols) {
+            n += *sample_i;
+            sum += *sample_i as f64 * y_m.get(i).to_f64().unwrap();
+        }
+
+        let root = Node::new(sum / (n as f64));
+        nodes.push(root);
+        let mut order: Vec<Vec<usize>> = Vec::new();
+
+        for i in 0..num_attributes {
+            let mut col_i: Vec<TX> = x.get_col(i).iterator(0).copied().collect();
+            order.push(col_i.argsort_mut());
+        }
+
+        let mut tree = DecisionTreeRegressor {
+            nodes,
+            parameters: Some(parameters),
+            depth: 0u16,
+            _phantom_tx: PhantomData,
+            _phantom_ty: PhantomData,
+            _phantom_x: PhantomData,
+            _phantom_y: PhantomData,
         };
-        let tree = BaseTreeRegressor::fit(x, y, tree_parameters)?;
-        Ok(Self {
-            tree_regressor: Some(tree),
-        })
+
+        let mut visitor = NodeVisitor::<TX, TY, X, Y>::new(0, samples, &order, x, &y_m, 1);
+
+        let mut visitor_queue: LinkedList<NodeVisitor<'_, TX, TY, X, Y>> = LinkedList::new();
+
+        if tree.find_best_cutoff(&mut visitor, mtry, &mut rng) {
+            visitor_queue.push_back(visitor);
+        }
+
+        while tree.depth() < tree.parameters().max_depth.unwrap_or(u16::MAX) {
+            match visitor_queue.pop_front() {
+                Some(node) => tree.split(node, mtry, &mut visitor_queue, &mut rng),
+                None => break,
+            };
+        }
+
+        Ok(tree)
     }
 
     /// Predict regression value for `x`.
     /// * `x` - _KxM_ data where _K_ is number of observations and _M_ is number of features.
     pub fn predict(&self, x: &X) -> Result<Y, Failed> {
-        self.tree_regressor.as_ref().unwrap().predict(x)
+        let mut result = Y::zeros(x.shape().0);
+
+        let (n, _) = x.shape();
+
+        for i in 0..n {
+            result.set(i, self.predict_for_row(x, i));
+        }
+
+        Ok(result)
+    }
+
+    pub(crate) fn predict_for_row(&self, x: &X, row: usize) -> TY {
+        let mut result = 0f64;
+        let mut queue: LinkedList<usize> = LinkedList::new();
+
+        queue.push_back(0);
+
+        while !queue.is_empty() {
+            match queue.pop_front() {
+                Some(node_id) => {
+                    let node = &self.nodes()[node_id];
+                    if node.true_child.is_none() && node.false_child.is_none() {
+                        result = node.output;
+                    } else if x.get((row, node.split_feature)).to_f64().unwrap()
+                        <= node.split_value.unwrap_or(f64::NAN)
+                    {
+                        queue.push_back(node.true_child.unwrap());
+                    } else {
+                        queue.push_back(node.false_child.unwrap());
+                    }
+                }
+                None => break,
+            };
+        }
+
+        TY::from_f64(result).unwrap()
+    }
+
+    fn find_best_cutoff(
+        &mut self,
+        visitor: &mut NodeVisitor<'_, TX, TY, X, Y>,
+        mtry: usize,
+        rng: &mut impl Rng,
+    ) -> bool {
+        let (_, n_attr) = visitor.x.shape();
+
+        let n: usize = visitor.samples.iter().sum();
+
+        if n < self.parameters().min_samples_split {
+            return false;
+        }
+
+        let sum = self.nodes()[visitor.node].output * n as f64;
+
+        let mut variables = (0..n_attr).collect::<Vec<_>>();
+
+        if mtry < n_attr {
+            variables.shuffle(rng);
+        }
+
+        let parent_gain =
+            n as f64 * self.nodes()[visitor.node].output * self.nodes()[visitor.node].output;
+
+        for variable in variables.iter().take(mtry) {
+            self.find_best_split(visitor, n, sum, parent_gain, *variable);
+        }
+
+        self.nodes()[visitor.node].split_score.is_some()
+    }
+
+    fn find_best_split(
+        &mut self,
+        visitor: &mut NodeVisitor<'_, TX, TY, X, Y>,
+        n: usize,
+        sum: f64,
+        parent_gain: f64,
+        j: usize,
+    ) {
+        let mut true_sum = 0f64;
+        let mut true_count = 0;
+        let mut prevx = Option::None;
+
+        for i in visitor.order[j].iter() {
+            if visitor.samples[*i] > 0 {
+                let x_ij = *visitor.x.get((*i, j));
+
+                if prevx.is_none() || x_ij == prevx.unwrap() {
+                    prevx = Some(x_ij);
+                    true_count += visitor.samples[*i];
+                    true_sum += visitor.samples[*i] as f64 * visitor.y.get(*i).to_f64().unwrap();
+                    continue;
+                }
+
+                let false_count = n - true_count;
+
+                if true_count < self.parameters().min_samples_leaf
+                    || false_count < self.parameters().min_samples_leaf
+                {
+                    prevx = Some(x_ij);
+                    true_count += visitor.samples[*i];
+                    true_sum += visitor.samples[*i] as f64 * visitor.y.get(*i).to_f64().unwrap();
+                    continue;
+                }
+
+                let true_mean = true_sum / true_count as f64;
+                let false_mean = (sum - true_sum) / false_count as f64;
+
+                let gain = (true_count as f64 * true_mean * true_mean
+                    + false_count as f64 * false_mean * false_mean)
+                    - parent_gain;
+
+                if self.nodes()[visitor.node].split_score.is_none()
+                    || gain > self.nodes()[visitor.node].split_score.unwrap()
+                {
+                    self.nodes[visitor.node].split_feature = j;
+                    self.nodes[visitor.node].split_value =
+                        Option::Some((x_ij + prevx.unwrap()).to_f64().unwrap() / 2f64);
+                    self.nodes[visitor.node].split_score = Option::Some(gain);
+
+                    visitor.true_child_output = true_mean;
+                    visitor.false_child_output = false_mean;
+                }
+
+                prevx = Some(x_ij);
+                true_sum += visitor.samples[*i] as f64 * visitor.y.get(*i).to_f64().unwrap();
+                true_count += visitor.samples[*i];
+            }
+        }
+    }
+
+    fn split<'a>(
+        &mut self,
+        mut visitor: NodeVisitor<'a, TX, TY, X, Y>,
+        mtry: usize,
+        visitor_queue: &mut LinkedList<NodeVisitor<'a, TX, TY, X, Y>>,
+        rng: &mut impl Rng,
+    ) -> bool {
+        let (n, _) = visitor.x.shape();
+        let mut tc = 0;
+        let mut fc = 0;
+        let mut true_samples: Vec<usize> = vec![0; n];
+
+        for (i, true_sample) in true_samples.iter_mut().enumerate().take(n) {
+            if visitor.samples[i] > 0 {
+                if visitor
+                    .x
+                    .get((i, self.nodes()[visitor.node].split_feature))
+                    .to_f64()
+                    .unwrap()
+                    <= self.nodes()[visitor.node].split_value.unwrap_or(f64::NAN)
+                {
+                    *true_sample = visitor.samples[i];
+                    tc += *true_sample;
+                    visitor.samples[i] = 0;
+                } else {
+                    fc += visitor.samples[i];
+                }
+            }
+        }
+
+        if tc < self.parameters().min_samples_leaf || fc < self.parameters().min_samples_leaf {
+            self.nodes[visitor.node].split_feature = 0;
+            self.nodes[visitor.node].split_value = Option::None;
+            self.nodes[visitor.node].split_score = Option::None;
+
+            return false;
+        }
+
+        let true_child_idx = self.nodes().len();
+
+        self.nodes.push(Node::new(visitor.true_child_output));
+        let false_child_idx = self.nodes().len();
+        self.nodes.push(Node::new(visitor.false_child_output));
+
+        self.nodes[visitor.node].true_child = Some(true_child_idx);
+        self.nodes[visitor.node].false_child = Some(false_child_idx);
+
+        self.depth = u16::max(self.depth, visitor.level + 1);
+
+        let mut true_visitor = NodeVisitor::<TX, TY, X, Y>::new(
+            true_child_idx,
+            true_samples,
+            visitor.order,
+            visitor.x,
+            visitor.y,
+            visitor.level + 1,
+        );
+
+        if self.find_best_cutoff(&mut true_visitor, mtry, rng) {
+            visitor_queue.push_back(true_visitor);
+        }
+
+        let mut false_visitor = NodeVisitor::<TX, TY, X, Y>::new(
+            false_child_idx,
+            visitor.samples,
+            visitor.order,
+            visitor.x,
+            visitor.y,
+            visitor.level + 1,
+        );
+
+        if self.find_best_cutoff(&mut false_visitor, mtry, rng) {
+            visitor_queue.push_back(false_visitor);
+        }
+
+        true
     }
 }
 

src/tree/mod.rs

@@ -19,7 +19,6 @@
 //! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
 //! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
 
-pub(crate) mod base_tree_regressor;
 /// Classification tree for dependent variables that take a finite number of unordered values.
 pub mod decision_tree_classifier;
 /// Regression tree for for dependent variables that take continuous or ordered discrete values.

src/xgboost/mod.rs

@@ -1,16 +0,0 @@
-//! # XGBoost
-//!
-//! XGBoost, which stands for Extreme Gradient Boosting, is a powerful and efficient implementation of the gradient boosting framework. Gradient boosting is a machine learning technique for regression and classification problems, which produces a prediction model in the form of an ensemble of weak prediction models, typically decision trees.
-//!
-//! The core idea of boosting is to build the model in a stage-wise fashion. It learns from its mistakes by sequentially adding new models that correct the errors of the previous ones. Unlike bagging, which trains models in parallel, boosting is a sequential process. Each new tree is fit on a modified version of the original data set, specifically focusing on the instances where the previous models performed poorly.
-//!
-//! XGBoost enhances this process through several key innovations. It employs a more regularized model formalization to control over-fitting, which gives it better performance. It also has a highly optimized and parallelized tree construction process, making it significantly faster and more scalable than traditional gradient boosting implementations.
-//!
-//! ## References:
-//!
-//! * "Elements of Statistical Learning", Hastie T., Tibshirani R., Friedman J., 10. Boosting and Additive Trees
-//! *  XGBoost: A Scalable Tree Boosting System, Chen T., Guestrin C.
-
-// xgboost implementation
-pub mod xgb_regressor;
-pub use xgb_regressor::{XGRegressor, XGRegressorParameters};

src/xgboost/xgb_regressor.rs

@@ -1,771 +0,0 @@
-//! # Extreme Gradient Boosting (XGBoost)
-//!
-//! XGBoost is a highly efficient and effective implementation of the gradient boosting framework.
-//! Like other boosting models, it builds an ensemble of sequential decision trees, where each new tree
-//! is trained to correct the errors of the previous ones.
-//!
-//! What makes XGBoost powerful is its use of both the first and second derivatives (gradient and hessian)
-//! of the loss function, which allows for more accurate approximations and faster convergence. It also
-//! includes built-in regularization techniques (L1/`alpha` and L2/`lambda`) to prevent overfitting.
-//!
-//! This implementation was ported to Rust from the concepts and algorithm explained in the blog post
-//! ["XGBoost from Scratch"](https://randomrealizations.com/posts/xgboost-from-scratch/). It is designed
-//! to be a general-purpose regressor that can be used with any objective function that provides a gradient
-//! and a hessian.
-//!
-//! Example:
-//!
-//! ```
-//! use smartcore::linalg::basic::matrix::DenseMatrix;
-//! use smartcore::xgboost::{XGRegressor, XGRegressorParameters};
-//!
-//! // Simple dataset: predict y = 2*x
-//! let x = DenseMatrix::from_2d_array(&[
-//!     &[1.0], &[2.0], &[3.0], &[4.0], &[5.0]
-//! ]).unwrap();
-//! let y = vec![2.0, 4.0, 6.0, 8.0, 10.0];
-//!
-//! // Use default parameters, but set a few for demonstration
-//! let parameters = XGRegressorParameters::default()
-//!     .with_n_estimators(50)
-//!     .with_max_depth(3)
-//!     .with_learning_rate(0.1);
-//!
-//! // Train the model
-//! let model = XGRegressor::fit(&x, &y, parameters).unwrap();
-//!
-//! // Make predictions
-//! let x_test = DenseMatrix::from_2d_array(&[&[6.0], &[7.0]]).unwrap();
-//! let y_hat = model.predict(&x_test).unwrap();
-//!
-//! // y_hat should be close to [12.0, 14.0]
-//! ```
-//!
-
-use rand::{seq::SliceRandom, Rng};
-use std::{iter::zip, marker::PhantomData};
-
-use crate::{
-    api::{PredictorBorrow, SupervisedEstimatorBorrow},
-    error::{Failed, FailedError},
-    linalg::basic::arrays::{Array1, Array2},
-    numbers::basenum::Number,
-    rand_custom::get_rng_impl,
-};
-
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-/// Defines the objective function to be optimized.
-/// The objective function provides the loss, gradient (first derivative), and
-/// hessian (second derivative) required for the XGBoost algorithm.
-#[derive(Clone, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub enum Objective {
-    /// The objective for regression tasks using Mean Squared Error.
-    /// Loss: 0.5 * (y_true - y_pred)^2
-    MeanSquaredError,
-}
-
-impl Objective {
-    /// Calculates the loss for each sample given the true and predicted values.
-    ///
-    /// # Arguments
-    /// * `y_true` - A vector of the true target values.
-    /// * `y_pred` - A vector of the predicted values.
-    ///
-    /// # Returns
-    /// The mean of the calculated loss values.
-    pub fn loss_function<TY: Number, Y: Array1<TY>>(&self, y_true: &Y, y_pred: &Vec<f64>) -> f64 {
-        match self {
-            Objective::MeanSquaredError => {
-                zip(y_true.iterator(0), y_pred)
-                    .map(|(true_val, pred_val)| {
-                        0.5 * (true_val.to_f64().unwrap() - pred_val).powi(2)
-                    })
-                    .sum::<f64>()
-                    / y_true.shape() as f64
-            }
-        }
-    }
-
-    /// Calculates the gradient (first derivative) of the loss function.
-    ///
-    /// # Arguments
-    /// * `y_true` - A vector of the true target values.
-    /// * `y_pred` - A vector of the predicted values.
-    ///
-    /// # Returns
-    /// A vector of gradients for each sample.
-    pub fn gradient<TY: Number, Y: Array1<TY>>(&self, y_true: &Y, y_pred: &Vec<f64>) -> Vec<f64> {
-        match self {
-            Objective::MeanSquaredError => zip(y_true.iterator(0), y_pred)
-                .map(|(true_val, pred_val)| *pred_val - true_val.to_f64().unwrap())
-                .collect(),
-        }
-    }
-
-    /// Calculates the hessian (second derivative) of the loss function.
-    ///
-    /// # Arguments
-    /// * `y_true` - A vector of the true target values.
-    /// * `y_pred` - A vector of the predicted values.
-    ///
-    /// # Returns
-    /// A vector of hessians for each sample.
-    #[allow(unused_variables)]
-    pub fn hessian<TY: Number, Y: Array1<TY>>(&self, y_true: &Y, y_pred: &[f64]) -> Vec<f64> {
-        match self {
-            Objective::MeanSquaredError => vec![1.0; y_true.shape()],
-        }
-    }
-}
-
-/// Represents a single decision tree in the XGBoost ensemble.
-///
-/// This is a recursive data structure where each `TreeRegressor` is a node
-/// that can have a left and a right child, also of type `TreeRegressor`.
-#[allow(dead_code)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
-struct TreeRegressor<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>> {
-    left: Option<Box<TreeRegressor<TX, TY, X, Y>>>,
-    right: Option<Box<TreeRegressor<TX, TY, X, Y>>>,
-    /// The output value of this node. If it's a leaf, this is the final prediction.
-    value: f64,
-    /// The feature value threshold used to split this node.
-    threshold: f64,
-    /// The index of the feature used for splitting.
-    split_feature_idx: usize,
-    /// The gain in score achieved by this split.
-    split_score: f64,
-    _phantom_tx: PhantomData<TX>,
-    _phantom_ty: PhantomData<TY>,
-    _phantom_x: PhantomData<X>,
-    _phantom_y: PhantomData<Y>,
-}
-
-impl<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
-    TreeRegressor<TX, TY, X, Y>
-{
-    /// Recursively builds a decision tree (a `TreeRegressor` node).
-    ///
-    /// This function determines the optimal split for the given set of samples (`idxs`)
-    /// and then recursively calls itself to build the left and right child nodes.
-    ///
-    /// # Arguments
-    /// * `data` - The full training dataset.
-    /// * `g` - Gradients for all samples.
-    /// * `h` - Hessians for all samples.
-    /// * `idxs` - The indices of the samples belonging to the current node.
-    /// * `max_depth` - The maximum remaining depth for this branch.
-    /// * `min_child_weight` - The minimum sum of hessians required in a child node.
-    /// * `lambda` - L2 regularization term on weights.
-    /// * `gamma` - Minimum loss reduction required to make a further partition.
-    pub fn fit(
-        data: &X,
-        g: &Vec<f64>,
-        h: &Vec<f64>,
-        idxs: &[usize],
-        max_depth: u16,
-        min_child_weight: f64,
-        lambda: f64,
-        gamma: f64,
-    ) -> Self {
-        let g_sum = idxs.iter().map(|&i| g[i]).sum::<f64>();
-        let h_sum = idxs.iter().map(|&i| h[i]).sum::<f64>();
-        let value = -g_sum / (h_sum + lambda);
-
-        let mut best_feature_idx = usize::MAX;
-        let mut best_split_score = 0.0;
-        let mut best_threshold = 0.0;
-        let mut left = Option::None;
-        let mut right = Option::None;
-
-        if max_depth > 0 {
-            Self::insert_child_nodes(
-                data,
-                g,
-                h,
-                idxs,
-                &mut best_feature_idx,
-                &mut best_split_score,
-                &mut best_threshold,
-                &mut left,
-                &mut right,
-                max_depth,
-                min_child_weight,
-                lambda,
-                gamma,
-            );
-        }
-
-        Self {
-            left,
-            right,
-            value,
-            threshold: best_threshold,
-            split_feature_idx: best_feature_idx,
-            split_score: best_split_score,
-            _phantom_tx: PhantomData,
-            _phantom_ty: PhantomData,
-            _phantom_x: PhantomData,
-            _phantom_y: PhantomData,
-        }
-    }
-
-    /// Finds the best split and creates child nodes if a valid split is found.
-    fn insert_child_nodes(
-        data: &X,
-        g: &Vec<f64>,
-        h: &Vec<f64>,
-        idxs: &[usize],
-        best_feature_idx: &mut usize,
-        best_split_score: &mut f64,
-        best_threshold: &mut f64,
-        left: &mut Option<Box<Self>>,
-        right: &mut Option<Box<Self>>,
-        max_depth: u16,
-        min_child_weight: f64,
-        lambda: f64,
-        gamma: f64,
-    ) {
-        let (_, n_features) = data.shape();
-        for i in 0..n_features {
-            Self::find_best_split(
-                data,
-                g,
-                h,
-                idxs,
-                i,
-                best_feature_idx,
-                best_split_score,
-                best_threshold,
-                min_child_weight,
-                lambda,
-                gamma,
-            );
-        }
-
-        // A split is only valid if it results in a positive gain.
-        if *best_split_score > 0.0 {
-            let mut left_idxs = Vec::new();
-            let mut right_idxs = Vec::new();
-            for idx in idxs.iter() {
-                if data.get((*idx, *best_feature_idx)).to_f64().unwrap() <= *best_threshold {
-                    left_idxs.push(*idx);
-                } else {
-                    right_idxs.push(*idx);
-                }
-            }
-
-            *left = Some(Box::new(TreeRegressor::fit(
-                data,
-                g,
-                h,
-                &left_idxs,
-                max_depth - 1,
-                min_child_weight,
-                lambda,
-                gamma,
-            )));
-            *right = Some(Box::new(TreeRegressor::fit(
-                data,
-                g,
-                h,
-                &right_idxs,
-                max_depth - 1,
-                min_child_weight,
-                lambda,
-                gamma,
-            )));
-        }
-    }
-
-    /// Iterates through a single feature to find the best possible split point.
-    fn find_best_split(
-        data: &X,
-        g: &[f64],
-        h: &[f64],
-        idxs: &[usize],
-        feature_idx: usize,
-        best_feature_idx: &mut usize,
-        best_split_score: &mut f64,
-        best_threshold: &mut f64,
-        min_child_weight: f64,
-        lambda: f64,
-        gamma: f64,
-    ) {
-        let mut sorted_idxs = idxs.to_owned();
-        sorted_idxs.sort_by(|a, b| {
-            data.get((*a, feature_idx))
-                .partial_cmp(data.get((*b, feature_idx)))
-                .unwrap()
-        });
-
-        let sum_g = sorted_idxs.iter().map(|&i| g[i]).sum::<f64>();
-        let sum_h = sorted_idxs.iter().map(|&i| h[i]).sum::<f64>();
-
-        let mut sum_g_right = sum_g;
-        let mut sum_h_right = sum_h;
-        let mut sum_g_left = 0.0;
-        let mut sum_h_left = 0.0;
-
-        for i in 0..sorted_idxs.len() - 1 {
-            let idx = sorted_idxs[i];
-            let next_idx = sorted_idxs[i + 1];
-
-            let g_i = g[idx];
-            let h_i = h[idx];
-            let x_i = data.get((idx, feature_idx)).to_f64().unwrap();
-            let x_i_next = data.get((next_idx, feature_idx)).to_f64().unwrap();
-
-            sum_g_left += g_i;
-            sum_h_left += h_i;
-            sum_g_right -= g_i;
-            sum_h_right -= h_i;
-
-            if sum_h_left < min_child_weight || x_i == x_i_next {
-                continue;
-            }
-            if sum_h_right < min_child_weight {
-                break;
-            }
-
-            let gain = 0.5
-                * ((sum_g_left * sum_g_left / (sum_h_left + lambda))
-                    + (sum_g_right * sum_g_right / (sum_h_right + lambda))
-                    - (sum_g * sum_g / (sum_h + lambda)))
-                - gamma;
-
-            if gain > *best_split_score {
-                *best_split_score = gain;
-                *best_threshold = (x_i + x_i_next) / 2.0;
-                *best_feature_idx = feature_idx;
-            }
-        }
-    }
-
-    /// Predicts the output values for a dataset.
-    pub fn predict(&self, data: &X) -> Vec<f64> {
-        let (n_samples, n_features) = data.shape();
-        (0..n_samples)
-            .map(|i| {
-                self.predict_for_row(&Vec::from_iterator(
-                    data.get_row(i).iterator(0).copied(),
-                    n_features,
-                ))
-            })
-            .collect()
-    }
-
-    /// Predicts the output value for a single row of data by traversing the tree.
-    pub fn predict_for_row(&self, row: &Vec<TX>) -> f64 {
-        // A leaf node is identified by having no children.
-        if self.left.is_none() {
-            return self.value;
-        }
-
-        // Recurse down the appropriate branch.
-        let child = if row[self.split_feature_idx].to_f64().unwrap() <= self.threshold {
-            self.left.as_ref().unwrap()
-        } else {
-            self.right.as_ref().unwrap()
-        };
-
-        child.predict_for_row(row)
-    }
-}
-
-/// Parameters for the `jRegressor` model.
-///
-/// This struct holds all the hyperparameters that control the training process.
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Clone, Debug)]
-pub struct XGRegressorParameters {
-    /// The number of boosting rounds or trees to build.
-    pub n_estimators: usize,
-    /// The maximum depth of each tree.
-    pub max_depth: u16,
-    /// Step size shrinkage used to prevent overfitting.
-    pub learning_rate: f64,
-    /// Minimum sum of instance weight (hessian) needed in a child.
-    pub min_child_weight: usize,
-    /// L2 regularization term on weights.
-    pub lambda: f64,
-    /// Minimum loss reduction required to make a further partition on a leaf node.
-    pub gamma: f64,
-    /// The initial prediction score for all instances.
-    pub base_score: f64,
-    /// The fraction of samples to be used for fitting the individual base learners.
-    pub subsample: f64,
-    /// The seed for the random number generator for reproducibility.
-    pub seed: u64,
-    /// The objective function to be optimized.
-    pub objective: Objective,
-}
-
-impl Default for XGRegressorParameters {
-    /// Creates a new set of `XGRegressorParameters` with default values.
-    fn default() -> Self {
-        Self {
-            n_estimators: 100,
-            learning_rate: 0.3,
-            max_depth: 6,
-            min_child_weight: 1,
-            lambda: 1.0,
-            gamma: 0.0,
-            base_score: 0.5,
-            subsample: 1.0,
-            seed: 0,
-            objective: Objective::MeanSquaredError,
-        }
-    }
-}
-
-// Builder pattern for XGRegressorParameters
-impl XGRegressorParameters {
-    /// Sets the number of boosting rounds or trees to build.
-    pub fn with_n_estimators(mut self, n_estimators: usize) -> Self {
-        self.n_estimators = n_estimators;
-        self
-    }
-
-    /// Sets the step size shrinkage used to prevent overfitting.
-    ///
-    /// Also known as `eta`. A smaller value makes the model more robust by preventing
-    /// too much weight being given to any single tree.
-    pub fn with_learning_rate(mut self, learning_rate: f64) -> Self {
-        self.learning_rate = learning_rate;
-        self
-    }
-
-    /// Sets the maximum depth of each individual tree.
-    // A lower value helps prevent overfitting.*
-    pub fn with_max_depth(mut self, max_depth: u16) -> Self {
-        self.max_depth = max_depth;
-        self
-    }
-
-    /// Sets the minimum sum of instance weight (hessian) needed in a child node.
-    ///
-    /// If the tree partition step results in a leaf node with the sum of
-    // instance weight less than `min_child_weight`, then the building process*
-    /// will give up further partitioning.
-    pub fn with_min_child_weight(mut self, min_child_weight: usize) -> Self {
-        self.min_child_weight = min_child_weight;
-        self
-    }
-
-    /// Sets the L2 regularization term on weights (`lambda`).
-    ///
-    /// Increasing this value will make the model more conservative.
-    pub fn with_lambda(mut self, lambda: f64) -> Self {
-        self.lambda = lambda;
-        self
-    }
-
-    /// Sets the minimum loss reduction required to make a further partition on a leaf node.
-    ///
-    /// The larger `gamma` is, the more conservative the algorithm will be.
-    pub fn with_gamma(mut self, gamma: f64) -> Self {
-        self.gamma = gamma;
-        self
-    }
-
-    /// Sets the initial prediction score for all instances.
-    pub fn with_base_score(mut self, base_score: f64) -> Self {
-        self.base_score = base_score;
-        self
-    }
-
-    /// Sets the fraction of samples to be used for fitting individual base learners.
-    ///
-    /// A value of less than 1.0 introduces randomness and helps prevent overfitting.
-    pub fn with_subsample(mut self, subsample: f64) -> Self {
-        self.subsample = subsample;
-        self
-    }
-
-    /// Sets the seed for the random number generator for reproducibility.
-    pub fn with_seed(mut self, seed: u64) -> Self {
-        self.seed = seed;
-        self
-    }
-
-    /// Sets the objective function to be optimized during training.
-    pub fn with_objective(mut self, objective: Objective) -> Self {
-        self.objective = objective;
-        self
-    }
-}
-
-/// An Extreme Gradient Boosting (XGBoost) model for regression and classification tasks.
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
-pub struct XGRegressor<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>> {
-    regressors: Option<Vec<TreeRegressor<TX, TY, X, Y>>>,
-    parameters: Option<XGRegressorParameters>,
-    _phantom_ty: PhantomData<TY>,
-    _phantom_tx: PhantomData<TX>,
-    _phantom_y: PhantomData<Y>,
-    _phantom_x: PhantomData<X>,
-}
-
-impl<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>> XGRegressor<TX, TY, X, Y> {
-    /// Fits the XGBoost model to the training data.
-    pub fn fit(data: &X, y: &Y, parameters: XGRegressorParameters) -> Result<Self, Failed> {
-        if parameters.subsample > 1.0 || parameters.subsample <= 0.0 {
-            return Err(Failed::because(
-                FailedError::ParametersError,
-                "Subsample ratio must be in (0, 1].",
-            ));
-        }
-
-        let (n_samples, _) = data.shape();
-        let learning_rate = parameters.learning_rate;
-        let mut predictions = vec![parameters.base_score; n_samples];
-
-        let mut regressors = Vec::new();
-        let mut rng = get_rng_impl(Some(parameters.seed));
-
-        for _ in 0..parameters.n_estimators {
-            let gradients = parameters.objective.gradient(y, &predictions);
-            let hessians = parameters.objective.hessian(y, &predictions);
-
-            let sample_idxs = if parameters.subsample < 1.0 {
-                Self::sample_without_replacement(n_samples, parameters.subsample, &mut rng)
-            } else {
-                (0..n_samples).collect::<Vec<usize>>()
-            };
-
-            let regressor = TreeRegressor::fit(
-                data,
-                &gradients,
-                &hessians,
-                &sample_idxs,
-                parameters.max_depth,
-                parameters.min_child_weight as f64,
-                parameters.lambda,
-                parameters.gamma,
-            );
-
-            let corrections = regressor.predict(data);
-            predictions = zip(predictions, corrections)
-                .map(|(pred, correction)| pred + (learning_rate * correction))
-                .collect();
-
-            regressors.push(regressor);
-        }
-
-        Ok(Self {
-            regressors: Some(regressors),
-            parameters: Some(parameters),
-            _phantom_ty: PhantomData,
-            _phantom_y: PhantomData,
-            _phantom_tx: PhantomData,
-            _phantom_x: PhantomData,
-        })
-    }
-
-    /// Predicts target values for the given input data.
-    pub fn predict(&self, data: &X) -> Result<Vec<TX>, Failed> {
-        let (n_samples, _) = data.shape();
-
-        let parameters = self.parameters.as_ref().unwrap();
-        let mut predictions = vec![parameters.base_score; n_samples];
-        let regressors = self.regressors.as_ref().unwrap();
-
-        for regressor in regressors.iter() {
-            let corrections = regressor.predict(data);
-            predictions = zip(predictions, corrections)
-                .map(|(pred, correction)| pred + (parameters.learning_rate * correction))
-                .collect();
-        }
-
-        Ok(predictions
-            .into_iter()
-            .map(|p| TX::from_f64(p).unwrap())
-            .collect())
-    }
-
-    /// Creates a random sample of indices without replacement.
-    fn sample_without_replacement(
-        population_size: usize,
-        subsample_ratio: f64,
-        rng: &mut impl Rng,
-    ) -> Vec<usize> {
-        let mut indices: Vec<usize> = (0..population_size).collect();
-        indices.shuffle(rng);
-        indices.truncate((population_size as f64 * subsample_ratio) as usize);
-        indices
-    }
-}
-
-// Boilerplate implementation for the smartcore traits
-impl<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>>
-    SupervisedEstimatorBorrow<'_, X, Y, XGRegressorParameters> for XGRegressor<TX, TY, X, Y>
-{
-    fn new() -> Self {
-        Self {
-            regressors: None,
-            parameters: None,
-            _phantom_ty: PhantomData,
-            _phantom_y: PhantomData,
-            _phantom_tx: PhantomData,
-            _phantom_x: PhantomData,
-        }
-    }
-
-    fn fit(x: &X, y: &Y, parameters: &XGRegressorParameters) -> Result<Self, Failed> {
-        XGRegressor::fit(x, y, parameters.clone())
-    }
-}
-
-impl<TX: Number + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1<TY>> PredictorBorrow<'_, X, TX>
-    for XGRegressor<TX, TY, X, Y>
-{
-    fn predict(&self, x: &X) -> Result<Vec<TX>, Failed> {
-        self.predict(x)
-    }
-}
-
-// ------------------- TESTS -------------------
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::linalg::basic::{arrays::Array, matrix::DenseMatrix};
-
-    /// Tests the gradient and hessian calculations for MeanSquaredError.
-    #[test]
-    fn test_mse_objective() {
-        let objective = Objective::MeanSquaredError;
-        let y_true = vec![1.0, 2.0, 3.0];
-        let y_pred = vec![1.5, 2.5, 2.5];
-
-        let gradients = objective.gradient(&y_true, &y_pred);
-        let hessians = objective.hessian(&y_true, &y_pred);
-
-        // Gradients should be (pred - true)
-        assert_eq!(gradients, vec![0.5, 0.5, -0.5]);
-        // Hessians should be all 1.0 for MSE
-        assert_eq!(hessians, vec![1.0, 1.0, 1.0]);
-    }
-
-    #[test]
-    fn test_find_best_split_multidimensional() {
-        // Data has two features. The second feature is a better predictor.
-        let data = vec![
-            vec![1.0, 10.0], // g = -0.5
-            vec![1.0, 20.0], // g = -1.0
-            vec![1.0, 30.0], // g = 1.0
-            vec![1.0, 40.0], // g = 1.5
-        ];
-        let data = DenseMatrix::from_2d_vec(&data).unwrap();
-        let g = vec![-0.5, -1.0, 1.0, 1.5];
-        let h = vec![1.0, 1.0, 1.0, 1.0];
-        let idxs = (0..4).collect::<Vec<usize>>();
-
-        let mut best_feature_idx = usize::MAX;
-        let mut best_split_score = 0.0;
-        let mut best_threshold = 0.0;
-
-        // Manually calculated expected gain for the best split (on feature 1, with lambda=1.0).
-        // G_left = -1.5, H_left = 2.0
-        // G_right = 2.5, H_right = 2.0
-        // G_total = 1.0, H_total = 4.0
-        // Gain = 0.5 * (G_l^2/(H_l+λ) + G_r^2/(H_r+λ) - G_t^2/(H_t+λ))
-        // Gain = 0.5 * ((-1.5)^2/(2+1) + (2.5)^2/(2+1) - (1.0)^2/(4+1))
-        // Gain = 0.5 * (2.25/3 + 6.25/3 - 1.0/5) = 0.5 * (0.75 + 2.0833 - 0.2) = 1.3166...
-        let expected_gain = 1.3166666666666667;
-
-        // Search both features. The algorithm must find the best split on feature 1.
-        let (_, n_features) = data.shape();
-        for i in 0..n_features {
-            TreeRegressor::<f64, f64, DenseMatrix<f64>, Vec<f64>>::find_best_split(
-                &data,
-                &g,
-                &h,
-                &idxs,
-                i,
-                &mut best_feature_idx,
-                &mut best_split_score,
-                &mut best_threshold,
-                1.0,
-                1.0,
-                0.0,
-            );
-        }
-
-        assert_eq!(best_feature_idx, 1); // Should choose the second feature
-        assert!((best_split_score - expected_gain).abs() < 1e-9);
-        assert_eq!(best_threshold, 25.0); // (20 + 30) / 2
-    }
-
-    /// Tests that the TreeRegressor can build a simple one-level tree on multidimensional data.
-    #[test]
-    fn test_tree_regressor_fit_multidimensional() {
-        let data = vec![
-            vec![1.0, 10.0],
-            vec![1.0, 20.0],
-            vec![1.0, 30.0],
-            vec![1.0, 40.0],
-        ];
-        let data = DenseMatrix::from_2d_vec(&data).unwrap();
-        let g = vec![-0.5, -1.0, 1.0, 1.5];
-        let h = vec![1.0, 1.0, 1.0, 1.0];
-        let idxs = (0..4).collect::<Vec<usize>>();
-
-        let tree = TreeRegressor::<f64, f64, DenseMatrix<f64>, Vec<f64>>::fit(
-            &data, &g, &h, &idxs, 2, 1.0, 1.0, 0.0,
-        );
-
-        // Check that the root node was split on the correct feature
-        assert!(tree.left.is_some());
-        assert!(tree.right.is_some());
-        assert_eq!(tree.split_feature_idx, 1); // Should split on the second feature
-        assert_eq!(tree.threshold, 25.0);
-
-        // Check leaf values (G/H+lambda)
-        // Left leaf: G = -1.5, H = 2.0 => value = -(-1.5)/(2+1) = 0.5
-        // Right leaf: G = 2.5, H = 2.0 => value = -(2.5)/(2+1) = -0.8333
-        assert!((tree.left.unwrap().value - 0.5).abs() < 1e-9);
-        assert!((tree.right.unwrap().value - (-0.833333333)).abs() < 1e-9);
-    }
-
-    /// A "smoke test" to ensure the main XGRegressor can fit and predict on multidimensional data.
-    #[test]
-    fn test_xgregressor_fit_predict_multidimensional() {
-        // Simple 2D data where y is roughly 2*x1 + 3*x2
-        let x_vec = vec![
-            vec![1.0, 1.0],
-            vec![2.0, 1.0],
-            vec![1.0, 2.0],
-            vec![2.0, 2.0],
-        ];
-        let x = DenseMatrix::from_2d_vec(&x_vec).unwrap();
-        let y = vec![5.0, 7.0, 8.0, 10.0];
-
-        let params = XGRegressorParameters::default()
-            .with_n_estimators(10)
-            .with_max_depth(2);
-
-        let fit_result = XGRegressor::fit(&x, &y, params);
-        assert!(
-            fit_result.is_ok(),
-            "Fit failed with error: {:?}",
-            fit_result.err()
-        );
-
-        let model = fit_result.unwrap();
-        let predict_result = model.predict(&x);
-        assert!(
-            predict_result.is_ok(),
-            "Predict failed with error: {:?}",
-            predict_result.err()
-        );
-
-        let predictions = predict_result.unwrap();
-        assert_eq!(predictions.len(), 4);
-    }
-}