mirror of
https://github.com/SinTan1729/matrix-basic.git
synced 2024-12-26 05:48:36 -06:00
new: Added row_echelon method
This commit is contained in:
parent
3f8373164b
commit
2c5d7c4d77
1 changed files with 61 additions and 4 deletions
65
src/lib.rs
65
src/lib.rs
|
@ -176,8 +176,8 @@ impl<T: Mul + Add + Sub> Matrix<T> {
|
||||||
/// # Example
|
/// # Example
|
||||||
/// ```
|
/// ```
|
||||||
/// use matrix_basic::Matrix;
|
/// use matrix_basic::Matrix;
|
||||||
/// let m = Matrix::from(vec![vec![1,2],vec![3,4]]).unwrap();
|
/// let m = Matrix::from(vec![vec![1.0,2.0],vec![3.0,4.0]]).unwrap();
|
||||||
/// assert_eq!(m.det(),Ok(-2));
|
/// assert_eq!(m.det(),Ok(-2.0));
|
||||||
/// ```
|
/// ```
|
||||||
pub fn det_in_field(&self) -> Result<T, &'static str>
|
pub fn det_in_field(&self) -> Result<T, &'static str>
|
||||||
where
|
where
|
||||||
|
@ -210,8 +210,9 @@ impl<T: Mul + Add + Sub> Matrix<T> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for j in (i + 1)..self.height() {
|
for j in (i + 1)..self.height() {
|
||||||
for k in (i + 1)..self.width() {
|
let ratio = rows[j][i] / rows[i][i];
|
||||||
rows[j][k] = rows[j][k] - rows[i][k] * rows[j][i] / rows[i][i];
|
for k in i..self.width() {
|
||||||
|
rows[j][k] = rows[j][k] - rows[i][k] * ratio;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -224,6 +225,62 @@ impl<T: Mul + Add + Sub> Matrix<T> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Return the row echelon form of a matrix over a field i.e. needs [`One`] and [`Div`] traits.
|
||||||
|
/// # Example
|
||||||
|
/// ```
|
||||||
|
/// use matrix_basic::Matrix;
|
||||||
|
/// let m = Matrix::from(vec![vec![1.0,2.0,3.0],vec![3.0,4.0,5.0]]).unwrap();
|
||||||
|
/// let n = Matrix::from(vec![vec![1.0,2.0,3.0], vec![0.0,-2.0,-4.0]]).unwrap();
|
||||||
|
/// assert_eq!(m.row_echelon(),n);
|
||||||
|
/// ```
|
||||||
|
pub fn row_echelon(&self) -> Self
|
||||||
|
where
|
||||||
|
T: Copy,
|
||||||
|
T: Mul<Output = T>,
|
||||||
|
T: Sub<Output = T>,
|
||||||
|
T: Zero,
|
||||||
|
T: One,
|
||||||
|
T: PartialEq,
|
||||||
|
T: Div<Output = T>,
|
||||||
|
T: Display,
|
||||||
|
{
|
||||||
|
// Cloning is necessary as we'll be doing row operations on it.
|
||||||
|
let mut rows = self.entries.clone();
|
||||||
|
let mut offset = 0;
|
||||||
|
for i in 0..self.height() {
|
||||||
|
// Check if all the rows below are 0
|
||||||
|
if i + offset >= self.width() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// First check if the row has diagonal element 0, if yes, then swap.
|
||||||
|
if rows[i][i + offset] == T::zero() {
|
||||||
|
let mut zero_column = true;
|
||||||
|
for j in (i + 1)..self.height() {
|
||||||
|
if rows[j][i + offset] != T::zero() {
|
||||||
|
rows.swap(i, j);
|
||||||
|
zero_column = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if zero_column {
|
||||||
|
offset += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for j in (i + 1)..self.height() {
|
||||||
|
let ratio = rows[j][i + offset] / rows[i][i + offset];
|
||||||
|
for k in (i + offset)..self.width() {
|
||||||
|
rows[j][k] = rows[j][k] - rows[i][k] * ratio;
|
||||||
|
println!(
|
||||||
|
"{}, {}",
|
||||||
|
rows[j][k],
|
||||||
|
rows[i][k] * rows[j][i + offset] / rows[i][i + offset]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Matrix { entries: rows }
|
||||||
|
}
|
||||||
|
|
||||||
/// Creates a zero matrix of a given size.
|
/// Creates a zero matrix of a given size.
|
||||||
pub fn zero(height: usize, width: usize) -> Self
|
pub fn zero(height: usize, width: usize) -> Self
|
||||||
where
|
where
|
||||||
|
|
Loading…
Reference in a new issue