Skip to content

Commit a35cc78

Browse files
committed
Use into_owned()
1 parent 87e5e28 commit a35cc78

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ lapack = "0.11.1"
1414
num-traits = "0.1.36"
1515

1616
[dependencies.ndarray]
17-
version = "0.7"
17+
version = "0.7.3"
1818
features = ["blas"]
1919

2020
[dev-dependencies]

src/hermite.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,18 @@ impl<A: HMFloat> HermiteMatrix for Array<A, Ix2> {
7474

7575
impl<A: HMFloat> HermiteMatrix for RcArray<A, Ix2> {
7676
fn eigh(self) -> Result<(Self::Vector, Self), LinalgError> {
77-
// XXX unnecessray clone (should use into_owned())
78-
let (e, v) = self.to_owned().eigh()?;
77+
let (e, v) = self.into_owned().eigh()?;
7978
Ok((e.into_shared(), v.into_shared()))
8079
}
8180
fn ssqrt(self) -> Result<Self, LinalgError> {
82-
// XXX unnecessray clone (should use into_owned())
83-
let s = self.to_owned().ssqrt()?;
81+
let s = self.into_owned().ssqrt()?;
8482
Ok(s.into_shared())
8583
}
8684
fn cholesky(self) -> Result<Self, LinalgError> {
87-
// XXX unnecessray clone (should use into_owned())
88-
let s = self.to_owned().cholesky()?;
85+
let s = self.into_owned().cholesky()?;
8986
Ok(s.into_shared())
9087
}
9188
fn deth(self) -> Result<Self::Scalar, LinalgError> {
92-
// XXX unnecessray clone (should use into_owned())
93-
self.to_owned().deth()
89+
self.into_owned().deth()
9490
}
9591
}

src/matrix.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,15 @@ impl<A: MFloat> Matrix for RcArray<A, Ix2> {
205205
self.to_owned().opnorm_f()
206206
}
207207
fn svd(self) -> Result<(Self, Self::Vector, Self), LinalgError> {
208-
// XXX unnecessary clone (should use into_owned())
209-
let (u, s, v) = self.to_owned().svd()?;
208+
let (u, s, v) = self.into_owned().svd()?;
210209
Ok((u.into_shared(), s.into_shared(), v.into_shared()))
211210
}
212211
fn qr(self) -> Result<(Self, Self), LinalgError> {
213-
// XXX unnecessary clone (should use into_owned())
214-
let (q, r) = self.to_owned().qr()?;
212+
let (q, r) = self.into_owned().qr()?;
215213
Ok((q.into_shared(), r.into_shared()))
216214
}
217215
fn lu(self) -> Result<(Self::Permutator, Self, Self), LinalgError> {
218-
// XXX unnecessary clone (should use into_owned())
219-
let (p, l, u) = self.to_owned().lu()?;
216+
let (p, l, u) = self.into_owned().lu()?;
220217
Ok((p, l.into_shared(), u.into_shared()))
221218
}
222219
fn permutate(&mut self, ipiv: &Self::Permutator) {

0 commit comments

Comments
 (0)