2013-06-02 02:50:00 +08:00
|
|
|
use std::num::{One, Zero};
|
2013-07-02 18:00:55 +08:00
|
|
|
use std::vec::from_elem;
|
2013-06-02 02:50:00 +08:00
|
|
|
use std::cmp::ApproxEq;
|
2013-09-05 06:01:10 +08:00
|
|
|
use std::util;
|
2013-05-31 17:28:42 +08:00
|
|
|
use traits::inv::Inv;
|
|
|
|
use traits::transpose::Transpose;
|
2013-06-16 04:16:44 +08:00
|
|
|
use traits::rlmul::{RMul, LMul};
|
2013-09-05 06:01:10 +08:00
|
|
|
use dvec::DVec;
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
/// Matrix with dimensions unknown at compile-time.
|
2013-05-31 17:28:42 +08:00
|
|
|
#[deriving(Eq, ToStr, Clone)]
|
2013-08-05 16:13:44 +08:00
|
|
|
pub struct DMat<N> {
|
2013-09-05 06:01:10 +08:00
|
|
|
priv nrows: uint,
|
|
|
|
priv ncols: uint,
|
2013-08-05 15:44:56 +08:00
|
|
|
priv mij: ~[N]
|
2013-05-31 17:28:42 +08:00
|
|
|
}
|
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
impl<N: Zero + Clone> DMat<N> {
|
|
|
|
/// Builds a matrix filled with zeros.
|
|
|
|
///
|
|
|
|
/// # Arguments
|
|
|
|
/// * `dim` - The dimension of the matrix. A `dim`-dimensional matrix contains `dim * dim`
|
|
|
|
/// components.
|
|
|
|
#[inline]
|
|
|
|
pub fn new_zeros(nrows: uint, ncols: uint) -> DMat<N> {
|
|
|
|
DMat {
|
|
|
|
nrows: nrows,
|
|
|
|
ncols: ncols,
|
|
|
|
mij: from_elem(nrows * ncols, Zero::zero())
|
|
|
|
}
|
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
/// Tests if all components of the matrix are zeroes.
|
|
|
|
#[inline]
|
|
|
|
pub fn is_zero(&self) -> bool {
|
|
|
|
self.mij.iter().all(|e| e.is_zero())
|
|
|
|
}
|
2013-08-05 16:13:44 +08:00
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
// FIXME: add a function to modify the dimension (to avoid useless allocations)?
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
impl<N: One + Zero + Clone> DMat<N> {
|
|
|
|
/// Builds an identity matrix.
|
|
|
|
///
|
|
|
|
/// # Arguments
|
|
|
|
/// * `dim` - The dimension of the matrix. A `dim`-dimensional matrix contains `dim * dim`
|
|
|
|
/// components.
|
|
|
|
#[inline]
|
|
|
|
pub fn new_identity(dim: uint) -> DMat<N> {
|
|
|
|
let mut res = DMat::new_zeros(dim, dim);
|
|
|
|
|
|
|
|
for i in range(0u, dim) {
|
|
|
|
let _1: N = One::one();
|
|
|
|
res.set(i, i, _1);
|
|
|
|
}
|
|
|
|
|
|
|
|
res
|
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
}
|
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
impl<N: Clone> DMat<N> {
|
2013-08-05 15:44:56 +08:00
|
|
|
#[inline]
|
2013-08-05 16:13:44 +08:00
|
|
|
fn offset(&self, i: uint, j: uint) -> uint {
|
2013-09-05 06:01:10 +08:00
|
|
|
i * self.ncols + j
|
2013-08-05 16:13:44 +08:00
|
|
|
}
|
2013-08-05 15:44:56 +08:00
|
|
|
|
|
|
|
/// Changes the value of a component of the matrix.
|
|
|
|
///
|
|
|
|
/// # Arguments
|
2013-09-05 06:01:10 +08:00
|
|
|
/// * `row` - 0-based index of the line to be changed
|
|
|
|
/// * `col` - 0-based index of the column to be changed
|
2013-08-05 15:44:56 +08:00
|
|
|
#[inline]
|
2013-09-05 06:01:10 +08:00
|
|
|
pub fn set(&mut self, row: uint, col: uint, val: N) {
|
|
|
|
assert!(row < self.nrows);
|
|
|
|
assert!(col < self.ncols);
|
|
|
|
self.mij[self.offset(row, col)] = val
|
2013-08-05 15:44:56 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Reads the value of a component of the matrix.
|
|
|
|
///
|
|
|
|
/// # Arguments
|
2013-09-05 06:01:10 +08:00
|
|
|
/// * `row` - 0-based index of the line to be read
|
|
|
|
/// * `col` - 0-based index of the column to be read
|
2013-08-05 15:44:56 +08:00
|
|
|
#[inline]
|
2013-09-05 06:01:10 +08:00
|
|
|
pub fn at(&self, row: uint, col: uint) -> N {
|
|
|
|
assert!(row < self.nrows);
|
|
|
|
assert!(col < self.ncols);
|
|
|
|
self.mij[self.offset(row, col)].clone()
|
2013-08-05 15:44:56 +08:00
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
}
|
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
impl<N: Clone + Mul<N, N> + Add<N, N> + Zero> Mul<DMat<N>, DMat<N>> for DMat<N> {
|
2013-08-05 16:13:44 +08:00
|
|
|
fn mul(&self, other: &DMat<N>) -> DMat<N> {
|
2013-09-05 06:01:10 +08:00
|
|
|
assert!(self.ncols == other.nrows);
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
let mut res = DMat::new_zeros(self.nrows, other.ncols);
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
for i in range(0u, self.nrows) {
|
|
|
|
for j in range(0u, other.ncols) {
|
2013-08-28 20:22:12 +08:00
|
|
|
let mut acc: N = Zero::zero();
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
for k in range(0u, self.ncols) {
|
2013-08-05 16:13:44 +08:00
|
|
|
acc = acc + self.at(i, k) * other.at(k, j);
|
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
res.set(i, j, acc);
|
2013-08-05 15:44:56 +08:00
|
|
|
}
|
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 15:44:56 +08:00
|
|
|
res
|
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
}
|
|
|
|
|
Removed occurences of copy/Copy + improved api.
Now, access to vector components are x, y, z, w, a, b, ... instead of at[i].
The method at(i) has the same (read only) effect as the old at[i].
Now, access to matrix components are m11, m12, ... instead of mij[offset(i, j)]...
The method at((i, j)) has the same effect as the old mij[offset(i, j)].
Automatic implementation of all traits the compiler supports has been added on the #[deriving]
clause for both matrices and vectors.
2013-07-20 21:07:49 +08:00
|
|
|
impl<N: Clone + Add<N, N> + Mul<N, N> + Zero>
|
2013-08-05 16:13:44 +08:00
|
|
|
RMul<DVec<N>> for DMat<N> {
|
|
|
|
fn rmul(&self, other: &DVec<N>) -> DVec<N> {
|
2013-09-05 06:01:10 +08:00
|
|
|
assert!(self.ncols == other.at.len());
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
let mut res : DVec<N> = DVec::new_zeros(self.nrows);
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
for i in range(0u, self.nrows) {
|
|
|
|
let mut acc: N = Zero::zero();
|
|
|
|
|
|
|
|
for j in range(0u, self.ncols) {
|
|
|
|
acc = acc + other.at[j] * self.at(i, j);
|
2013-08-05 16:13:44 +08:00
|
|
|
}
|
2013-09-05 06:01:10 +08:00
|
|
|
|
|
|
|
res.at[i] = acc;
|
2013-08-05 15:44:56 +08:00
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 15:44:56 +08:00
|
|
|
res
|
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
}
|
|
|
|
|
Removed occurences of copy/Copy + improved api.
Now, access to vector components are x, y, z, w, a, b, ... instead of at[i].
The method at(i) has the same (read only) effect as the old at[i].
Now, access to matrix components are m11, m12, ... instead of mij[offset(i, j)]...
The method at((i, j)) has the same effect as the old mij[offset(i, j)].
Automatic implementation of all traits the compiler supports has been added on the #[deriving]
clause for both matrices and vectors.
2013-07-20 21:07:49 +08:00
|
|
|
impl<N: Clone + Add<N, N> + Mul<N, N> + Zero>
|
2013-08-05 16:13:44 +08:00
|
|
|
LMul<DVec<N>> for DMat<N> {
|
|
|
|
fn lmul(&self, other: &DVec<N>) -> DVec<N> {
|
2013-09-05 06:01:10 +08:00
|
|
|
assert!(self.nrows == other.at.len());
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
let mut res : DVec<N> = DVec::new_zeros(self.ncols);
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-09-05 06:01:10 +08:00
|
|
|
for i in range(0u, self.ncols) {
|
|
|
|
let mut acc: N = Zero::zero();
|
|
|
|
|
|
|
|
for j in range(0u, self.nrows) {
|
|
|
|
acc = acc + other.at[j] * self.at(j, i);
|
2013-08-05 16:13:44 +08:00
|
|
|
}
|
2013-09-05 06:01:10 +08:00
|
|
|
|
|
|
|
res.at[i] = acc;
|
2013-08-05 15:44:56 +08:00
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 15:44:56 +08:00
|
|
|
res
|
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
}
|
|
|
|
|
Rework of the traits for Vectors.
The goal is to make traits less fine-grained for vectors, and reduce the amount of `use`.
- Scalar{Mul, Div} are removed, replaced by Mul<N, V> and Div<N, V>,
- Ring and DivisionRing are removed. Use Num instead.
- VectorSpace, Dot, and Norm are removed, replaced by the new, higher-level traits.
Add four traits:
- Vec: common operations on vectors. Replaces VectorSpace and Dot.
- AlgebraicVec: Vec + the old Norm trait.
- VecExt: Vec + every other traits vectors implement.
- AlgebraicVecExt: AlgebraicVec + VecExt.
2013-08-19 00:33:25 +08:00
|
|
|
impl<N: Clone + Num>
|
2013-08-05 16:13:44 +08:00
|
|
|
Inv for DMat<N> {
|
2013-08-05 15:44:56 +08:00
|
|
|
#[inline]
|
2013-08-05 16:13:44 +08:00
|
|
|
fn inverse(&self) -> Option<DMat<N>> {
|
2013-08-05 15:44:56 +08:00
|
|
|
let mut res : DMat<N> = self.clone();
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
if res.inplace_inverse() {
|
|
|
|
Some(res)
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
None
|
|
|
|
}
|
2013-08-05 15:44:56 +08:00
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
fn inplace_inverse(&mut self) -> bool {
|
2013-09-05 06:01:10 +08:00
|
|
|
assert!(self.nrows == self.ncols);
|
|
|
|
|
|
|
|
let dim = self.nrows;
|
|
|
|
let mut res: DMat<N> = DMat::new_identity(dim);
|
|
|
|
let _0T: N = Zero::zero();
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 15:44:56 +08:00
|
|
|
// inversion using Gauss-Jordan elimination
|
2013-08-05 16:13:44 +08:00
|
|
|
for k in range(0u, dim) {
|
2013-08-05 15:44:56 +08:00
|
|
|
// search a non-zero value on the k-th column
|
|
|
|
// FIXME: would it be worth it to spend some more time searching for the
|
|
|
|
// max instead?
|
|
|
|
|
|
|
|
let mut n0 = k; // index of a non-zero entry
|
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
while (n0 != dim) {
|
|
|
|
if self.at(n0, k) != _0T {
|
|
|
|
break;
|
|
|
|
}
|
2013-08-05 15:44:56 +08:00
|
|
|
|
|
|
|
n0 = n0 + 1;
|
|
|
|
}
|
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
if n0 == dim {
|
|
|
|
return false
|
|
|
|
}
|
2013-08-05 15:44:56 +08:00
|
|
|
|
|
|
|
// swap pivot line
|
2013-08-05 16:13:44 +08:00
|
|
|
if n0 != k {
|
|
|
|
for j in range(0u, dim) {
|
2013-08-05 15:44:56 +08:00
|
|
|
let off_n0_j = self.offset(n0, j);
|
|
|
|
let off_k_j = self.offset(k, j);
|
|
|
|
|
|
|
|
self.mij.swap(off_n0_j, off_k_j);
|
|
|
|
res.mij.swap(off_n0_j, off_k_j);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let pivot = self.at(k, k);
|
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
for j in range(k, dim) {
|
2013-09-05 06:01:10 +08:00
|
|
|
let selfval = self.at(k, j) / pivot;
|
2013-08-05 15:44:56 +08:00
|
|
|
self.set(k, j, selfval);
|
|
|
|
}
|
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
for j in range(0u, dim) {
|
2013-09-05 06:01:10 +08:00
|
|
|
let resval = res.at(k, j) / pivot;
|
2013-08-05 15:44:56 +08:00
|
|
|
res.set(k, j, resval);
|
|
|
|
}
|
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
for l in range(0u, dim) {
|
|
|
|
if l != k {
|
2013-08-05 15:44:56 +08:00
|
|
|
let normalizer = self.at(l, k);
|
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
for j in range(k, dim) {
|
2013-09-05 06:01:10 +08:00
|
|
|
let selfval = self.at(l, j) - self.at(k, j) * normalizer;
|
2013-08-05 15:44:56 +08:00
|
|
|
self.set(l, j, selfval);
|
|
|
|
}
|
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
for j in range(0u, dim) {
|
2013-09-05 06:01:10 +08:00
|
|
|
let resval = res.at(l, j) - res.at(k, j) * normalizer;
|
2013-08-05 15:44:56 +08:00
|
|
|
res.set(l, j, resval);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
}
|
|
|
|
|
2013-08-05 15:44:56 +08:00
|
|
|
*self = res;
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 15:44:56 +08:00
|
|
|
true
|
2013-05-31 17:28:42 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
impl<N: Clone> Transpose for DMat<N> {
|
2013-08-05 15:44:56 +08:00
|
|
|
#[inline]
|
2013-08-05 16:13:44 +08:00
|
|
|
fn transposed(&self) -> DMat<N> {
|
2013-08-05 15:44:56 +08:00
|
|
|
let mut res = self.clone();
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 15:44:56 +08:00
|
|
|
res.transpose();
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 15:44:56 +08:00
|
|
|
res
|
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
fn transpose(&mut self) {
|
2013-09-05 06:01:10 +08:00
|
|
|
for i in range(1u, self.nrows) {
|
|
|
|
for j in range(0u, self.ncols - 1) {
|
2013-08-05 15:44:56 +08:00
|
|
|
let off_i_j = self.offset(i, j);
|
|
|
|
let off_j_i = self.offset(j, i);
|
|
|
|
|
|
|
|
self.mij.swap(off_i_j, off_j_i);
|
|
|
|
}
|
|
|
|
}
|
2013-09-05 06:01:10 +08:00
|
|
|
|
|
|
|
util::swap(&mut self.nrows, &mut self.ncols);
|
2013-05-31 17:28:42 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
impl<N: ApproxEq<N>> ApproxEq<N> for DMat<N> {
|
2013-08-05 15:44:56 +08:00
|
|
|
#[inline]
|
2013-08-05 16:13:44 +08:00
|
|
|
fn approx_epsilon() -> N {
|
2013-09-05 06:01:10 +08:00
|
|
|
fail!("This function cannot work due to a compiler bug.")
|
2013-08-28 20:22:12 +08:00
|
|
|
// let res: N = ApproxEq::<N>::approx_epsilon();
|
|
|
|
|
|
|
|
// res
|
2013-08-05 16:13:44 +08:00
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 15:44:56 +08:00
|
|
|
#[inline]
|
2013-08-05 16:13:44 +08:00
|
|
|
fn approx_eq(&self, other: &DMat<N>) -> bool {
|
2013-08-05 15:44:56 +08:00
|
|
|
let mut zip = self.mij.iter().zip(other.mij.iter());
|
2013-06-09 20:09:22 +08:00
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
do zip.all |(a, b)| {
|
|
|
|
a.approx_eq(b)
|
|
|
|
}
|
2013-08-05 15:44:56 +08:00
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
|
2013-08-05 15:44:56 +08:00
|
|
|
#[inline]
|
2013-08-05 16:13:44 +08:00
|
|
|
fn approx_eq_eps(&self, other: &DMat<N>, epsilon: &N) -> bool {
|
2013-08-05 15:44:56 +08:00
|
|
|
let mut zip = self.mij.iter().zip(other.mij.iter());
|
2013-06-09 20:09:22 +08:00
|
|
|
|
2013-08-05 16:13:44 +08:00
|
|
|
do zip.all |(a, b)| {
|
|
|
|
a.approx_eq_eps(b, epsilon)
|
|
|
|
}
|
2013-08-05 15:44:56 +08:00
|
|
|
}
|
2013-05-31 17:28:42 +08:00
|
|
|
}
|