feat: refactors matrix decomposition routines

This commit is contained in:
Volodymyr Orlov
2020-03-12 17:32:27 -07:00
parent 7b3fa982be
commit cb4323f26e
11 changed files with 1381 additions and 1256 deletions
+198
View File
@@ -0,0 +1,198 @@
use crate::linalg::BaseMatrix;
#[derive(Debug, Clone)]
pub struct QR<M: BaseMatrix> {
QR: M,
tau: Vec<f64>,
singular: bool
}
impl<M: BaseMatrix> QR<M> {
pub fn new(QR: M, tau: Vec<f64>) -> QR<M> {
let mut singular = false;
for j in 0..tau.len() {
if tau[j] == 0. {
singular = true;
break;
}
}
QR {
QR: QR,
tau: tau,
singular: singular
}
}
pub fn R(&self) -> M {
let (_, n) = self.QR.shape();
let mut R = M::zeros(n, n);
for i in 0..n {
R.set(i, i, self.tau[i]);
for j in i+1..n {
R.set(i, j, self.QR.get(i, j));
}
}
return R;
}
pub fn Q(&self) -> M {
let (m, n) = self.QR.shape();
let mut Q = M::zeros(m, n);
let mut k = n - 1;
loop {
Q.set(k, k, 1.0);
for j in k..n {
if self.QR.get(k, k) != 0f64 {
let mut s = 0f64;
for i in k..m {
s += self.QR.get(i, k) * Q.get(i, j);
}
s = -s / self.QR.get(k, k);
for i in k..m {
Q.add_element_mut(i, j, s * self.QR.get(i, k));
}
}
}
if k == 0 {
break;
} else {
k -= 1;
}
}
return Q;
}
fn solve(&self, mut b: M) -> M {
let (m, n) = self.QR.shape();
let (b_nrows, b_ncols) = b.shape();
if b_nrows != m {
panic!("Row dimensions do not agree: A is {} x {}, but B is {} x {}", m, n, b_nrows, b_ncols);
}
if self.singular {
panic!("Matrix is rank deficient.");
}
for k in 0..n {
for j in 0..b_ncols {
let mut s = 0f64;
for i in k..m {
s += self.QR.get(i, k) * b.get(i, j);
}
s = -s / self.QR.get(k, k);
for i in k..m {
b.add_element_mut(i, j, s * self.QR.get(i, k));
}
}
}
for k in (0..n).rev() {
for j in 0..b_ncols {
b.set(k, j, b.get(k, j) / self.tau[k]);
}
for i in 0..k {
for j in 0..b_ncols {
b.sub_element_mut(i, j, b.get(k, j) * self.QR.get(i, k));
}
}
}
b
}
}
pub trait QRDecomposableMatrix: BaseMatrix {
fn qr(&self) -> QR<Self> {
self.clone().qr_mut()
}
fn qr_mut(mut self) -> QR<Self> {
let (m, n) = self.shape();
let mut r_diagonal: Vec<f64> = vec![0f64; n];
for k in 0..n {
let mut nrm = 0f64;
for i in k..m {
nrm = nrm.hypot(self.get(i, k));
}
if nrm.abs() > std::f64::EPSILON {
if self.get(k, k) < 0f64 {
nrm = -nrm;
}
for i in k..m {
self.div_element_mut(i, k, nrm);
}
self.add_element_mut(k, k, 1f64);
for j in k+1..n {
let mut s = 0f64;
for i in k..m {
s += self.get(i, k) * self.get(i, j);
}
s = -s / self.get(k, k);
for i in k..m {
self.add_element_mut(i, j, s * self.get(i, k));
}
}
}
r_diagonal[k] = -nrm;
}
QR::new(self, r_diagonal)
}
fn qr_solve_mut(self, b: Self) -> Self {
self.qr_mut().solve(b)
}
}
#[cfg(test)]
mod tests {
use super::*;
use crate::linalg::naive::dense_matrix::*;
#[test]
fn decompose() {
let a = DenseMatrix::from_array(&[&[0.9, 0.4, 0.7], &[0.4, 0.5, 0.3], &[0.7, 0.3, 0.8]]);
let q = DenseMatrix::from_array(&[
&[-0.7448, 0.2436, 0.6212],
&[-0.331, -0.9432, -0.027],
&[-0.5793, 0.2257, -0.7832]]);
let r = DenseMatrix::from_array(&[
&[-1.2083, -0.6373, -1.0842],
&[0.0, -0.3064, 0.0682],
&[0.0, 0.0, -0.1999]]);
let qr = a.qr();
assert!(qr.Q().abs().approximate_eq(&q.abs(), 1e-4));
assert!(qr.R().abs().approximate_eq(&r.abs(), 1e-4));
}
#[test]
fn qr_solve_mut() {
let a = DenseMatrix::from_array(&[&[0.9, 0.4, 0.7], &[0.4, 0.5, 0.3], &[0.7, 0.3, 0.8]]);
let b = DenseMatrix::from_array(&[&[0.5, 0.2],&[0.5, 0.8], &[0.5, 0.3]]);
let expected_w = DenseMatrix::from_array(&[
&[-0.2027027, -1.2837838],
&[0.8783784, 2.2297297],
&[0.4729730, 0.6621622]
]);
let w = a.qr_solve_mut(b);
assert!(w.approximate_eq(&expected_w, 1e-2));
}
}