shape: Remove usages of deprecated .reshape()

Author: bluss

tests/broadcast.rs

@@ -5,12 +5,12 @@ use ndarray::prelude::*;
 fn broadcast_1() {
     let a_dim = Dim([2, 4, 2, 2]);
     let b_dim = Dim([2, 1, 2, 1]);
-    let a = ArcArray::linspace(0., 1., a_dim.size()).reshape(a_dim);
-    let b = ArcArray::linspace(0., 1., b_dim.size()).reshape(b_dim);
+    let a = ArcArray::linspace(0., 1., a_dim.size()).into_shape(a_dim).unwrap();
+    let b = ArcArray::linspace(0., 1., b_dim.size()).into_shape(b_dim).unwrap();
     assert!(b.broadcast(a.dim()).is_some());
 
     let c_dim = Dim([2, 1]);
-    let c = ArcArray::linspace(0., 1., c_dim.size()).reshape(c_dim);
+    let c = ArcArray::linspace(0., 1., c_dim.size()).into_shape(c_dim).unwrap();
     assert!(c.broadcast(1).is_none());
     assert!(c.broadcast(()).is_none());
     assert!(c.broadcast((2, 1)).is_some());
@@ -31,8 +31,8 @@ fn broadcast_1() {
 fn test_add() {
     let a_dim = Dim([2, 4, 2, 2]);
     let b_dim = Dim([2, 1, 2, 1]);
-    let mut a = ArcArray::linspace(0.0, 1., a_dim.size()).reshape(a_dim);
-    let b = ArcArray::linspace(0.0, 1., b_dim.size()).reshape(b_dim);
+    let mut a = ArcArray::linspace(0.0, 1., a_dim.size()).into_shape(a_dim).unwrap();
+    let b = ArcArray::linspace(0.0, 1., b_dim.size()).into_shape(b_dim).unwrap();
     a += &b;
     let t = ArcArray::from_elem((), 1.0f32);
     a += &t;
@@ -43,7 +43,7 @@ fn test_add() {
 #[cfg(feature = "std")]
 fn test_add_incompat() {
     let a_dim = Dim([2, 4, 2, 2]);
-    let mut a = ArcArray::linspace(0.0, 1., a_dim.size()).reshape(a_dim);
+    let mut a = ArcArray::linspace(0.0, 1., a_dim.size()).into_shape(a_dim).unwrap();
     let incompat = ArcArray::from_elem(3, 1.0f32);
     a += &incompat;
 }

tests/dimension.rs

@@ -55,8 +55,8 @@ fn remove_axis() {
     let a = ArcArray::<f32, _>::zeros(vec![4, 5, 6]);
     let _b = a
         .index_axis_move(Axis(1), 0)
-        .reshape((4, 6))
-        .reshape(vec![2, 3, 4]);
+        .to_shape((4, 6)).unwrap()
+        .to_shape(vec![2, 3, 4]).unwrap();
 }
 
 #[test]

tests/oper.rs

@@ -16,24 +16,24 @@ use approx::assert_abs_diff_eq;
 use defmac::defmac;
 
 fn test_oper(op: &str, a: &[f32], b: &[f32], c: &[f32]) {
-    let aa = rcarr1(a);
-    let bb = rcarr1(b);
-    let cc = rcarr1(c);
+    let aa = CowArray::from(arr1(a));
+    let bb = CowArray::from(arr1(b));
+    let cc = CowArray::from(arr1(c));
     test_oper_arr::<f32, _>(op, aa.clone(), bb.clone(), cc.clone());
     let dim = (2, 2);
-    let aa = aa.reshape(dim);
-    let bb = bb.reshape(dim);
-    let cc = cc.reshape(dim);
+    let aa = aa.to_shape(dim).unwrap();
+    let bb = bb.to_shape(dim).unwrap();
+    let cc = cc.to_shape(dim).unwrap();
     test_oper_arr::<f32, _>(op, aa.clone(), bb.clone(), cc.clone());
     let dim = (1, 2, 1, 2);
-    let aa = aa.reshape(dim);
-    let bb = bb.reshape(dim);
-    let cc = cc.reshape(dim);
+    let aa = aa.to_shape(dim).unwrap();
+    let bb = bb.to_shape(dim).unwrap();
+    let cc = cc.to_shape(dim).unwrap();
     test_oper_arr::<f32, _>(op, aa.clone(), bb.clone(), cc.clone());
 }
 
 
-fn test_oper_arr<A, D>(op: &str, mut aa: ArcArray<f32, D>, bb: ArcArray<f32, D>, cc: ArcArray<f32, D>)
+fn test_oper_arr<A, D>(op: &str, mut aa: CowArray<f32, D>, bb: CowArray<f32, D>, cc: CowArray<f32, D>)
 where
     D: Dimension,
 {
@@ -65,7 +65,7 @@ where
         }
         "neg" => {
             assert_eq!(-&aa, cc);
-            assert_eq!(-aa.clone(), cc);
+            assert_eq!(-aa.into_owned(), cc);
         }
         _ => panic!(),
     }