Support more numeric types in conversion
This commit is contained in:
@@ -1,339 +1,184 @@
|
||||
use crate::eventsitem::EventsItem;
|
||||
use crate::plainevents::{PlainEvents, ScalarPlainEvents};
|
||||
use crate::xbinnedscalarevents::XBinnedScalarEvents;
|
||||
use crate::xbinnedwaveevents::XBinnedWaveEvents;
|
||||
use crate::{Appendable, Clearable, PushableIndex, WithLen, WithTimestamps};
|
||||
use netpod::{AggKind, HasScalarType, HasShape, ScalarType, Shape};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{
|
||||
eventsitem::EventsItem,
|
||||
plainevents::{PlainEvents, ScalarPlainEvents},
|
||||
};
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub enum SingleBinWaveEvents {
|
||||
U8(XBinnedScalarEvents<u8>),
|
||||
U16(XBinnedScalarEvents<u16>),
|
||||
U32(XBinnedScalarEvents<u32>),
|
||||
U64(XBinnedScalarEvents<u64>),
|
||||
I8(XBinnedScalarEvents<i8>),
|
||||
I16(XBinnedScalarEvents<i16>),
|
||||
I32(XBinnedScalarEvents<i32>),
|
||||
I64(XBinnedScalarEvents<i64>),
|
||||
F32(XBinnedScalarEvents<f32>),
|
||||
F64(XBinnedScalarEvents<f64>),
|
||||
}
|
||||
|
||||
impl SingleBinWaveEvents {
|
||||
pub fn variant_name(&self) -> String {
|
||||
use SingleBinWaveEvents::*;
|
||||
match self {
|
||||
I8(_) => format!("I8"),
|
||||
I16(_) => format!("I16"),
|
||||
I32(_) => format!("I32"),
|
||||
F32(_) => format!("F32"),
|
||||
F64(_) => format!("F64"),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { "$id".into() })
|
||||
}
|
||||
|
||||
fn x_aggregate(self, ak: &AggKind) -> EventsItem {
|
||||
use SingleBinWaveEvents::*;
|
||||
match self {
|
||||
I8(k) => match ak {
|
||||
items_proc::tycases1!(self, Self, (k), {
|
||||
match ak {
|
||||
AggKind::EventBlobs => panic!(),
|
||||
AggKind::Plain => EventsItem::XBinnedEvents(XBinnedEvents::SingleBinWave(SingleBinWaveEvents::I8(k))),
|
||||
AggKind::Plain => EventsItem::XBinnedEvents(XBinnedEvents::SingleBinWave(SingleBinWaveEvents::$id(k))),
|
||||
AggKind::TimeWeightedScalar => err::todoval(),
|
||||
AggKind::DimXBins1 => err::todoval(),
|
||||
AggKind::DimXBinsN(_) => EventsItem::Plain(PlainEvents::Wave(err::todoval())),
|
||||
},
|
||||
_ => err::todoval(),
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl Clearable for SingleBinWaveEvents {
|
||||
fn clear(&mut self) {
|
||||
match self {
|
||||
SingleBinWaveEvents::I8(k) => k.clear(),
|
||||
SingleBinWaveEvents::I16(k) => k.clear(),
|
||||
SingleBinWaveEvents::I32(k) => k.clear(),
|
||||
SingleBinWaveEvents::F32(k) => k.clear(),
|
||||
SingleBinWaveEvents::F64(k) => k.clear(),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.clear() })
|
||||
}
|
||||
}
|
||||
|
||||
impl Appendable for SingleBinWaveEvents {
|
||||
fn empty_like_self(&self) -> Self {
|
||||
match self {
|
||||
Self::I8(k) => Self::I8(k.empty_like_self()),
|
||||
Self::I16(k) => Self::I16(k.empty_like_self()),
|
||||
Self::I32(k) => Self::I32(k.empty_like_self()),
|
||||
Self::F32(k) => Self::F32(k.empty_like_self()),
|
||||
Self::F64(k) => Self::F64(k.empty_like_self()),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { Self::$id(k.empty_like_self()) })
|
||||
}
|
||||
|
||||
fn append(&mut self, src: &Self) {
|
||||
match self {
|
||||
Self::I8(k) => match src {
|
||||
Self::I8(j) => k.append(j),
|
||||
items_proc::tycases1!(self, Self, (k), {
|
||||
match src {
|
||||
Self::$id(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I16(k) => match src {
|
||||
Self::I16(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I32(k) => match src {
|
||||
Self::I32(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F32(k) => match src {
|
||||
Self::F32(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F64(k) => match src {
|
||||
Self::F64(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl PushableIndex for SingleBinWaveEvents {
|
||||
fn push_index(&mut self, src: &Self, ix: usize) {
|
||||
match self {
|
||||
Self::I8(k) => match src {
|
||||
Self::I8(j) => k.push_index(j, ix),
|
||||
items_proc::tycases1!(self, Self, (k), {
|
||||
match src {
|
||||
Self::$id(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I16(k) => match src {
|
||||
Self::I16(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I32(k) => match src {
|
||||
Self::I32(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F32(k) => match src {
|
||||
Self::F32(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F64(k) => match src {
|
||||
Self::F64(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl WithLen for SingleBinWaveEvents {
|
||||
fn len(&self) -> usize {
|
||||
use SingleBinWaveEvents::*;
|
||||
match self {
|
||||
I8(j) => j.len(),
|
||||
I16(j) => j.len(),
|
||||
I32(j) => j.len(),
|
||||
F32(j) => j.len(),
|
||||
F64(j) => j.len(),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.len() })
|
||||
}
|
||||
}
|
||||
|
||||
impl WithTimestamps for SingleBinWaveEvents {
|
||||
fn ts(&self, ix: usize) -> u64 {
|
||||
use SingleBinWaveEvents::*;
|
||||
match self {
|
||||
I8(j) => j.ts(ix),
|
||||
I16(j) => j.ts(ix),
|
||||
I32(j) => j.ts(ix),
|
||||
F32(j) => j.ts(ix),
|
||||
F64(j) => j.ts(ix),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.ts(ix) })
|
||||
}
|
||||
}
|
||||
|
||||
impl HasShape for SingleBinWaveEvents {
|
||||
fn shape(&self) -> Shape {
|
||||
use SingleBinWaveEvents::*;
|
||||
match self {
|
||||
I8(_) => Shape::Scalar,
|
||||
I16(_) => Shape::Scalar,
|
||||
I32(_) => Shape::Scalar,
|
||||
F32(_) => Shape::Scalar,
|
||||
F64(_) => Shape::Scalar,
|
||||
}
|
||||
Shape::Scalar
|
||||
}
|
||||
}
|
||||
|
||||
impl HasScalarType for SingleBinWaveEvents {
|
||||
fn scalar_type(&self) -> ScalarType {
|
||||
use SingleBinWaveEvents::*;
|
||||
match self {
|
||||
I8(_) => ScalarType::I8,
|
||||
I16(_) => ScalarType::I16,
|
||||
I32(_) => ScalarType::I32,
|
||||
F32(_) => ScalarType::F32,
|
||||
F64(_) => ScalarType::F64,
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { ScalarType::$id })
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub enum MultiBinWaveEvents {
|
||||
U8(XBinnedWaveEvents<u8>),
|
||||
U16(XBinnedWaveEvents<u16>),
|
||||
U32(XBinnedWaveEvents<u32>),
|
||||
U64(XBinnedWaveEvents<u64>),
|
||||
I8(XBinnedWaveEvents<i8>),
|
||||
I16(XBinnedWaveEvents<i16>),
|
||||
I32(XBinnedWaveEvents<i32>),
|
||||
I64(XBinnedWaveEvents<i64>),
|
||||
F32(XBinnedWaveEvents<f32>),
|
||||
F64(XBinnedWaveEvents<f64>),
|
||||
}
|
||||
|
||||
impl MultiBinWaveEvents {
|
||||
pub fn variant_name(&self) -> String {
|
||||
use MultiBinWaveEvents::*;
|
||||
match self {
|
||||
I8(_) => format!("I8"),
|
||||
I16(_) => format!("I16"),
|
||||
I32(_) => format!("I32"),
|
||||
F32(_) => format!("F32"),
|
||||
F64(_) => format!("F64"),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { "$id".into() })
|
||||
}
|
||||
|
||||
fn x_aggregate(self, ak: &AggKind) -> EventsItem {
|
||||
use MultiBinWaveEvents::*;
|
||||
match self {
|
||||
I8(k) => match ak {
|
||||
items_proc::tycases1!(self, Self, (k), {
|
||||
match ak {
|
||||
AggKind::EventBlobs => panic!(),
|
||||
AggKind::Plain => EventsItem::XBinnedEvents(XBinnedEvents::MultiBinWave(MultiBinWaveEvents::I8(k))),
|
||||
AggKind::Plain => EventsItem::XBinnedEvents(XBinnedEvents::MultiBinWave(MultiBinWaveEvents::$id(k))),
|
||||
AggKind::TimeWeightedScalar => err::todoval(),
|
||||
AggKind::DimXBins1 => err::todoval(),
|
||||
AggKind::DimXBinsN(_) => EventsItem::Plain(PlainEvents::Wave(err::todoval())),
|
||||
},
|
||||
_ => err::todoval(),
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl Clearable for MultiBinWaveEvents {
|
||||
fn clear(&mut self) {
|
||||
match self {
|
||||
MultiBinWaveEvents::I8(k) => k.clear(),
|
||||
MultiBinWaveEvents::I16(k) => k.clear(),
|
||||
MultiBinWaveEvents::I32(k) => k.clear(),
|
||||
MultiBinWaveEvents::F32(k) => k.clear(),
|
||||
MultiBinWaveEvents::F64(k) => k.clear(),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.clear() })
|
||||
}
|
||||
}
|
||||
|
||||
impl Appendable for MultiBinWaveEvents {
|
||||
fn empty_like_self(&self) -> Self {
|
||||
match self {
|
||||
Self::I8(k) => Self::I8(k.empty_like_self()),
|
||||
Self::I16(k) => Self::I16(k.empty_like_self()),
|
||||
Self::I32(k) => Self::I32(k.empty_like_self()),
|
||||
Self::F32(k) => Self::F32(k.empty_like_self()),
|
||||
Self::F64(k) => Self::F64(k.empty_like_self()),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { Self::$id(k.empty_like_self()) })
|
||||
}
|
||||
|
||||
fn append(&mut self, src: &Self) {
|
||||
match self {
|
||||
Self::I8(k) => match src {
|
||||
Self::I8(j) => k.append(j),
|
||||
items_proc::tycases1!(self, Self, (k), {
|
||||
match src {
|
||||
Self::$id(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I16(k) => match src {
|
||||
Self::I16(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I32(k) => match src {
|
||||
Self::I32(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F32(k) => match src {
|
||||
Self::F32(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F64(k) => match src {
|
||||
Self::F64(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl PushableIndex for MultiBinWaveEvents {
|
||||
fn push_index(&mut self, src: &Self, ix: usize) {
|
||||
match self {
|
||||
Self::I8(k) => match src {
|
||||
Self::I8(j) => k.push_index(j, ix),
|
||||
items_proc::tycases1!(self, Self, (k), {
|
||||
match src {
|
||||
Self::$id(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I16(k) => match src {
|
||||
Self::I16(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I32(k) => match src {
|
||||
Self::I32(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F32(k) => match src {
|
||||
Self::F32(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F64(k) => match src {
|
||||
Self::F64(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl WithLen for MultiBinWaveEvents {
|
||||
fn len(&self) -> usize {
|
||||
use MultiBinWaveEvents::*;
|
||||
match self {
|
||||
I8(j) => j.len(),
|
||||
I16(j) => j.len(),
|
||||
I32(j) => j.len(),
|
||||
F32(j) => j.len(),
|
||||
F64(j) => j.len(),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.len() })
|
||||
}
|
||||
}
|
||||
|
||||
impl WithTimestamps for MultiBinWaveEvents {
|
||||
fn ts(&self, ix: usize) -> u64 {
|
||||
use MultiBinWaveEvents::*;
|
||||
match self {
|
||||
I8(j) => j.ts(ix),
|
||||
I16(j) => j.ts(ix),
|
||||
I32(j) => j.ts(ix),
|
||||
F32(j) => j.ts(ix),
|
||||
F64(j) => j.ts(ix),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.ts(ix) })
|
||||
}
|
||||
}
|
||||
|
||||
impl HasShape for MultiBinWaveEvents {
|
||||
fn shape(&self) -> Shape {
|
||||
use MultiBinWaveEvents::*;
|
||||
match self {
|
||||
I8(_) => Shape::Scalar,
|
||||
I16(_) => Shape::Scalar,
|
||||
I32(_) => Shape::Scalar,
|
||||
F32(_) => Shape::Scalar,
|
||||
F64(_) => Shape::Scalar,
|
||||
}
|
||||
Shape::Scalar
|
||||
}
|
||||
}
|
||||
|
||||
impl HasScalarType for MultiBinWaveEvents {
|
||||
fn scalar_type(&self) -> ScalarType {
|
||||
use MultiBinWaveEvents::*;
|
||||
match self {
|
||||
I8(_) => ScalarType::I8,
|
||||
I16(_) => ScalarType::I16,
|
||||
I32(_) => ScalarType::I32,
|
||||
F32(_) => ScalarType::F32,
|
||||
F64(_) => ScalarType::F64,
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { ScalarType::$id })
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use crate::binnedevents::XBinnedEvents;
|
||||
use crate::plainevents::{PlainEvents, ScalarPlainEvents, WavePlainEvents};
|
||||
use crate::plainevents::PlainEvents;
|
||||
use crate::{Appendable, Clearable, PushableIndex, SitemtyFrameType, WithLen, WithTimestamps};
|
||||
use netpod::{AggKind, HasScalarType, HasShape, ScalarType, Shape};
|
||||
use serde::{Deserialize, Serialize};
|
||||
@@ -46,29 +46,7 @@ impl EventsItem {
|
||||
}
|
||||
|
||||
pub fn type_info(&self) -> (ScalarType, Shape) {
|
||||
match self {
|
||||
EventsItem::Plain(k) => match k {
|
||||
PlainEvents::Scalar(k) => match k {
|
||||
ScalarPlainEvents::U32(_) => (ScalarType::U32, Shape::Scalar),
|
||||
ScalarPlainEvents::I8(_) => (ScalarType::I8, Shape::Scalar),
|
||||
ScalarPlainEvents::I16(_) => (ScalarType::I16, Shape::Scalar),
|
||||
ScalarPlainEvents::I32(_) => (ScalarType::I32, Shape::Scalar),
|
||||
ScalarPlainEvents::F32(_) => (ScalarType::F32, Shape::Scalar),
|
||||
ScalarPlainEvents::F64(_) => (ScalarType::F64, Shape::Scalar),
|
||||
},
|
||||
PlainEvents::Wave(k) => match k {
|
||||
// TODO
|
||||
// Inherent issue for the non-static-type backends:
|
||||
// there is a chance that we can't determine the shape here.
|
||||
WavePlainEvents::I8(k) => (ScalarType::I8, k.shape().unwrap()),
|
||||
WavePlainEvents::I16(k) => (ScalarType::I16, k.shape().unwrap()),
|
||||
WavePlainEvents::I32(k) => (ScalarType::I32, k.shape().unwrap()),
|
||||
WavePlainEvents::F32(k) => (ScalarType::F32, k.shape().unwrap()),
|
||||
WavePlainEvents::F64(k) => (ScalarType::F64, k.shape().unwrap()),
|
||||
},
|
||||
},
|
||||
EventsItem::XBinnedEvents(_k) => panic!(),
|
||||
}
|
||||
(self.scalar_type(), self.shape())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,363 +2,190 @@ use crate::binnedevents::{SingleBinWaveEvents, XBinnedEvents};
|
||||
use crate::eventsitem::EventsItem;
|
||||
use crate::eventvalues::EventValues;
|
||||
use crate::waveevents::{WaveEvents, WaveXBinner};
|
||||
use crate::xbinnedscalarevents::XBinnedScalarEvents;
|
||||
use crate::{Appendable, Clearable, EventsNodeProcessor, PushableIndex, WithLen, WithTimestamps};
|
||||
use err::Error;
|
||||
use netpod::{AggKind, HasScalarType, HasShape, ScalarType, Shape};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
//items_proc::enumvars!(ScalarPlainEvents, EventValues);
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub enum ScalarPlainEvents {
|
||||
U8(EventValues<u8>),
|
||||
U16(EventValues<u16>),
|
||||
U32(EventValues<u32>),
|
||||
U64(EventValues<u64>),
|
||||
I8(EventValues<i8>),
|
||||
I16(EventValues<i16>),
|
||||
I32(EventValues<i32>),
|
||||
I64(EventValues<i64>),
|
||||
F32(EventValues<f32>),
|
||||
F64(EventValues<f64>),
|
||||
}
|
||||
|
||||
impl ScalarPlainEvents {
|
||||
pub fn variant_name(&self) -> String {
|
||||
use ScalarPlainEvents::*;
|
||||
match self {
|
||||
U32(_) => format!("U32"),
|
||||
I8(_) => format!("I8"),
|
||||
I16(_) => format!("I16"),
|
||||
I32(_) => format!("I32"),
|
||||
F32(_) => format!("F32"),
|
||||
F64(_) => format!("F64"),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { "$id".into() })
|
||||
}
|
||||
}
|
||||
|
||||
impl Clearable for ScalarPlainEvents {
|
||||
fn clear(&mut self) {
|
||||
match self {
|
||||
ScalarPlainEvents::U32(k) => k.clear(),
|
||||
ScalarPlainEvents::I8(k) => k.clear(),
|
||||
ScalarPlainEvents::I16(k) => k.clear(),
|
||||
ScalarPlainEvents::I32(k) => k.clear(),
|
||||
ScalarPlainEvents::F32(k) => k.clear(),
|
||||
ScalarPlainEvents::F64(k) => k.clear(),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.clear() })
|
||||
}
|
||||
}
|
||||
|
||||
impl Appendable for ScalarPlainEvents {
|
||||
fn empty_like_self(&self) -> Self {
|
||||
match self {
|
||||
Self::U32(k) => Self::U32(k.empty_like_self()),
|
||||
Self::I8(k) => Self::I8(k.empty_like_self()),
|
||||
Self::I16(k) => Self::I16(k.empty_like_self()),
|
||||
Self::I32(k) => Self::I32(k.empty_like_self()),
|
||||
Self::F32(k) => Self::F32(k.empty_like_self()),
|
||||
Self::F64(k) => Self::F64(k.empty_like_self()),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { Self::$id(k.empty_like_self()) })
|
||||
}
|
||||
|
||||
fn append(&mut self, src: &Self) {
|
||||
match self {
|
||||
Self::U32(k) => match src {
|
||||
Self::U32(j) => k.append(j),
|
||||
items_proc::tycases1!(self, Self, (k), {
|
||||
match src {
|
||||
Self::$id(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I8(k) => match src {
|
||||
Self::I8(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I16(k) => match src {
|
||||
Self::I16(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I32(k) => match src {
|
||||
Self::I32(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F32(k) => match src {
|
||||
Self::F32(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F64(k) => match src {
|
||||
Self::F64(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl PushableIndex for ScalarPlainEvents {
|
||||
fn push_index(&mut self, src: &Self, ix: usize) {
|
||||
match self {
|
||||
Self::U32(k) => match src {
|
||||
Self::U32(j) => k.push_index(j, ix),
|
||||
items_proc::tycases1!(self, Self, (k), {
|
||||
match src {
|
||||
Self::$id(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I8(k) => match src {
|
||||
Self::I8(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I16(k) => match src {
|
||||
Self::I16(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I32(k) => match src {
|
||||
Self::I32(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F32(k) => match src {
|
||||
Self::F32(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F64(k) => match src {
|
||||
Self::F64(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl WithLen for ScalarPlainEvents {
|
||||
fn len(&self) -> usize {
|
||||
use ScalarPlainEvents::*;
|
||||
match self {
|
||||
U32(j) => j.len(),
|
||||
I8(j) => j.len(),
|
||||
I16(j) => j.len(),
|
||||
I32(j) => j.len(),
|
||||
F32(j) => j.len(),
|
||||
F64(j) => j.len(),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.len() })
|
||||
}
|
||||
}
|
||||
|
||||
impl WithTimestamps for ScalarPlainEvents {
|
||||
fn ts(&self, ix: usize) -> u64 {
|
||||
use ScalarPlainEvents::*;
|
||||
match self {
|
||||
U32(j) => j.ts(ix),
|
||||
I8(j) => j.ts(ix),
|
||||
I16(j) => j.ts(ix),
|
||||
I32(j) => j.ts(ix),
|
||||
F32(j) => j.ts(ix),
|
||||
F64(j) => j.ts(ix),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.ts(ix) })
|
||||
}
|
||||
}
|
||||
|
||||
impl HasShape for ScalarPlainEvents {
|
||||
fn shape(&self) -> Shape {
|
||||
match self {
|
||||
_ => Shape::Scalar,
|
||||
}
|
||||
Shape::Scalar
|
||||
}
|
||||
}
|
||||
|
||||
impl HasScalarType for ScalarPlainEvents {
|
||||
fn scalar_type(&self) -> ScalarType {
|
||||
use ScalarPlainEvents::*;
|
||||
match self {
|
||||
U32(_) => ScalarType::U32,
|
||||
I8(_) => ScalarType::I8,
|
||||
I16(_) => ScalarType::I16,
|
||||
I32(_) => ScalarType::I32,
|
||||
F32(_) => ScalarType::F32,
|
||||
F64(_) => ScalarType::F64,
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { ScalarType::$id })
|
||||
}
|
||||
}
|
||||
|
||||
//items_proc::enumvars!(WavePlainEvents, WaveEvents);
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub enum WavePlainEvents {
|
||||
U8(WaveEvents<u8>),
|
||||
U16(WaveEvents<u16>),
|
||||
U32(WaveEvents<u32>),
|
||||
U64(WaveEvents<u64>),
|
||||
I8(WaveEvents<i8>),
|
||||
I16(WaveEvents<i16>),
|
||||
I32(WaveEvents<i32>),
|
||||
I64(WaveEvents<i64>),
|
||||
F32(WaveEvents<f32>),
|
||||
F64(WaveEvents<f64>),
|
||||
}
|
||||
|
||||
impl WavePlainEvents {
|
||||
pub fn shape(&self) -> Result<Shape, Error> {
|
||||
match self {
|
||||
WavePlainEvents::I8(k) => k.shape(),
|
||||
WavePlainEvents::I16(k) => k.shape(),
|
||||
WavePlainEvents::I32(k) => k.shape(),
|
||||
WavePlainEvents::F32(k) => k.shape(),
|
||||
WavePlainEvents::F64(k) => k.shape(),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.shape() })
|
||||
}
|
||||
}
|
||||
|
||||
macro_rules! wagg1 {
|
||||
($k:expr, $ak:expr, $shape:expr, $sty:ident) => {
|
||||
match $ak {
|
||||
AggKind::EventBlobs => panic!(),
|
||||
AggKind::Plain => EventsItem::Plain(PlainEvents::Wave(WavePlainEvents::$sty($k))),
|
||||
AggKind::TimeWeightedScalar => {
|
||||
let p = WaveXBinner::create($shape, $ak.clone());
|
||||
let j = p.process($k);
|
||||
EventsItem::XBinnedEvents(XBinnedEvents::SingleBinWave(SingleBinWaveEvents::$sty(j)))
|
||||
}
|
||||
AggKind::DimXBins1 => {
|
||||
let p = WaveXBinner::create($shape, $ak.clone());
|
||||
let j = p.process($k);
|
||||
EventsItem::XBinnedEvents(XBinnedEvents::SingleBinWave(SingleBinWaveEvents::$sty(j)))
|
||||
}
|
||||
AggKind::DimXBinsN(_) => EventsItem::Plain(PlainEvents::Wave(err::todoval())),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
impl WavePlainEvents {
|
||||
pub fn variant_name(&self) -> String {
|
||||
use WavePlainEvents::*;
|
||||
match self {
|
||||
I8(h) => format!("I8({})", h.vals.first().map_or(0, |j| j.len())),
|
||||
I16(h) => format!("I16({})", h.vals.first().map_or(0, |j| j.len())),
|
||||
I32(h) => format!("I32({})", h.vals.first().map_or(0, |j| j.len())),
|
||||
F32(h) => format!("F32({})", h.vals.first().map_or(0, |j| j.len())),
|
||||
F64(h) => format!("F64({})", h.vals.first().map_or(0, |j| j.len())),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), {
|
||||
format!("$id({})", k.vals.first().map_or(0, |j| j.len()))
|
||||
})
|
||||
}
|
||||
|
||||
fn x_aggregate(self, ak: &AggKind) -> EventsItem {
|
||||
use WavePlainEvents::*;
|
||||
let shape = self.shape().unwrap();
|
||||
match self {
|
||||
I8(k) => wagg1!(k, ak, shape, I8),
|
||||
I16(k) => wagg1!(k, ak, shape, I16),
|
||||
I32(k) => wagg1!(k, ak, shape, I32),
|
||||
F32(k) => wagg1!(k, ak, shape, F32),
|
||||
F64(k) => wagg1!(k, ak, shape, F64),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), {
|
||||
match ak {
|
||||
AggKind::EventBlobs => panic!(),
|
||||
AggKind::Plain => EventsItem::Plain(PlainEvents::Wave(WavePlainEvents::$id(k))),
|
||||
AggKind::TimeWeightedScalar => {
|
||||
let p = WaveXBinner::<$ty>::create(shape, ak.clone());
|
||||
let j: XBinnedScalarEvents<$ty> = p.process(k);
|
||||
EventsItem::XBinnedEvents(XBinnedEvents::SingleBinWave(SingleBinWaveEvents::$id(j)))
|
||||
}
|
||||
AggKind::DimXBins1 => {
|
||||
let p = WaveXBinner::<$ty>::create(shape, ak.clone());
|
||||
let j: XBinnedScalarEvents<$ty> = p.process(k);
|
||||
EventsItem::XBinnedEvents(XBinnedEvents::SingleBinWave(SingleBinWaveEvents::$id(j)))
|
||||
}
|
||||
AggKind::DimXBinsN(_) => EventsItem::Plain(PlainEvents::Wave(err::todoval())),
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl Clearable for WavePlainEvents {
|
||||
fn clear(&mut self) {
|
||||
match self {
|
||||
WavePlainEvents::I8(k) => k.clear(),
|
||||
WavePlainEvents::I16(k) => k.clear(),
|
||||
WavePlainEvents::I32(k) => k.clear(),
|
||||
WavePlainEvents::F32(k) => k.clear(),
|
||||
WavePlainEvents::F64(k) => k.clear(),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.clear() })
|
||||
}
|
||||
}
|
||||
|
||||
impl Appendable for WavePlainEvents {
|
||||
fn empty_like_self(&self) -> Self {
|
||||
match self {
|
||||
Self::I8(k) => Self::I8(k.empty_like_self()),
|
||||
Self::I16(k) => Self::I16(k.empty_like_self()),
|
||||
Self::I32(k) => Self::I32(k.empty_like_self()),
|
||||
Self::F32(k) => Self::F32(k.empty_like_self()),
|
||||
Self::F64(k) => Self::F64(k.empty_like_self()),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { Self::$id(k.empty_like_self()) })
|
||||
}
|
||||
|
||||
fn append(&mut self, src: &Self) {
|
||||
match self {
|
||||
Self::I8(k) => match src {
|
||||
Self::I8(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I16(k) => match src {
|
||||
Self::I16(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I32(k) => match src {
|
||||
Self::I32(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F32(k) => match src {
|
||||
Self::F32(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F64(k) => match src {
|
||||
Self::F64(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
},
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { match src {
|
||||
Self::$id(j) => k.append(j),
|
||||
_ => panic!(),
|
||||
} })
|
||||
}
|
||||
}
|
||||
|
||||
impl PushableIndex for WavePlainEvents {
|
||||
fn push_index(&mut self, src: &Self, ix: usize) {
|
||||
match self {
|
||||
Self::I8(k) => match src {
|
||||
Self::I8(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I16(k) => match src {
|
||||
Self::I16(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::I32(k) => match src {
|
||||
Self::I32(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F32(k) => match src {
|
||||
Self::F32(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
Self::F64(k) => match src {
|
||||
Self::F64(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
},
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { match src {
|
||||
Self::$id(j) => k.push_index(j, ix),
|
||||
_ => panic!(),
|
||||
} })
|
||||
}
|
||||
}
|
||||
|
||||
impl WithLen for WavePlainEvents {
|
||||
fn len(&self) -> usize {
|
||||
use WavePlainEvents::*;
|
||||
match self {
|
||||
I8(j) => j.len(),
|
||||
I16(j) => j.len(),
|
||||
I32(j) => j.len(),
|
||||
F32(j) => j.len(),
|
||||
F64(j) => j.len(),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.len() })
|
||||
}
|
||||
}
|
||||
|
||||
impl WithTimestamps for WavePlainEvents {
|
||||
fn ts(&self, ix: usize) -> u64 {
|
||||
use WavePlainEvents::*;
|
||||
match self {
|
||||
I8(j) => j.ts(ix),
|
||||
I16(j) => j.ts(ix),
|
||||
I32(j) => j.ts(ix),
|
||||
F32(j) => j.ts(ix),
|
||||
F64(j) => j.ts(ix),
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { k.ts(ix) })
|
||||
}
|
||||
}
|
||||
|
||||
impl HasShape for WavePlainEvents {
|
||||
fn shape(&self) -> Shape {
|
||||
/*use WavePlainEvents::*;
|
||||
match self {
|
||||
Byte(h) => Shape::Wave(h.vals.first().map_or(0, |x| x.len() as u32)),
|
||||
I16(h) => Shape::Wave(h.vals.first().map_or(0, |x| x.len() as u32)),
|
||||
I32(h) => Shape::Wave(h.vals.first().map_or(0, |x| x.len() as u32)),
|
||||
Float(h) => Shape::Wave(h.vals.first().map_or(0, |x| x.len() as u32)),
|
||||
Double(h) => Shape::Wave(h.vals.first().map_or(0, |x| x.len() as u32)),
|
||||
}*/
|
||||
self.shape().unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
impl HasScalarType for WavePlainEvents {
|
||||
fn scalar_type(&self) -> ScalarType {
|
||||
use WavePlainEvents::*;
|
||||
match self {
|
||||
I8(_) => ScalarType::I8,
|
||||
I16(_) => ScalarType::I16,
|
||||
I32(_) => ScalarType::I32,
|
||||
F32(_) => ScalarType::F32,
|
||||
F64(_) => ScalarType::F64,
|
||||
}
|
||||
items_proc::tycases1!(self, Self, (k), { ScalarType::$id })
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user