Deliver plain dim-0 and dim-1 events as json

disk/src/agg/enp.rs

@@ -1,6 +1,7 @@
 use crate::agg::binnedt::{TimeBinnableType, TimeBinnableTypeAggregator};
 use crate::agg::streams::Appendable;
 use crate::agg::{Fits, FitsInside};
+use crate::binned::dim1::MinMaxAvgDim1Bins;
 use crate::binned::{
     EventsNodeProcessor, FilterFittingInside, MinMaxAvgBins, NumOps, PushableIndex, RangeOverlapInfo, ReadPbv,
     ReadableFromFile, WithLen, WithTimestamps,
@@ -268,6 +269,251 @@ where
     }
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct WaveEvents<NTY> {
+    pub tss: Vec<u64>,
+    pub vals: Vec<Vec<NTY>>,
+}
+
+impl<NTY> WaveEvents<NTY> {
+    pub fn empty() -> Self {
+        Self {
+            tss: vec![],
+            vals: vec![],
+        }
+    }
+}
+
+impl<NTY> WithLen for WaveEvents<NTY> {
+    fn len(&self) -> usize {
+        self.tss.len()
+    }
+}
+
+impl<NTY> WithTimestamps for WaveEvents<NTY> {
+    fn ts(&self, ix: usize) -> u64 {
+        self.tss[ix]
+    }
+}
+
+impl<NTY> RangeOverlapInfo for WaveEvents<NTY> {
+    fn ends_before(&self, range: NanoRange) -> bool {
+        match self.tss.last() {
+            Some(&ts) => ts < range.beg,
+            None => true,
+        }
+    }
+
+    fn ends_after(&self, range: NanoRange) -> bool {
+        match self.tss.last() {
+            Some(&ts) => ts >= range.end,
+            None => panic!(),
+        }
+    }
+
+    fn starts_after(&self, range: NanoRange) -> bool {
+        match self.tss.first() {
+            Some(&ts) => ts >= range.end,
+            None => panic!(),
+        }
+    }
+}
+
+impl<NTY> FitsInside for WaveEvents<NTY> {
+    fn fits_inside(&self, range: NanoRange) -> Fits {
+        if self.tss.is_empty() {
+            Fits::Empty
+        } else {
+            let t1 = *self.tss.first().unwrap();
+            let t2 = *self.tss.last().unwrap();
+            if t2 < range.beg {
+                Fits::Lower
+            } else if t1 > range.end {
+                Fits::Greater
+            } else if t1 < range.beg && t2 > range.end {
+                Fits::PartlyLowerAndGreater
+            } else if t1 < range.beg {
+                Fits::PartlyLower
+            } else if t2 > range.end {
+                Fits::PartlyGreater
+            } else {
+                Fits::Inside
+            }
+        }
+    }
+}
+
+impl<NTY> FilterFittingInside for WaveEvents<NTY> {
+    fn filter_fitting_inside(self, fit_range: NanoRange) -> Option<Self> {
+        match self.fits_inside(fit_range) {
+            Fits::Inside | Fits::PartlyGreater | Fits::PartlyLower | Fits::PartlyLowerAndGreater => Some(self),
+            _ => None,
+        }
+    }
+}
+
+impl<NTY> PushableIndex for WaveEvents<NTY>
+where
+    NTY: NumOps,
+{
+    fn push_index(&mut self, src: &Self, ix: usize) {
+        self.tss.push(src.tss[ix]);
+        // TODO trait should allow to move from source.
+        self.vals.push(src.vals[ix].clone());
+    }
+}
+
+impl<NTY> Appendable for WaveEvents<NTY>
+where
+    NTY: NumOps,
+{
+    fn empty() -> Self {
+        Self::empty()
+    }
+
+    fn append(&mut self, src: &Self) {
+        self.tss.extend_from_slice(&src.tss);
+        self.vals.extend_from_slice(&src.vals);
+    }
+}
+
+impl<NTY> ReadableFromFile for WaveEvents<NTY>
+where
+    NTY: NumOps,
+{
+    fn read_from_file(_file: File) -> Result<ReadPbv<Self>, Error> {
+        // TODO refactor types such that this impl is not needed.
+        panic!()
+    }
+
+    fn from_buf(_buf: &[u8]) -> Result<Self, Error> {
+        panic!()
+    }
+}
+
+impl<NTY> TimeBinnableType for WaveEvents<NTY>
+where
+    NTY: NumOps,
+{
+    type Output = MinMaxAvgDim1Bins<NTY>;
+    type Aggregator = WaveEventsAggregator<NTY>;
+
+    fn aggregator(range: NanoRange) -> Self::Aggregator {
+        Self::Aggregator::new(range)
+    }
+}
+
+pub struct WaveEventsAggregator<NTY>
+where
+    NTY: NumOps,
+{
+    range: NanoRange,
+    count: u64,
+    min: Option<Vec<NTY>>,
+    max: Option<Vec<NTY>>,
+    sumc: u64,
+    sum: Option<Vec<f32>>,
+}
+
+impl<NTY> WaveEventsAggregator<NTY>
+where
+    NTY: NumOps,
+{
+    pub fn new(range: NanoRange) -> Self {
+        Self {
+            range,
+            count: 0,
+            min: None,
+            max: None,
+            sumc: 0,
+            sum: None,
+        }
+    }
+}
+
+impl<NTY> TimeBinnableTypeAggregator for WaveEventsAggregator<NTY>
+where
+    NTY: NumOps,
+{
+    type Input = WaveEvents<NTY>;
+    type Output = MinMaxAvgDim1Bins<NTY>;
+
+    fn range(&self) -> &NanoRange {
+        &self.range
+    }
+
+    fn ingest(&mut self, item: &Self::Input) {
+        for i1 in 0..item.tss.len() {
+            let ts = item.tss[i1];
+            if ts < self.range.beg {
+                continue;
+            } else if ts >= self.range.end {
+                continue;
+            } else {
+                match &mut self.min {
+                    None => self.min = Some(item.vals[i1].clone()),
+                    Some(min) => {
+                        for (a, b) in min.iter_mut().zip(item.vals[i1].iter()) {
+                            if b < a {
+                                *a = *b;
+                            }
+                        }
+                    }
+                };
+                match &mut self.max {
+                    None => self.max = Some(item.vals[i1].clone()),
+                    Some(max) => {
+                        for (a, b) in max.iter_mut().zip(item.vals[i1].iter()) {
+                            if b < a {
+                                *a = *b;
+                            }
+                        }
+                    }
+                };
+                match self.sum.as_mut() {
+                    None => {
+                        self.sum = Some(item.vals[i1].iter().map(|k| k.as_()).collect());
+                    }
+                    Some(sum) => {
+                        for (a, b) in sum.iter_mut().zip(item.vals[i1].iter()) {
+                            let vf = b.as_();
+                            if vf.is_nan() {
+                            } else {
+                                *a += vf;
+                            }
+                        }
+                    }
+                }
+                self.sumc += 1;
+                self.count += 1;
+            }
+        }
+    }
+
+    fn result(self) -> Self::Output {
+        let avg = if self.sumc == 0 {
+            None
+        } else {
+            let avg = self
+                .sum
+                .as_ref()
+                .unwrap()
+                .iter()
+                .map(|item| item / self.sumc as f32)
+                .collect();
+            Some(avg)
+        };
+        Self::Output {
+            ts1s: vec![self.range.beg],
+            ts2s: vec![self.range.end],
+            counts: vec![self.count],
+            mins: vec![self.min],
+            maxs: vec![self.max],
+            avgs: vec![avg],
+        }
+    }
+}
+
 pub struct WaveXBinner<NTY> {
     _m1: PhantomData<NTY>,
 }
@@ -336,3 +582,48 @@ where
         ret
     }
 }
+
+pub struct WaveNBinner<NTY> {
+    _m1: PhantomData<NTY>,
+}
+
+impl<NTY> EventsNodeProcessor for WaveNBinner<NTY>
+where
+    NTY: NumOps,
+{
+    type Input = Vec<NTY>;
+    // TODO need new container type for this case:
+    type Output = XBinnedScalarEvents<NTY>;
+
+    fn process(_inp: EventValues<Self::Input>) -> Self::Output {
+        err::todoval()
+    }
+}
+
+pub struct WavePlainProc<NTY> {
+    _m1: PhantomData<NTY>,
+}
+
+impl<NTY> EventsNodeProcessor for WavePlainProc<NTY>
+where
+    NTY: NumOps,
+{
+    type Input = Vec<NTY>;
+    type Output = WaveEvents<NTY>;
+
+    fn process(inp: EventValues<Self::Input>) -> Self::Output {
+        if false {
+            let n = if inp.values.len() > 0 { inp.values[0].len() } else { 0 };
+            let n = if n > 5 { 5 } else { n };
+            WaveEvents {
+                tss: inp.tss,
+                vals: inp.values.iter().map(|k| k[..n].to_vec()).collect(),
+            }
+        } else {
+            WaveEvents {
+                tss: inp.tss,
+                vals: inp.values,
+            }
+        }
+    }
+}