fix: correct from function
This commit is contained in:
parent
28fae41412
commit
1fdf5e281b
3 changed files with 11 additions and 9 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
|
@ -4,4 +4,4 @@ version = 3
|
|||
|
||||
[[package]]
|
||||
name = "matrix"
|
||||
version = "0.1.5"
|
||||
version = "0.1.7"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "matrix"
|
||||
version = "0.1.6"
|
||||
version = "0.1.7"
|
||||
edition = "2021"
|
||||
authors = ["Zhongheng Liu <z.liu@outlook.com.gr>"]
|
||||
homepage = "https://stvnliu.gitlab.io"
|
||||
|
|
|
|||
|
|
@ -11,17 +11,21 @@
|
|||
//! ```
|
||||
//! TODO:: Create matrix multiplication method
|
||||
|
||||
use std::{fmt::Display, ops::{Add, Mul, Sub}, str::FromStr};
|
||||
use std::{
|
||||
fmt::Display,
|
||||
ops::{Add, Mul, Sub},
|
||||
str::FromStr,
|
||||
};
|
||||
|
||||
use crate::error::{MatrixSetValueError, ParseMatrixError};
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
pub struct Matrix {
|
||||
/// Number of rows in matrix.
|
||||
pub nrows: usize,
|
||||
|
||||
|
||||
/// Number of columns in matrix.
|
||||
pub ncols: usize,
|
||||
|
||||
|
||||
/// Data stored in the matrix, you should not access this directly
|
||||
data: Vec<Vec<i32>>,
|
||||
}
|
||||
|
|
@ -121,7 +125,6 @@ impl Matrix {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl FromStr for Matrix {
|
||||
type Err = ParseMatrixError;
|
||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||
|
|
@ -188,7 +191,7 @@ impl<'a, 'b> Sub<&'b Matrix> for &'a Matrix {
|
|||
fn sub(self, rhs: &'b Matrix) -> Self::Output {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
}
|
||||
impl<'a, 'b> Mul<&'b Matrix> for &'a Matrix {
|
||||
type Output = Matrix;
|
||||
fn mul(self, rhs: &'b Matrix) -> Self::Output {
|
||||
|
|
@ -221,8 +224,7 @@ impl From<Vec<i32>> for Matrix {
|
|||
Matrix {
|
||||
nrows: value.len(),
|
||||
ncols: 1,
|
||||
data: vec![value],
|
||||
data: value.iter().map(|v| vec![*v]).collect(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue