Skip to content

Make trace() require square matrix independent of layout #263

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

Merged
termoshtt merged 1 commit into from
Feb 20, 2021
Merged

Make trace() require square matrix independent of layout #263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions ndarray-linalg/src/trace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use ndarray::*;
use std::iter::Sum;

use super::error::*;
use super::layout::*;
use super::types::*;

pub trait Trace {
Expand All @@ -20,7 +19,13 @@ where
type Output = A;

fn trace(&self) -> Result<Self::Output> {
let (n, _) = self.square_layout()?.size();
let n = match self.is_square() {
true => Ok(self.nrows()),
false => Err(LinalgError::NotSquare {
rows: self.nrows() as i32,
cols: self.ncols() as i32,
}),
}?;
Ok((0..n as usize).map(|i| self[(i, i)]).sum())
}
}