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.

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

Issue:Creating band matrices #1160, implemented initial version #1461

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
52 changes: 52 additions & 0 deletions src/base/matrix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};

#[cfg(feature = "rkyv-serialize-no-std")]
use super::rkyv_wrappers::CustomPhantom;
use super::Dynamic;
#[cfg(feature = "rkyv-serialize")]
use rkyv::bytecheck;
#[cfg(feature = "rkyv-serialize-no-std")]
Expand Down Expand Up @@ -2368,3 +2369,54 @@ impl<T> super::alias::Matrix1<T> {
scalar
}
}

impl<T: Scalar, R: Dim, C: Dim, S: Storage<T, R, C>> Matrix<T, R, C, S> {
/// Takes variant number of bands
/// The central band becomes the main diagonal
pub fn from_bands(args: &[&Vec<T>]) -> Self
where
T: Zero + Clone,
DefaultAllocator: Allocator<R, C>,
{

// Consider the central band as the main diagonal
assert!(
args.len() % 2 == 1,
"Number of bands should be odd"
);

// Retrieves the index and the length of the longest band to calculate the size of the matrix
let (n, ind) = args.iter()
.enumerate()
.map(|(index, v)| (index, v.len()))
.max_by_key(|(_, len)| *len)
.unwrap_or((0, 0));

// The size is considered as the length of the longest band and the distance from the main diagonal
n = n + ind - args.len()/2;

// Create a zeroed matrix with the specified generic size.
let mut mat = Matrix::<T, R, C, _>::zeros_generic(R::from_usize(n), C::from_usize(n));

// Set the main diagonal band
for i in 0..args[args.len()/2].len()-1 {
unsafe {*mat.get_unchecked_mut((i, i)) = args[args.len()/2][i].clone(); }
}

// set lower diagonal bands
for band in 0..args.len()/2 - 1 {
for i in 0..args[band].len() - 1 {
unsafe {*mat.get_unchecked_mut((i, 0)) = args[band][i].clone(); }
}
}

// set upper diagonal bands
for band in args.len()/2 + 1..args.len()-1 {
for j in 0..args[band].len() - 1 {
unsafe {*mat.get_unchecked_mut((0, j)) = args[band][j].clone(); }
}
}

mat
}
}