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
4 changes: 2 additions & 2 deletions src/linalg/basic/matrix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ impl<T: Debug + Display + Copy + Sized> DenseMatrix<T> {

/// New instance of `DenseMatrix` from 2d array.
pub fn from_2d_array(values: &[&[T]]) -> Self {
DenseMatrix::from_2d_vec(&values.iter().map(|row| Vec::from(*row)).collect())
DenseMatrix::from_2d_vec(&values.iter().map(|row| Vec::from(*row)).collect::<Vec<_>>())
}

/// New instance of `DenseMatrix` from 2d vector.
pub fn from_2d_vec(values: &Vec<Vec<T>>) -> Self {
pub fn from_2d_vec(values: &[Vec<T>]) -> Self {
let nrows = values.len();
let ncols = values
.first()
Expand Down
10 changes: 5 additions & 5 deletions src/preprocessing/numerical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,11 @@ mod tests {
fn combine_three_columns() {
assert_eq!(
build_matrix_from_columns(vec![
DenseMatrix::from_2d_vec(&vec![vec![1.0], vec![1.0], vec![1.0],]),
DenseMatrix::from_2d_vec(&vec![vec![2.0], vec![2.0], vec![2.0],]),
DenseMatrix::from_2d_vec(&vec![vec![3.0], vec![3.0], vec![3.0],])
DenseMatrix::from_2d_vec(&[vec![1.0], vec![1.0], vec![1.0]]),
DenseMatrix::from_2d_vec(&[vec![2.0], vec![2.0], vec![2.0]]),
DenseMatrix::from_2d_vec(&[vec![3.0], vec![3.0], vec![3.0]])
]),
Some(DenseMatrix::from_2d_vec(&vec![
Some(DenseMatrix::from_2d_vec(&[
vec![1.0, 2.0, 3.0],
vec![1.0, 2.0, 3.0],
vec![1.0, 2.0, 3.0]
Expand Down Expand Up @@ -365,7 +365,7 @@ mod tests {
);

assert!(
&DenseMatrix::<f64>::from_2d_vec(&vec![fitted_scaler.stds]).approximate_eq(
&DenseMatrix::<f64>::from_2d_vec(&[fitted_scaler.stds]).approximate_eq(
&DenseMatrix::from_2d_array(&[&[
0.29426447500954,
0.16758497615485,
Expand Down