test: output ndarrays as json arrays

Author: ivan-aksamentov

packages/treetime-convolution/src/testing/metrics/pointwise/errors.rs

@@ -1,12 +1,17 @@
 use crate::testing::metrics::config::PointwiseConfig;
 use ndarray::Array1;
 use serde::{Deserialize, Serialize};
+use treetime_utils::serde::{array1_as_vec, array1_from_vec};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PointwiseErrors {
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub absolute: Array1<f64>,
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub relative: Array1<f64>,
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub signed: Array1<f64>,
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub logarithmic: Array1<f64>,
   pub summary: PointwiseErrorSummary,
 }

packages/treetime-convolution/src/testing/metrics/pointwise/structural.rs

@@ -2,12 +2,17 @@ use crate::testing::metrics::config::PointwiseConfig;
 use ndarray::Array1;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
+use treetime_utils::serde::{array1_as_vec, array1_from_vec};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct StructuralErrors {
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub first_derivative: Array1<f64>,
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub second_derivative: Array1<f64>,
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub symmetry_residual: Array1<f64>,
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub monotonicity_violations: Array1<f64>,
   pub summary: StructuralErrorSummary,
 }

packages/treetime-convolution/src/testing/metrics/pointwise/tolerance.rs

@@ -1,10 +1,41 @@
 use crate::testing::metrics::config::PointwiseConfig;
 use ndarray::Array1;
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use treetime_utils::serde::{array1_as_vec, array1_from_vec};
+
+fn serialize_array_of_array1<S>(arrays: &[Array1<f64>; 3], serializer: S) -> Result<S::Ok, S::Error>
+where
+  S: Serializer,
+{
+  use serde::ser::SerializeSeq;
+  let mut seq = serializer.serialize_seq(Some(3))?;
+  for array in arrays {
+    let vec: Vec<f64> = array.to_vec();
+    seq.serialize_element(&vec)?;
+  }
+  seq.end()
+}
+
+fn deserialize_array_of_array1<'de, D>(deserializer: D) -> Result<[Array1<f64>; 3], D::Error>
+where
+  D: Deserializer<'de>,
+{
+  let vecs: Vec<Vec<f64>> = Vec::deserialize(deserializer)?;
+  if vecs.len() != 3 {
+    return Err(serde::de::Error::custom(format!("Expected 3 arrays, got {}", vecs.len())));
+  }
+  Ok([
+    Array1::from_vec(vecs[0].clone()),
+    Array1::from_vec(vecs[1].clone()),
+    Array1::from_vec(vecs[2].clone()),
+  ])
+}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ToleranceMetrics {
+  #[serde(serialize_with = "serialize_array_of_array1", deserialize_with = "deserialize_array_of_array1")]
   pub pass_masks: [Array1<f64>; 3],
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub support_coverage_mask: Array1<f64>,
   pub summary: ToleranceSummary,
 }

packages/treetime-convolution/src/testing/metrics/spatial/cumulative.rs

@@ -1,9 +1,11 @@
 use ndarray::{Array1, Axis};
 use serde::{Deserialize, Serialize};
 use treetime_utils::ndarray::cumsum_axis;
+use treetime_utils::serde::{array1_as_vec, array1_from_vec};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CumulativeMetrics {
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub cumulative_error: Array1<f64>,
   pub summary: CumulativeSummary,
 }

packages/treetime-convolution/src/testing/metrics/spatial/regional.rs

@@ -1,10 +1,13 @@
 use crate::testing::metrics::config::SpatialConfig;
 use ndarray::Array1;
 use serde::{Deserialize, Serialize};
+use treetime_utils::serde::{array1_as_vec, array1_from_vec};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct RegionalMetrics {
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub peak_region_errors: Array1<f64>,
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub tail_region_errors: Array1<f64>,
   pub summary: RegionalSummary,
 }

packages/treetime-convolution/src/testing/metrics/spatial/windowed.rs

@@ -1,10 +1,13 @@
 use crate::testing::metrics::config::SpatialConfig;
 use ndarray::Array1;
 use serde::{Deserialize, Serialize};
+use treetime_utils::serde::{array1_as_vec, array1_from_vec};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct WindowedMetrics {
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub sliding_rms: Array1<f64>,
+  #[serde(serialize_with = "array1_as_vec", deserialize_with = "array1_from_vec")]
   pub sliding_max: Array1<f64>,
   pub summary: WindowedSummary,
 }