Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions src/ensemble/base_forest_regressor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ impl<TX: Number + FloatNumber + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1
.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 n_trees = parameters.n_trees;
let mut trees: Vec<BaseTreeRegressor<TX, TY, X, Y>> = Vec::with_capacity(n_trees);

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());
maybe_all_samples = Some(Vec::with_capacity(n_trees));
}

let mut samples: Vec<usize> = (0..n_rows).map(|_| 1).collect();
Expand Down Expand Up @@ -218,3 +218,29 @@ impl<TX: Number + FloatNumber + PartialOrd, TY: Number, X: Array2<TX>, Y: Array1
samples
}
}

#[cfg(test)]
mod tests {
use super::*;
use crate::linalg::basic::matrix::DenseMatrix;

#[test]
fn test_base_forest_regressor_keep_samples() {
let x = DenseMatrix::from_2d_array(&[&[1.0, 2.0], &[3.0, 4.0], &[5.0, 6.0]]).unwrap();
let y = vec![1.0, 2.0, 3.0];
let params = BaseForestRegressorParameters {
max_depth: None,
min_samples_leaf: 1,
min_samples_split: 2,
n_trees: 5,
m: None,
keep_samples: true,
seed: 42,
bootstrap: true,
splitter: crate::tree::base_tree_regressor::Splitter::Best,
};
let regressor = BaseForestRegressor::fit(&x, &y, params).unwrap();
assert_eq!(regressor.trees.unwrap().len(), 5);
assert!(regressor.samples.is_some());
}
}
7 changes: 3 additions & 4 deletions src/ensemble/random_forest_classifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -475,13 +475,12 @@ impl<TX: FloatNumber + PartialOrd, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY
let mut rng = get_rng_impl(Some(parameters.seed));
let classes = y.unique();
let k = classes.len();
// TODO: use with_capacity here
let mut trees: Vec<DecisionTreeClassifier<TX, TY, X, Y>> = Vec::new();
let n_trees = parameters.n_trees as usize;
let mut trees: Vec<DecisionTreeClassifier<TX, TY, X, Y>> = Vec::with_capacity(n_trees);

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());
maybe_all_samples = Some(Vec::with_capacity(n_trees));
}

for _ in 0..parameters.n_trees {
Expand Down
Loading