Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Creating matrix from iterator, padding should be explicit. #24

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[WIP] Creating matrix from iterator, padding should be explicit. #24

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9479b0
Remove silent zero padding when creating a matrix from iterator.
Aug 6, 2015
b501d50
Merge branch 'master' of github.com:indigits/scirust
Aug 19, 2015
b2641d2
Make pow (raise to power) consistent with rust scalar versions.
Aug 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 54 additions & 42 deletions src/matrix/matrix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,6 @@ the matrix differently.

/// Static functions for creating a matrix of numbers
impl<T:CommutativeMonoidAddPartial> Matrix<T> {
/// Constructs a scalar matrix
pub fn from_scalar (scalar : T) -> Matrix <T>{
let m : Matrix<T> = Matrix::new(1, 1);
unsafe {*m.ptr = scalar;}
m
}

/// Constructs a matrix of all zeros
pub fn zeros(rows: usize, cols : usize)-> Matrix<T> {
let m : Matrix<T> = Matrix::new(rows, cols);
Expand All @@ -151,6 +144,34 @@ impl<T:CommutativeMonoidAddPartial> Matrix<T> {
m
}

/// Construct a diagonal matrix from a vector
pub fn diag_from_vec(v : &Matrix<T>) -> Matrix<T>{
if !v.is_vector(){
panic!(SRError::IsNotAVector.to_string());
}
let n = v.num_cells();
let m : Matrix<T> = Matrix::zeros(n, n);
let src = v.ptr;
let dst = m.ptr;
// Copy the elements of v in the vector
for r in 0..n{
let offset = m.cell_to_offset(r, r);
unsafe{
*dst.offset(offset) = *src.offset(r as isize);
}
}
m
}
}

impl<T: Debug + Clone + Copy + PartialEq> Matrix<T> {
/// Constructs a scalar matrix
pub fn from_scalar (scalar : T) -> Matrix <T>{
let m : Matrix<T> = Matrix::new(1, 1);
unsafe {*m.ptr = scalar;}
m
}

#[doc = "Constructs a matrix from a slice of data reading
data in column wise order.
"]
Expand All @@ -163,15 +184,14 @@ impl<T:CommutativeMonoidAddPartial> Matrix<T> {
let dst_slice = mat.as_mut_slice();
// The number of entries we can copy
let n_values = values.len();
let z : T = Zero::zero();
let mut n = 0;
let mut offset_dst = 0;
for _ in 0..cols{
for r in 0..rows{
let v = if n < n_values {
values[n]
}else{
z
panic!("While creating matrix, ran out of values early.")
};
dst_slice[offset_dst + r] = v;
n+=1;
Expand Down Expand Up @@ -199,14 +219,13 @@ by hand.
let ptr = mat.ptr;
// The number of entries we can copy
let n_values = values.len();
let z : T = Zero::zero();
let mut n = 0;
for r in 0..rows{
for c in 0..cols{
let v = if n < n_values {
values[n]
}else{
z
panic!("While creating matrix, ran out of values early.")
};
let dst_offset = mat.cell_to_offset(r,c);
unsafe{
Expand All @@ -227,7 +246,6 @@ by hand.
{
let dst_slice = mat.as_mut_slice();
let mut offset_dst = 0;
let z : T = Zero::zero();
let mut completed_columns = 0;
'outer: for _ in 0..cols{
for r in 0..rows{
Expand All @@ -237,7 +255,7 @@ by hand.
None => {
// Finish this column with zeros
for _ in r..rows{
dst_slice[offset_dst + r] = z;
panic!("While creating matrix, ran out of values early.")
}
completed_columns += 1;
offset_dst += stride;
Expand All @@ -252,7 +270,7 @@ by hand.
// We need to fill remaining columns with zeros
for _ in completed_columns..cols{
for r in 0..rows{
dst_slice[offset_dst + r] = z;
panic!("While creating matrix, ran out of values early.")
}
completed_columns += 1;
offset_dst += stride;
Expand All @@ -263,14 +281,12 @@ by hand.
mat
}


/// Builds a matrix from an iterator reading numbers in a
/// row-wise order
pub fn from_iter_rw< A : Iterator<Item=T>>(rows: usize, cols : usize,
iter: A) -> Matrix<T>{
let m : Matrix<T> = Matrix::new(rows, cols);
let ptr = m.ptr;
let z : T = Zero::zero();
let mut r = 0;
let mut c = 0;
let nc = m.num_cols();
Expand All @@ -297,35 +313,12 @@ by hand.
if r == nr {
break;
}
let dst_offset = m.cell_to_offset(r, c);
unsafe{
*ptr.offset(dst_offset) = z;
}
c += 1;
panic!("While creating matrix, ran out of values early.")
}
// return
m
}

/// Construct a diagonal matrix from a vector
pub fn diag_from_vec(v : &Matrix<T>) -> Matrix<T>{
if !v.is_vector(){
panic!(SRError::IsNotAVector.to_string());
}
let n = v.num_cells();
let m : Matrix<T> = Matrix::zeros(n, n);
let src = v.ptr;
let dst = m.ptr;
// Copy the elements of v in the vector
for r in 0..n{
let offset = m.cell_to_offset(r, r);
unsafe{
*dst.offset(offset) = *src.offset(r as isize);
}
}
m
}

}

/// Static functions for creating a matrix of numbers
Expand Down Expand Up @@ -1537,7 +1530,7 @@ impl<T:CommutativeMonoidMulPartial> Matrix<T> {
}

/// Computs power of matrix elements
pub fn pow_elt(&self, n : usize) -> Matrix<T> {
pub fn powi_elt(&self, n : usize) -> Matrix<T> {
let result : Matrix<T> = Matrix::new(self.rows, self.cols);
let pa = self.ptr;
let pc = result.ptr;
Expand All @@ -1548,13 +1541,32 @@ impl<T:CommutativeMonoidMulPartial> Matrix<T> {
let v = *pa.offset(i);
let mut result : T = One::one();
for _ in 1..n{
result = result * v;
result = result * v;
}
*pc.offset(i) = result;
}
}
result
}

}

extern crate num;
impl<T: Debug+Float> Matrix<T> {
pub fn powf_elt(&self, n : T) -> Matrix<T> {
let result : Matrix<T> = Matrix::new(self.rows, self.cols);
let pa = self.ptr;
let pc = result.ptr;
let cap = self.capacity();
unsafe{
for i_ in 0..cap{
let i = i_ as isize;
let v = *pa.offset(i);
*pc.offset(i) = v.powf(n);
}
}
result
}
}

impl<T:CommutativeMonoidMulPartial+ops::Div<Output=T>> Matrix<T> {
Expand Down