From 502c6ffd6a5c6fa5bfc1f241d4350afbbc7d704d Mon Sep 17 00:00:00 2001 From: Montana Low Date: Fri, 23 Sep 2022 08:05:28 -0700 Subject: [PATCH 1/2] remove unused imports --- src/linalg/dense/matrix.rs | 2 +- src/linear/elastic_net.rs | 2 +- src/neighbors/knn_classifier.rs | 2 +- src/neighbors/knn_regressor.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/linalg/dense/matrix.rs b/src/linalg/dense/matrix.rs index 814f89ec..6ccc6230 100644 --- a/src/linalg/dense/matrix.rs +++ b/src/linalg/dense/matrix.rs @@ -7,7 +7,7 @@ use approx::{AbsDiffEq, RelativeEq}; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; -use crate::linalg::base::{Array, Array1, Array2, ArrayView1, ArrayView2, MutArray, MutArrayView2}; +use crate::linalg::base::{Array, Array2, ArrayView1, ArrayView2, MutArray, MutArrayView2}; use crate::linalg::cholesky_n::CholeskyDecomposable; use crate::linalg::evd_n::EVDDecomposable; use crate::linalg::lu_n::LUDecomposable; diff --git a/src/linear/elastic_net.rs b/src/linear/elastic_net.rs index c37433f6..1b848aa0 100644 --- a/src/linear/elastic_net.rs +++ b/src/linear/elastic_net.rs @@ -62,7 +62,7 @@ use serde::{Deserialize, Serialize}; use crate::api::{Predictor, SupervisedEstimator}; use crate::error::Failed; -use crate::linalg::base::{Array, Array1, Array2, ArrayView1, MutArray}; +use crate::linalg::base::{Array, Array1, Array2, MutArray}; use crate::num::{FloatNumber, Number}; use crate::linear::lasso_optimizer::InteriorPointOptimizer; diff --git a/src/neighbors/knn_classifier.rs b/src/neighbors/knn_classifier.rs index 7a9901ee..2af2283a 100644 --- a/src/neighbors/knn_classifier.rs +++ b/src/neighbors/knn_classifier.rs @@ -39,7 +39,7 @@ use serde::{Deserialize, Serialize}; use crate::algorithm::neighbour::{KNNAlgorithm, KNNAlgorithmName}; use crate::api::{Predictor, SupervisedEstimator}; use crate::error::Failed; -use crate::linalg::base::{Array1, Array2, ArrayView1}; +use crate::linalg::base::{Array1, Array2}; use crate::metrics::distance::euclidian::Euclidian; use crate::metrics::distance::{Distance, Distances}; use crate::neighbors::KNNWeightFunction; diff --git a/src/neighbors/knn_regressor.rs b/src/neighbors/knn_regressor.rs index 751d7874..4ed8607f 100644 --- a/src/neighbors/knn_regressor.rs +++ b/src/neighbors/knn_regressor.rs @@ -42,7 +42,7 @@ use serde::{Deserialize, Serialize}; use crate::algorithm::neighbour::{KNNAlgorithm, KNNAlgorithmName}; use crate::api::{Predictor, SupervisedEstimator}; use crate::error::Failed; -use crate::linalg::base::{Array1, Array2, ArrayView1}; +use crate::linalg::base::{Array1, Array2}; use crate::metrics::distance::euclidian::Euclidian; use crate::metrics::distance::{Distance, Distances}; use crate::neighbors::KNNWeightFunction; From 65ec0b561116629b3d3934031f19846ac10bea42 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Fri, 23 Sep 2022 08:10:27 -0700 Subject: [PATCH 2/2] use the rng with specified seed --- src/ensemble/random_forest_regressor.rs | 2 +- src/tree/decision_tree_regressor.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ensemble/random_forest_regressor.rs b/src/ensemble/random_forest_regressor.rs index c80cc75c..7ba1e9c8 100644 --- a/src/ensemble/random_forest_regressor.rs +++ b/src/ensemble/random_forest_regressor.rs @@ -401,7 +401,7 @@ impl, Y: Array1> for _ in 0..parameters.n_trees { let samples = RandomForestRegressor::::sample_with_replacement( n_rows, - &mut rand::thread_rng(), + &mut rng, ); let params = DecisionTreeRegressorParameters { max_depth: parameters.max_depth, diff --git a/src/tree/decision_tree_regressor.rs b/src/tree/decision_tree_regressor.rs index 5f1b7384..93a76ccd 100644 --- a/src/tree/decision_tree_regressor.rs +++ b/src/tree/decision_tree_regressor.rs @@ -518,7 +518,7 @@ impl, Y: Array1> let mut variables = (0..n_attr).collect::>(); if mtry < n_attr { - variables.shuffle(&mut rand::thread_rng()); + variables.shuffle(&mut rng); } let parent_gain =