Merge pull request #60 from termoshtt/op_multi

OperatorMulti

Author: termoshtt

src/operator.rs

@@ -39,3 +39,67 @@ where
         self.dot(rhs)
     }
 }
+
+pub trait OperatorMulti<A, S, D>
+where
+    S: Data<Elem = A>,
+    D: Dimension,
+{
+    fn op_multi(&self, &ArrayBase<S, D>) -> Array<A, D>;
+}
+
+impl<T, A, S, D> OperatorMulti<A, S, D> for T
+where
+    A: Scalar,
+    S: DataMut<Elem = A>,
+    D: Dimension + RemoveAxis,
+    for<'a> T: OperatorMut<ViewRepr<&'a mut A>, D::Smaller>,
+{
+    fn op_multi(&self, a: &ArrayBase<S, D>) -> Array<A, D> {
+        let a = a.to_owned();
+        self.op_multi_into(a)
+    }
+}
+
+pub trait OperatorMultiInto<S, D>
+where
+    S: DataMut,
+    D: Dimension,
+{
+    fn op_multi_into(&self, ArrayBase<S, D>) -> ArrayBase<S, D>;
+}
+
+impl<T, A, S, D> OperatorMultiInto<S, D> for T
+where
+    S: DataMut<Elem = A>,
+    D: Dimension + RemoveAxis,
+    for<'a> T: OperatorMut<ViewRepr<&'a mut A>, D::Smaller>,
+{
+    fn op_multi_into(&self, mut a: ArrayBase<S, D>) -> ArrayBase<S, D> {
+        self.op_multi_mut(&mut a);
+        a
+    }
+}
+
+pub trait OperatorMultiMut<S, D>
+where
+    S: DataMut,
+    D: Dimension,
+{
+    fn op_multi_mut<'a>(&self, &'a mut ArrayBase<S, D>) -> &'a mut ArrayBase<S, D>;
+}
+
+impl<T, A, S, D> OperatorMultiMut<S, D> for T
+where
+    S: DataMut<Elem = A>,
+    D: Dimension + RemoveAxis,
+    for<'a> T: OperatorMut<ViewRepr<&'a mut A>, D::Smaller>,
+{
+    fn op_multi_mut<'a>(&self, mut a: &'a mut ArrayBase<S, D>) -> &'a mut ArrayBase<S, D> {
+        let n = a.ndim();
+        for mut col in a.axis_iter_mut(Axis(n - 1)) {
+            self.op_mut(&mut col);
+        }
+        a
+    }
+}

tests/diag.rs

@@ -22,3 +22,12 @@ fn diag_2d() {
     println!("dm = {:?}", dm);
     assert_close_l2!(&dm, &arr2(&[[1.0, 1.0], [2.0, 2.0]]), 1e-7);
 }
+
+#[test]
+fn diag_2d_multi() {
+    let d = arr1(&[1.0, 2.0]);
+    let m = arr2(&[[1.0, 1.0], [1.0, 1.0]]);
+    let dm = d.into_diagonal().op_multi_into(m);
+    println!("dm = {:?}", dm);
+    assert_close_l2!(&dm, &arr2(&[[1.0, 1.0], [2.0, 2.0]]), 1e-7);
+}