Merge pull request #368 from bluss/ixdyn-serialize

implement serialization for IxDyn

Author: bluss

serialization-tests/tests/serialize.rs

@@ -14,7 +14,7 @@ extern crate ron;
 use serialize::json;
 
 
-use ndarray::{arr0, arr1, arr2, RcArray, RcArray1, RcArray2};
+use ndarray::{arr0, arr1, arr2, RcArray, RcArray1, RcArray2, ArrayD, IxDyn};
 
 #[test]
 fn serial_many_dim()
@@ -123,6 +123,46 @@ fn serial_many_dim_serde()
     }
 }
 
+#[test]
+fn serial_ixdyn_serde()
+{
+    {
+        let a = arr0::<f32>(2.72).into_dyn();
+        let serial = serde_json::to_string(&a).unwrap();
+        println!("Serde encode {:?} => {:?}", a, serial);
+        let res = serde_json::from_str::<RcArray<f32, _>>(&serial);
+        println!("{:?}", res);
+        assert_eq!(a, res.unwrap());
+    }
+
+    {
+        let a = arr1::<f32>(&[2.72, 1., 2.]).into_dyn();
+        let serial = serde_json::to_string(&a).unwrap();
+        println!("Serde encode {:?} => {:?}", a, serial);
+        let res = serde_json::from_str::<ArrayD<f32>>(&serial);
+        println!("{:?}", res);
+        assert_eq!(a, res.unwrap());
+    }
+
+    {
+        let a = arr2(&[[3., 1., 2.2], [3.1, 4., 7.]])
+                .into_shape(IxDyn(&[3, 1, 1, 1, 2, 1])).unwrap();
+        let serial = serde_json::to_string(&a).unwrap();
+        println!("Serde encode {:?} => {:?}", a, serial);
+        let res = serde_json::from_str::<ArrayD<f32>>(&serial);
+        println!("{:?}", res);
+        assert_eq!(a, res.unwrap());
+    }
+
+    {
+        let a = arr2(&[[3., 1., 2.2], [3.1, 4., 7.]]).into_dyn();
+        let text = r##"{"v":1,"dim":[2,3],"data":[3,1,2.2,3.1,4,7]}"##;
+        let b = serde_json::from_str::<ArrayD<f32>>(text);
+        assert_eq!(a, b.unwrap());
+    }
+
+}
+
 #[test]
 fn serial_wrong_count_serde()
 {

src/array_serde.rs

@@ -16,6 +16,7 @@ use imp_prelude::*;
 
 use super::arraytraits::ARRAY_FORMAT_VERSION;
 use super::Iter;
+use IntoDimension;
 
 /// Verifies that the version of the deserialized array matches the current
 /// `ARRAY_FORMAT_VERSION`.
@@ -52,6 +53,27 @@ impl<'de, I> Deserialize<'de> for Dim<I>
     }
 }
 
+/// **Requires crate feature `"serde-1"`**
+impl Serialize for IxDyn
+{
+    fn serialize<Se>(&self, serializer: Se) -> Result<Se::Ok, Se::Error>
+        where Se: Serializer
+    {
+        self.ix().serialize(serializer)
+    }
+}
+
+/// **Requires crate feature `"serde-1"`**
+impl<'de> Deserialize<'de> for IxDyn
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        where D: Deserializer<'de>
+    {
+        let v = Vec::<Ix>::deserialize(deserializer)?;
+        Ok(v.into_dimension())
+    }
+}
+
 /// **Requires crate feature `"serde-1"`**
 impl<A, D, S> Serialize for ArrayBase<S, D>
     where A: Serialize,