ixdyn: Implement .remove_axis()

Author: bluss

src/dimension/dynindeximpl.rs

@@ -6,6 +6,7 @@ use std::ops::{
     DerefMut,
 };
 use imp_prelude::*;
+use dimension::DimPrivate;
 
 const CAP: usize = 4;
 
@@ -124,8 +125,24 @@ unsafe impl Send for IxDynImpl {}
 unsafe impl Sync for IxDynImpl {}
 
 impl IxDynImpl {
-    pub fn remove(&mut self, i: usize) {
-        unimplemented!()
+    fn remove(&self, i: usize) -> Self {
+        IxDynImpl(match self.0 {
+            IxDynRepr::Inline(0, _) => IxDynRepr::Inline(0, [0; CAP]),
+            IxDynRepr::Inline(1, _) => IxDynRepr::Inline(0, [0; CAP]),
+            IxDynRepr::Inline(2, ref arr) => {
+                let mut out = [0; CAP];
+                out[0] = arr[1 - i];
+                IxDynRepr::Inline(1, out)
+            }
+            ref ixdyn => {
+                let len = ixdyn.len();
+                let mut result = IxDynRepr::copy_from(&ixdyn[..len - 1]);
+                for j in i..len - 1 {
+                    result[j] = ixdyn[j + 1]
+                }
+                result
+            }
+        })
     }
 }
 
@@ -183,3 +200,11 @@ impl<'a> IntoIterator for &'a IxDynImpl {
         self[..].into_iter()
     }
 }
+
+impl RemoveAxis for Dim<IxDynImpl> {
+    type Smaller = Self;
+    fn remove_axis(&self, axis: Axis) -> Self {
+        debug_assert!(axis.index() < self.ndim());
+        Dim::new(self.ix().remove(axis.index()))
+    }
+}

src/dimension/remove_axis.rs

@@ -8,7 +8,6 @@
 
 
 use {Ix, Ix0, Ix1, Dimension, Dim, Axis};
-use IxDyn;
 use super::DimPrivate;
 
 /// Array shape with a next smaller dimension.
@@ -67,12 +66,4 @@ macro_rules! impl_remove_axis_array(
 impl_remove_axis_array!(3, 4, 5, 6);
 
 
-impl RemoveAxis for IxDyn {
-    type Smaller = Self;
-    fn remove_axis(&self, axis: Axis) -> Self {
-        let mut res = self.clone();
-        res.ixm().remove(axis.index());
-        res
-    }
-}
 

tests/dimension.rs

@@ -1,4 +1,6 @@
 extern crate ndarray;
+#[macro_use]
+extern crate defmac;
 
 use ndarray::{
     RcArray,
@@ -18,7 +20,7 @@ fn remove_axis()
     assert_eq!(Dim([1, 2]).remove_axis(Axis(0)), Dim([2]));
     assert_eq!(Dim([4, 5, 6]).remove_axis(Axis(1)), Dim([4, 6]));
 
-    assert_eq!(Dim(vec![1,2]).remove_axis(Axis(0)), Dim(vec![2]));
+    assert_eq!(Dim(vec![1, 2]).remove_axis(Axis(0)), Dim(vec![2]));
     assert_eq!(Dim(vec![4, 5, 6]).remove_axis(Axis(1)), Dim(vec![4, 6]));
 
     let a = RcArray::<f32, _>::zeros((4,5));
@@ -43,6 +45,25 @@ fn dyn_dimension()
     assert_eq!(z.shape(), &dim[..]);
 }
 
+#[test]
+fn dyn_remove() {
+    let mut v = vec![1, 2, 3, 4, 5, 6, 7];
+    let mut dim = Dim(v.clone());
+    defmac!(test_remove index => {
+        dim = dim.remove_axis(Axis(index));
+        v.remove(index);
+        assert_eq!(dim.slice(), &v[..]);
+    });
+
+    test_remove!(1);
+    test_remove!(2);
+    test_remove!(3);
+    test_remove!(0);
+    test_remove!(2);
+    test_remove!(0);
+    test_remove!(0);
+}
+
 #[test]
 fn fastest_varying_order() {
     let strides = Dim([2, 8, 4, 1]);