2018-10-21 04:26:44 +08:00
|
|
|
use alga::general::{ClosedAdd, ClosedMul};
|
|
|
|
use num::{One, Zero};
|
2018-10-21 13:42:32 +08:00
|
|
|
use std::iter;
|
2018-10-21 04:26:44 +08:00
|
|
|
use std::marker::PhantomData;
|
|
|
|
use std::ops::{Add, Mul, Range};
|
2018-10-21 13:42:32 +08:00
|
|
|
use std::slice;
|
2018-10-21 04:26:44 +08:00
|
|
|
|
|
|
|
use allocator::Allocator;
|
2018-10-24 00:18:05 +08:00
|
|
|
use constraint::{AreMultipliable, DimEq, SameNumberOfRows, ShapeConstraint};
|
2018-10-21 04:26:44 +08:00
|
|
|
use storage::{Storage, StorageMut};
|
2018-10-24 00:18:05 +08:00
|
|
|
use {DefaultAllocator, Dim, Matrix, MatrixMN, Real, Scalar, Vector, VectorN, U1};
|
2018-10-21 04:26:44 +08:00
|
|
|
|
2018-10-21 13:42:32 +08:00
|
|
|
// FIXME: this structure exists for now only because impl trait
|
|
|
|
// cannot be used for trait method return types.
|
|
|
|
pub trait CsStorageIter<'a, N, R, C = U1> {
|
|
|
|
type ColumnEntries: Iterator<Item = (usize, N)>;
|
|
|
|
|
|
|
|
fn column_entries(&'a self, j: usize) -> Self::ColumnEntries;
|
|
|
|
}
|
|
|
|
|
|
|
|
pub trait CsStorage<N, R, C = U1>: for<'a> CsStorageIter<'a, N, R, C> {
|
2018-10-21 04:26:44 +08:00
|
|
|
fn shape(&self) -> (R, C);
|
|
|
|
unsafe fn row_index_unchecked(&self, i: usize) -> usize;
|
|
|
|
unsafe fn get_value_unchecked(&self, i: usize) -> &N;
|
|
|
|
fn get_value(&self, i: usize) -> &N;
|
|
|
|
fn row_index(&self, i: usize) -> usize;
|
2018-10-24 00:18:05 +08:00
|
|
|
fn column_range(&self, i: usize) -> Range<usize>;
|
|
|
|
fn len(&self) -> usize;
|
2018-10-21 04:26:44 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
pub trait CsStorageMut<N, R, C = U1>: CsStorage<N, R, C> {
|
|
|
|
/*
|
|
|
|
/// Sets the length of this column without initializing its values and row indices.
|
|
|
|
///
|
|
|
|
/// If the given length is larger than the current one, uninitialized entries are
|
|
|
|
/// added at the end of the column `i`. This will effectively shift all the matrix entries
|
2018-10-21 13:42:32 +08:00
|
|
|
/// of the columns at indices `j` with `j > i`.
|
|
|
|
fn set_column_len(&mut self, i: usize, len: usize);
|
2018-10-21 04:26:44 +08:00
|
|
|
*/
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Clone, Debug)]
|
|
|
|
pub struct CsVecStorage<N: Scalar, R: Dim, C: Dim>
|
|
|
|
where
|
|
|
|
DefaultAllocator: Allocator<usize, C>,
|
|
|
|
{
|
|
|
|
shape: (R, C),
|
|
|
|
p: VectorN<usize, C>,
|
|
|
|
i: Vec<usize>,
|
|
|
|
vals: Vec<N>,
|
|
|
|
}
|
|
|
|
|
2018-10-24 00:18:05 +08:00
|
|
|
impl<N: Scalar, R: Dim, C: Dim> CsVecStorage<N, R, C> where DefaultAllocator: Allocator<usize, C> {}
|
2018-10-21 13:42:32 +08:00
|
|
|
|
|
|
|
impl<'a, N: Scalar, R: Dim, C: Dim> CsStorageIter<'a, N, R, C> for CsVecStorage<N, R, C>
|
|
|
|
where
|
|
|
|
DefaultAllocator: Allocator<usize, C>,
|
|
|
|
{
|
|
|
|
type ColumnEntries =
|
|
|
|
iter::Zip<iter::Cloned<slice::Iter<'a, usize>>, iter::Cloned<slice::Iter<'a, N>>>;
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
fn column_entries(&'a self, j: usize) -> Self::ColumnEntries {
|
|
|
|
let rng = self.column_range(j);
|
|
|
|
self.i[rng.clone()]
|
|
|
|
.iter()
|
|
|
|
.cloned()
|
|
|
|
.zip(self.vals[rng].iter().cloned())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<N: Scalar, R: Dim, C: Dim> CsStorage<N, R, C> for CsVecStorage<N, R, C>
|
|
|
|
where
|
|
|
|
DefaultAllocator: Allocator<usize, C>,
|
|
|
|
{
|
|
|
|
#[inline]
|
|
|
|
fn shape(&self) -> (R, C) {
|
|
|
|
self.shape
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2018-10-24 00:18:05 +08:00
|
|
|
fn len(&self) -> usize {
|
2018-10-21 13:42:32 +08:00
|
|
|
self.vals.len()
|
|
|
|
}
|
2018-10-21 04:26:44 +08:00
|
|
|
|
|
|
|
#[inline]
|
|
|
|
fn row_index(&self, i: usize) -> usize {
|
|
|
|
self.i[i]
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
unsafe fn row_index_unchecked(&self, i: usize) -> usize {
|
|
|
|
*self.i.get_unchecked(i)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
unsafe fn get_value_unchecked(&self, i: usize) -> &N {
|
|
|
|
self.vals.get_unchecked(i)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
fn get_value(&self, i: usize) -> &N {
|
|
|
|
&self.vals[i]
|
|
|
|
}
|
2018-10-24 00:18:05 +08:00
|
|
|
|
|
|
|
#[inline]
|
|
|
|
fn column_range(&self, j: usize) -> Range<usize> {
|
|
|
|
let end = if j + 1 == self.p.len() {
|
|
|
|
self.len()
|
|
|
|
} else {
|
|
|
|
self.p[j + 1]
|
|
|
|
};
|
|
|
|
|
|
|
|
self.p[j]..end
|
|
|
|
}
|
2018-10-21 04:26:44 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
pub struct CsSliceStorage<'a, N: Scalar, R: Dim, C: DimAdd<U1>> {
|
|
|
|
shape: (R, C),
|
|
|
|
p: VectorSlice<usize, DimSum<C, U1>>,
|
|
|
|
i: VectorSlice<usize, Dynamic>,
|
|
|
|
vals: VectorSlice<N, Dynamic>,
|
|
|
|
}*/
|
|
|
|
|
|
|
|
/// A compressed sparse column matrix.
|
|
|
|
#[derive(Clone, Debug)]
|
|
|
|
pub struct CsMatrix<N: Scalar, R: Dim, C: Dim, S: CsStorage<N, R, C> = CsVecStorage<N, R, C>> {
|
|
|
|
pub data: S,
|
|
|
|
_phantoms: PhantomData<(N, R, C)>,
|
|
|
|
}
|
|
|
|
|
2018-10-21 04:27:18 +08:00
|
|
|
pub type CsVector<N, R, S = CsVecStorage<N, R, U1>> = CsMatrix<N, R, U1, S>;
|
2018-10-21 04:26:44 +08:00
|
|
|
|
|
|
|
impl<N: Scalar, R: Dim, C: Dim> CsMatrix<N, R, C>
|
|
|
|
where
|
|
|
|
DefaultAllocator: Allocator<usize, C>,
|
|
|
|
{
|
|
|
|
pub fn new_uninitialized_generic(nrows: R, ncols: C, nvals: usize) -> Self {
|
|
|
|
let mut i = Vec::with_capacity(nvals);
|
|
|
|
unsafe {
|
|
|
|
i.set_len(nvals);
|
|
|
|
}
|
|
|
|
i.shrink_to_fit();
|
|
|
|
|
|
|
|
let mut vals = Vec::with_capacity(nvals);
|
|
|
|
unsafe {
|
|
|
|
vals.set_len(nvals);
|
|
|
|
}
|
|
|
|
vals.shrink_to_fit();
|
|
|
|
|
|
|
|
CsMatrix {
|
|
|
|
data: CsVecStorage {
|
|
|
|
shape: (nrows, ncols),
|
2018-10-24 00:18:05 +08:00
|
|
|
p: VectorN::zeros_generic(ncols, U1),
|
2018-10-21 04:26:44 +08:00
|
|
|
i,
|
|
|
|
vals,
|
|
|
|
},
|
|
|
|
_phantoms: PhantomData,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn cumsum<D: Dim>(a: &mut VectorN<usize, D>, b: &mut VectorN<usize, D>) -> usize
|
|
|
|
where
|
|
|
|
DefaultAllocator: Allocator<usize, D>,
|
|
|
|
{
|
|
|
|
assert!(a.len() == b.len());
|
|
|
|
let mut sum = 0;
|
|
|
|
|
|
|
|
for i in 0..a.len() {
|
|
|
|
b[i] = sum;
|
|
|
|
sum += a[i];
|
|
|
|
a[i] = b[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
sum
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<N: Scalar, R: Dim, C: Dim, S: CsStorage<N, R, C>> CsMatrix<N, R, C, S> {
|
2018-10-24 00:18:05 +08:00
|
|
|
pub fn len(&self) -> usize {
|
|
|
|
self.data.len()
|
2018-10-21 04:26:44 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn transpose(&self) -> CsMatrix<N, C, R>
|
|
|
|
where
|
|
|
|
DefaultAllocator: Allocator<usize, R>,
|
|
|
|
{
|
|
|
|
let (nrows, ncols) = self.data.shape();
|
|
|
|
|
2018-10-24 00:18:05 +08:00
|
|
|
let nvals = self.len();
|
2018-10-21 04:26:44 +08:00
|
|
|
let mut res = CsMatrix::new_uninitialized_generic(ncols, nrows, nvals);
|
|
|
|
let mut workspace = Vector::zeros_generic(nrows, U1);
|
|
|
|
|
|
|
|
// Compute p.
|
|
|
|
for i in 0..nvals {
|
|
|
|
let row_id = self.data.row_index(i);
|
|
|
|
workspace[row_id] += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
let _ = cumsum(&mut workspace, &mut res.data.p);
|
|
|
|
|
|
|
|
// Fill the result.
|
|
|
|
for j in 0..ncols.value() {
|
2018-10-21 13:42:32 +08:00
|
|
|
for (row_id, value) in self.data.column_entries(j) {
|
2018-10-21 04:26:44 +08:00
|
|
|
let shift = workspace[row_id];
|
|
|
|
|
2018-10-21 13:42:32 +08:00
|
|
|
res.data.vals[shift] = value;
|
2018-10-21 04:26:44 +08:00
|
|
|
res.data.i[shift] = j;
|
|
|
|
workspace[row_id] += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res
|
|
|
|
}
|
|
|
|
|
|
|
|
fn scatter<R2: Dim, C2: Dim>(
|
|
|
|
&self,
|
|
|
|
j: usize,
|
|
|
|
beta: N,
|
|
|
|
timestamps: &mut [usize],
|
|
|
|
timestamp: usize,
|
|
|
|
workspace: &mut [N],
|
|
|
|
mut nz: usize,
|
|
|
|
res: &mut CsMatrix<N, R2, C2>,
|
|
|
|
) -> usize
|
|
|
|
where
|
|
|
|
N: ClosedAdd + ClosedMul,
|
|
|
|
DefaultAllocator: Allocator<usize, C2>,
|
|
|
|
{
|
2018-10-21 13:42:32 +08:00
|
|
|
for (i, val) in self.data.column_entries(j) {
|
2018-10-21 04:26:44 +08:00
|
|
|
if timestamps[i] < timestamp {
|
|
|
|
timestamps[i] = timestamp;
|
|
|
|
res.data.i[nz] = i;
|
|
|
|
nz += 1;
|
2018-10-21 13:42:32 +08:00
|
|
|
workspace[i] = val * beta;
|
2018-10-21 04:26:44 +08:00
|
|
|
} else {
|
2018-10-21 13:42:32 +08:00
|
|
|
workspace[i] += val * beta;
|
2018-10-21 04:26:44 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
nz
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-22 23:55:13 +08:00
|
|
|
impl<N: Real, D: Dim, S: CsStorage<N, D, D>> CsMatrix<N, D, D, S> {
|
|
|
|
pub fn solve_lower_triangular<R2: Dim, C2: Dim, S2>(
|
|
|
|
&self,
|
|
|
|
b: &Matrix<N, R2, C2, S2>,
|
|
|
|
) -> Option<MatrixMN<N, R2, C2>>
|
2018-10-24 00:18:05 +08:00
|
|
|
where
|
|
|
|
S2: Storage<N, R2, C2>,
|
|
|
|
DefaultAllocator: Allocator<N, R2, C2>,
|
|
|
|
ShapeConstraint: SameNumberOfRows<D, R2>,
|
2018-10-22 23:55:13 +08:00
|
|
|
{
|
|
|
|
let mut b = b.clone_owned();
|
2018-10-24 00:18:05 +08:00
|
|
|
if self.solve_lower_triangular_mut(&mut b) {
|
|
|
|
Some(b)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
2018-10-22 23:55:13 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn tr_solve_lower_triangular<R2: Dim, C2: Dim, S2>(
|
|
|
|
&self,
|
|
|
|
b: &Matrix<N, R2, C2, S2>,
|
|
|
|
) -> Option<MatrixMN<N, R2, C2>>
|
2018-10-24 00:18:05 +08:00
|
|
|
where
|
|
|
|
S2: Storage<N, R2, C2>,
|
|
|
|
DefaultAllocator: Allocator<N, R2, C2>,
|
|
|
|
ShapeConstraint: SameNumberOfRows<D, R2>,
|
2018-10-22 23:55:13 +08:00
|
|
|
{
|
|
|
|
let mut b = b.clone_owned();
|
|
|
|
if self.tr_solve_lower_triangular_mut(&mut b) {
|
|
|
|
Some(b)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn solve_lower_triangular_mut<R2: Dim, C2: Dim, S2>(
|
|
|
|
&self,
|
|
|
|
b: &mut Matrix<N, R2, C2, S2>,
|
|
|
|
) -> bool
|
2018-10-24 00:18:05 +08:00
|
|
|
where
|
|
|
|
S2: StorageMut<N, R2, C2>,
|
|
|
|
ShapeConstraint: SameNumberOfRows<D, R2>,
|
2018-10-22 23:55:13 +08:00
|
|
|
{
|
|
|
|
let (nrows, ncols) = self.data.shape();
|
|
|
|
assert_eq!(nrows.value(), ncols.value(), "The matrix must be square.");
|
|
|
|
assert_eq!(nrows.value(), b.len(), "Mismatched matrix dimensions.");
|
|
|
|
|
|
|
|
for j2 in 0..b.ncols() {
|
|
|
|
let mut b = b.column_mut(j2);
|
|
|
|
|
|
|
|
for j in 0..ncols.value() {
|
|
|
|
let mut column = self.data.column_entries(j);
|
|
|
|
let mut diag_found = false;
|
|
|
|
|
|
|
|
while let Some((i, val)) = column.next() {
|
|
|
|
if i == j {
|
|
|
|
if val.is_zero() {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
b[j] /= val;
|
|
|
|
diag_found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if !diag_found {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i, val) in column {
|
|
|
|
b[i] -= b[j] * val;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
true
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn tr_solve_lower_triangular_mut<R2: Dim, C2: Dim, S2>(
|
|
|
|
&self,
|
|
|
|
b: &mut Matrix<N, R2, C2, S2>,
|
|
|
|
) -> bool
|
2018-10-24 00:18:05 +08:00
|
|
|
where
|
|
|
|
S2: StorageMut<N, R2, C2>,
|
|
|
|
ShapeConstraint: SameNumberOfRows<D, R2>,
|
2018-10-22 23:55:13 +08:00
|
|
|
{
|
|
|
|
let (nrows, ncols) = self.data.shape();
|
|
|
|
assert_eq!(nrows.value(), ncols.value(), "The matrix must be square.");
|
|
|
|
assert_eq!(nrows.value(), b.len(), "Mismatched matrix dimensions.");
|
|
|
|
|
|
|
|
for j2 in 0..b.ncols() {
|
|
|
|
let mut b = b.column_mut(j2);
|
|
|
|
|
|
|
|
for j in (0..ncols.value()).rev() {
|
|
|
|
let mut column = self.data.column_entries(j);
|
|
|
|
let mut diag = None;
|
|
|
|
|
|
|
|
while let Some((i, val)) = column.next() {
|
|
|
|
if i == j {
|
|
|
|
if val.is_zero() {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
diag = Some(val);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if let Some(diag) = diag {
|
|
|
|
for (i, val) in column {
|
|
|
|
b[j] -= val * b[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
b[j] /= diag;
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
true
|
|
|
|
}
|
2018-10-24 00:18:05 +08:00
|
|
|
|
|
|
|
pub fn solve_lower_triangular_cs<D2: Dim, S2>(
|
|
|
|
&self,
|
|
|
|
b: &CsVector<N, D2, S2>,
|
|
|
|
) -> Option<CsVector<N, D2>>
|
|
|
|
where
|
|
|
|
S2: CsStorage<N, D2>,
|
|
|
|
DefaultAllocator: Allocator<bool, D> + Allocator<N, D2> + Allocator<usize, D2>,
|
|
|
|
ShapeConstraint: SameNumberOfRows<D, D2>,
|
|
|
|
{
|
|
|
|
let mut reach = Vec::new();
|
|
|
|
self.lower_triangular_reach(b, &mut reach);
|
|
|
|
let mut workspace = unsafe { VectorN::new_uninitialized_generic(b.data.shape().0, U1) };
|
|
|
|
|
|
|
|
for i in reach.iter().cloned() {
|
|
|
|
workspace[i] = N::zero();
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i, val) in b.data.column_entries(0) {
|
|
|
|
workspace[i] = val;
|
|
|
|
}
|
|
|
|
|
|
|
|
for j in reach.iter().cloned().rev() {
|
|
|
|
let mut column = self.data.column_entries(j);
|
|
|
|
let mut diag_found = false;
|
|
|
|
|
|
|
|
while let Some((i, val)) = column.next() {
|
|
|
|
if i == j {
|
|
|
|
if val.is_zero() {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
workspace[j] /= val;
|
|
|
|
diag_found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if !diag_found {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i, val) in column {
|
|
|
|
workspace[i] -= workspace[j] * val;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Copy the result into a sparse vector.
|
|
|
|
let mut result = CsVector::new_uninitialized_generic(b.data.shape().0, U1, reach.len());
|
|
|
|
|
|
|
|
for (i, val) in reach.iter().zip(result.data.vals.iter_mut()) {
|
|
|
|
*val = workspace[*i];
|
|
|
|
}
|
|
|
|
|
|
|
|
result.data.i = reach;
|
|
|
|
Some(result)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn lower_triangular_reach<D2: Dim, S2>(&self, b: &CsVector<N, D2, S2>, xi: &mut Vec<usize>)
|
|
|
|
where
|
|
|
|
S2: CsStorage<N, D2>,
|
|
|
|
DefaultAllocator: Allocator<bool, D>,
|
|
|
|
{
|
|
|
|
let mut visited = VectorN::repeat_generic(self.data.shape().1, U1, false);
|
|
|
|
let mut stack = Vec::new();
|
|
|
|
|
|
|
|
for i in b.data.column_range(0) {
|
|
|
|
let row_index = b.data.row_index(i);
|
|
|
|
|
|
|
|
if !visited[row_index] {
|
|
|
|
let rng = self.data.column_range(row_index);
|
|
|
|
stack.push((row_index, rng));
|
|
|
|
self.lower_triangular_dfs(visited.as_mut_slice(), &mut stack, xi);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn lower_triangular_dfs(
|
|
|
|
&self,
|
|
|
|
visited: &mut [bool],
|
|
|
|
stack: &mut Vec<(usize, Range<usize>)>,
|
|
|
|
xi: &mut Vec<usize>,
|
|
|
|
) {
|
|
|
|
'recursion: while let Some((j, rng)) = stack.pop() {
|
|
|
|
visited[j] = true;
|
|
|
|
|
|
|
|
for i in rng.clone() {
|
|
|
|
let row_id = self.data.row_index(i);
|
|
|
|
if row_id > j && !visited[row_id] {
|
|
|
|
stack.push((j, (i + 1)..rng.end));
|
|
|
|
|
|
|
|
let row_id = self.data.row_index(i);
|
|
|
|
stack.push((row_id, self.data.column_range(row_id)));
|
|
|
|
continue 'recursion;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
xi.push(j)
|
|
|
|
}
|
|
|
|
}
|
2018-10-22 23:55:13 +08:00
|
|
|
}
|
|
|
|
|
2018-10-21 04:26:44 +08:00
|
|
|
/*
|
|
|
|
impl<N: Scalar, R, S> CsVector<N, R, S> {
|
|
|
|
pub fn axpy(&mut self, alpha: N, x: CsVector<N, R, S>, beta: N) {
|
|
|
|
// First, compute the number of non-zero entries.
|
|
|
|
let mut nnzero = 0;
|
|
|
|
|
|
|
|
// Allocate a size large enough.
|
|
|
|
self.data.set_column_len(0, nnzero);
|
|
|
|
|
|
|
|
// Fill with the axpy.
|
2018-10-24 00:18:05 +08:00
|
|
|
let mut i = self.len();
|
|
|
|
let mut j = x.len();
|
2018-10-21 04:26:44 +08:00
|
|
|
let mut k = nnzero - 1;
|
|
|
|
let mut rid1 = self.data.row_index(0, i - 1);
|
|
|
|
let mut rid2 = x.data.row_index(0, j - 1);
|
|
|
|
|
|
|
|
while k > 0 {
|
|
|
|
if rid1 == rid2 {
|
|
|
|
self.data.set_row_index(0, k, rid1);
|
|
|
|
self[k] = alpha * x[j] + beta * self[k];
|
|
|
|
i -= 1;
|
|
|
|
j -= 1;
|
|
|
|
} else if rid1 < rid2 {
|
|
|
|
self.data.set_row_index(0, k, rid1);
|
|
|
|
self[k] = beta * self[i];
|
|
|
|
i -= 1;
|
|
|
|
} else {
|
|
|
|
self.data.set_row_index(0, k, rid2);
|
|
|
|
self[k] = alpha * x[j];
|
|
|
|
j -= 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
k -= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
|
|
|
|
impl<N: Scalar + Zero + ClosedAdd + ClosedMul, D: Dim, S: StorageMut<N, D>> Vector<N, D, S> {
|
|
|
|
pub fn axpy_cs<D2: Dim, S2>(&mut self, alpha: N, x: &CsVector<N, D2, S2>, beta: N)
|
|
|
|
where
|
|
|
|
S2: CsStorage<N, D2>,
|
|
|
|
ShapeConstraint: DimEq<D, D2>,
|
|
|
|
{
|
|
|
|
if beta.is_zero() {
|
2018-10-24 00:18:05 +08:00
|
|
|
for i in 0..x.len() {
|
2018-10-21 04:26:44 +08:00
|
|
|
unsafe {
|
|
|
|
let k = x.data.row_index_unchecked(i);
|
|
|
|
let y = self.vget_unchecked_mut(k);
|
|
|
|
*y = alpha * *x.data.get_value_unchecked(i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2018-10-21 04:27:18 +08:00
|
|
|
// Needed to be sure even components not present on `x` are multiplied.
|
|
|
|
*self *= beta;
|
|
|
|
|
2018-10-24 00:18:05 +08:00
|
|
|
for i in 0..x.len() {
|
2018-10-21 04:26:44 +08:00
|
|
|
unsafe {
|
|
|
|
let k = x.data.row_index_unchecked(i);
|
|
|
|
let y = self.vget_unchecked_mut(k);
|
2018-10-21 04:27:18 +08:00
|
|
|
*y += alpha * *x.data.get_value_unchecked(i);
|
2018-10-21 04:26:44 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
pub fn gemv_sparse<R2: Dim, C2: Dim, S2>(&mut self, alpha: N, a: &CsMatrix<N, R2, C2, S2>, x: &DVector<N>, beta: N)
|
|
|
|
where
|
|
|
|
S2: CsStorage<N, R2, C2> {
|
|
|
|
let col2 = a.column(0);
|
|
|
|
let val = unsafe { *x.vget_unchecked(0) };
|
|
|
|
self.axpy_sparse(alpha * val, &col2, beta);
|
|
|
|
|
|
|
|
for j in 1..ncols2 {
|
|
|
|
let col2 = a.column(j);
|
|
|
|
let val = unsafe { *x.vget_unchecked(j) };
|
|
|
|
|
|
|
|
self.axpy_sparse(alpha * val, &col2, N::one());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, 'b, N, R1, R2, C1, C2, S1, S2> Mul<&'b CsMatrix<N, R2, C2, S2>>
|
|
|
|
for &'a CsMatrix<N, R1, C1, S1>
|
|
|
|
where
|
|
|
|
N: Scalar + ClosedAdd + ClosedMul + Zero,
|
|
|
|
R1: Dim,
|
|
|
|
C1: Dim,
|
|
|
|
R2: Dim,
|
|
|
|
C2: Dim,
|
|
|
|
S1: CsStorage<N, R1, C1>,
|
|
|
|
S2: CsStorage<N, R2, C2>,
|
|
|
|
ShapeConstraint: AreMultipliable<R1, C1, R2, C2>,
|
|
|
|
DefaultAllocator: Allocator<usize, C2> + Allocator<usize, R1> + Allocator<N, R1>,
|
|
|
|
{
|
|
|
|
type Output = CsMatrix<N, R1, C2>;
|
|
|
|
|
|
|
|
fn mul(self, rhs: &'b CsMatrix<N, R2, C2, S2>) -> CsMatrix<N, R1, C2> {
|
|
|
|
let (nrows1, ncols1) = self.data.shape();
|
|
|
|
let (nrows2, ncols2) = rhs.data.shape();
|
|
|
|
assert_eq!(
|
|
|
|
ncols1.value(),
|
|
|
|
nrows2.value(),
|
|
|
|
"Mismatched dimensions for matrix multiplication."
|
|
|
|
);
|
|
|
|
|
2018-10-24 00:18:05 +08:00
|
|
|
let mut res = CsMatrix::new_uninitialized_generic(nrows1, ncols2, self.len() + rhs.len());
|
2018-10-21 04:26:44 +08:00
|
|
|
let mut timestamps = VectorN::zeros_generic(nrows1, U1);
|
|
|
|
let mut workspace = unsafe { VectorN::new_uninitialized_generic(nrows1, U1) };
|
|
|
|
let mut nz = 0;
|
|
|
|
|
|
|
|
for j in 0..ncols2.value() {
|
|
|
|
res.data.p[j] = nz;
|
|
|
|
let new_size_bound = nz + nrows1.value();
|
|
|
|
res.data.i.resize(new_size_bound, 0);
|
|
|
|
res.data.vals.resize(new_size_bound, N::zero());
|
|
|
|
|
2018-10-21 13:42:32 +08:00
|
|
|
for (i, val) in rhs.data.column_entries(j) {
|
2018-10-21 04:26:44 +08:00
|
|
|
nz = self.scatter(
|
|
|
|
i,
|
2018-10-21 13:42:32 +08:00
|
|
|
val,
|
2018-10-21 04:26:44 +08:00
|
|
|
timestamps.as_mut_slice(),
|
|
|
|
j + 1,
|
|
|
|
workspace.as_mut_slice(),
|
|
|
|
nz,
|
|
|
|
&mut res,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
for p in res.data.p[j]..nz {
|
|
|
|
res.data.vals[p] = workspace[res.data.i[p]]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res.data.i.truncate(nz);
|
|
|
|
res.data.i.shrink_to_fit();
|
|
|
|
res.data.vals.truncate(nz);
|
|
|
|
res.data.vals.shrink_to_fit();
|
|
|
|
res
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, 'b, N, R1, R2, C1, C2, S1, S2> Add<&'b CsMatrix<N, R2, C2, S2>>
|
|
|
|
for &'a CsMatrix<N, R1, C1, S1>
|
|
|
|
where
|
|
|
|
N: Scalar + ClosedAdd + ClosedMul + One,
|
|
|
|
R1: Dim,
|
|
|
|
C1: Dim,
|
|
|
|
R2: Dim,
|
|
|
|
C2: Dim,
|
|
|
|
S1: CsStorage<N, R1, C1>,
|
|
|
|
S2: CsStorage<N, R2, C2>,
|
|
|
|
ShapeConstraint: DimEq<R1, R2> + DimEq<C1, C2>,
|
|
|
|
DefaultAllocator: Allocator<usize, C2> + Allocator<usize, R1> + Allocator<N, R1>,
|
|
|
|
{
|
|
|
|
type Output = CsMatrix<N, R1, C2>;
|
|
|
|
|
|
|
|
fn add(self, rhs: &'b CsMatrix<N, R2, C2, S2>) -> CsMatrix<N, R1, C2> {
|
|
|
|
let (nrows1, ncols1) = self.data.shape();
|
|
|
|
let (nrows2, ncols2) = rhs.data.shape();
|
|
|
|
assert_eq!(
|
|
|
|
(nrows1.value(), ncols1.value()),
|
|
|
|
(nrows2.value(), ncols2.value()),
|
|
|
|
"Mismatched dimensions for matrix sum."
|
|
|
|
);
|
|
|
|
|
2018-10-24 00:18:05 +08:00
|
|
|
let mut res = CsMatrix::new_uninitialized_generic(nrows1, ncols2, self.len() + rhs.len());
|
2018-10-21 04:26:44 +08:00
|
|
|
let mut timestamps = VectorN::zeros_generic(nrows1, U1);
|
|
|
|
let mut workspace = unsafe { VectorN::new_uninitialized_generic(nrows1, U1) };
|
|
|
|
let mut nz = 0;
|
|
|
|
|
|
|
|
for j in 0..ncols2.value() {
|
|
|
|
res.data.p[j] = nz;
|
|
|
|
|
|
|
|
nz = self.scatter(
|
|
|
|
j,
|
|
|
|
N::one(),
|
|
|
|
timestamps.as_mut_slice(),
|
|
|
|
j + 1,
|
|
|
|
workspace.as_mut_slice(),
|
|
|
|
nz,
|
|
|
|
&mut res,
|
|
|
|
);
|
|
|
|
|
|
|
|
nz = rhs.scatter(
|
|
|
|
j,
|
|
|
|
N::one(),
|
|
|
|
timestamps.as_mut_slice(),
|
|
|
|
j + 1,
|
|
|
|
workspace.as_mut_slice(),
|
|
|
|
nz,
|
|
|
|
&mut res,
|
|
|
|
);
|
|
|
|
|
|
|
|
for p in res.data.p[j]..nz {
|
|
|
|
res.data.vals[p] = workspace[res.data.i[p]]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res.data.i.truncate(nz);
|
|
|
|
res.data.i.shrink_to_fit();
|
|
|
|
res.data.vals.truncate(nz);
|
|
|
|
res.data.vals.shrink_to_fit();
|
|
|
|
res
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-24 00:18:05 +08:00
|
|
|
use std::fmt::Debug;
|
2018-10-21 04:26:44 +08:00
|
|
|
impl<'a, N: Scalar + Zero, R: Dim, C: Dim, S> From<CsMatrix<N, R, C, S>> for MatrixMN<N, R, C>
|
|
|
|
where
|
2018-10-24 00:18:05 +08:00
|
|
|
S: CsStorage<N, R, C> + Debug,
|
2018-10-21 04:26:44 +08:00
|
|
|
DefaultAllocator: Allocator<N, R, C>,
|
|
|
|
{
|
|
|
|
fn from(m: CsMatrix<N, R, C, S>) -> Self {
|
|
|
|
let (nrows, ncols) = m.data.shape();
|
|
|
|
let mut res = MatrixMN::zeros_generic(nrows, ncols);
|
|
|
|
|
|
|
|
for j in 0..ncols.value() {
|
2018-10-21 13:42:32 +08:00
|
|
|
for (i, val) in m.data.column_entries(j) {
|
|
|
|
res[(i, j)] = val;
|
2018-10-21 04:26:44 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, N: Scalar + Zero, R: Dim, C: Dim, S> From<Matrix<N, R, C, S>> for CsMatrix<N, R, C>
|
|
|
|
where
|
|
|
|
S: Storage<N, R, C>,
|
|
|
|
DefaultAllocator: Allocator<N, R, C> + Allocator<usize, C>,
|
|
|
|
{
|
|
|
|
fn from(m: Matrix<N, R, C, S>) -> Self {
|
|
|
|
let (nrows, ncols) = m.data.shape();
|
2018-10-24 00:18:05 +08:00
|
|
|
let len = m.iter().filter(|e| !e.is_zero()).count();
|
|
|
|
let mut res = CsMatrix::new_uninitialized_generic(nrows, ncols, len);
|
2018-10-21 04:26:44 +08:00
|
|
|
let mut nz = 0;
|
|
|
|
|
|
|
|
for j in 0..ncols.value() {
|
|
|
|
let column = m.column(j);
|
|
|
|
res.data.p[j] = nz;
|
|
|
|
|
|
|
|
for i in 0..nrows.value() {
|
|
|
|
if !column[i].is_zero() {
|
|
|
|
res.data.i[nz] = i;
|
|
|
|
res.data.vals[nz] = column[i];
|
|
|
|
nz += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res
|
|
|
|
}
|
|
|
|
}
|