Remove unused
This commit is contained in:
@@ -3,11 +3,8 @@ use crate::timebin::TimeBinnerCommonV0Trait;
|
||||
use crate::ts_offs_from_abs;
|
||||
use crate::ts_offs_from_abs_with_anchor;
|
||||
use crate::IsoDateTime;
|
||||
use crate::RangeOverlapInfo;
|
||||
use crate::TimeBinnableType;
|
||||
use crate::TimeBinnableTypeAggregator;
|
||||
use chrono::TimeZone;
|
||||
use chrono::Utc;
|
||||
use err::Error;
|
||||
use items_0::collect_s::CollectableDyn;
|
||||
use items_0::collect_s::CollectableType;
|
||||
@@ -285,8 +282,6 @@ impl<STY: ScalarOps> HasTimestampDeque for BinsDim0<STY> {
|
||||
}
|
||||
}
|
||||
|
||||
items_0::impl_range_overlap_info_bins!(BinsDim0);
|
||||
|
||||
impl<NTY: ScalarOps> AppendEmptyBin for BinsDim0<NTY> {
|
||||
fn append_empty_bin(&mut self, ts1: u64, ts2: u64) {
|
||||
debug!("AppendEmptyBin::append_empty_bin should not get used");
|
||||
@@ -1230,121 +1225,17 @@ impl<NTY: ScalarOps> TimeBinner for BinsDim0TimeBinner<NTY> {
|
||||
}
|
||||
|
||||
fn ingest(&mut self, item: &mut dyn TimeBinnable) {
|
||||
/*let self_name = any::type_name::<Self>();
|
||||
if item.len() == 0 {
|
||||
// Return already here, RangeOverlapInfo would not give much sense.
|
||||
return;
|
||||
}
|
||||
if self.edges.len() < 2 {
|
||||
warn!("TimeBinnerDyn for {self_name} no more bin in edges A\n{:?}\n\n", item);
|
||||
return;
|
||||
}
|
||||
// TODO optimize by remembering at which event array index we have arrived.
|
||||
// That needs modified interfaces which can take and yield the start and latest index.
|
||||
loop {
|
||||
while item.starts_after(NanoRange {
|
||||
beg: 0,
|
||||
end: self.edges[1],
|
||||
}) {
|
||||
self.cycle();
|
||||
if self.edges.len() < 2 {
|
||||
warn!("TimeBinnerDyn for {self_name} no more bin in edges B\n{:?}\n\n", item);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if item.ends_before(NanoRange {
|
||||
beg: self.edges[0],
|
||||
end: u64::MAX,
|
||||
}) {
|
||||
return;
|
||||
} else {
|
||||
if self.edges.len() < 2 {
|
||||
warn!("TimeBinnerDyn for {self_name} edge list exhausted");
|
||||
return;
|
||||
} else {
|
||||
let agg = if let Some(agg) = self.agg.as_mut() {
|
||||
agg
|
||||
} else {
|
||||
self.agg = Some(BinsDim0Aggregator::new(
|
||||
// We know here that we have enough edges for another bin.
|
||||
// and `next_bin_range` will pop the first edge.
|
||||
self.next_bin_range().unwrap(),
|
||||
self.do_time_weight,
|
||||
));
|
||||
self.agg.as_mut().unwrap()
|
||||
};
|
||||
if let Some(item) = item
|
||||
.as_any_ref()
|
||||
// TODO make statically sure that we attempt to cast to the correct type here:
|
||||
.downcast_ref::<<BinsDim0Aggregator<NTY> as TimeBinnableTypeAggregator>::Input>()
|
||||
{
|
||||
agg.ingest(item);
|
||||
} else {
|
||||
let tyid_item = std::any::Any::type_id(item.as_any_ref());
|
||||
error!("not correct item type {:?}", tyid_item);
|
||||
};
|
||||
if item.ends_after(agg.range().clone()) {
|
||||
self.cycle();
|
||||
if self.edges.len() < 2 {
|
||||
warn!("TimeBinnerDyn for {self_name} no more bin in edges C\n{:?}\n\n", item);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
TimeBinnerCommonV0Func::ingest(self, item)
|
||||
panic!("TODO do not use")
|
||||
}
|
||||
|
||||
// TODO there is too much common code between implementors:
|
||||
fn push_in_progress(&mut self, push_empty: bool) {
|
||||
// TODO expand should be derived from AggKind. Is it still required after all?
|
||||
/*let expand = true;
|
||||
if let Some(agg) = self.agg.as_mut() {
|
||||
let dummy_range = NanoRange { beg: 4, end: 5 };
|
||||
let mut bins = agg.result_reset(dummy_range, expand);
|
||||
self.agg = None;
|
||||
assert_eq!(bins.len(), 1);
|
||||
if push_empty || bins.counts[0] != 0 {
|
||||
match self.ready.as_mut() {
|
||||
Some(ready) => {
|
||||
ready.append_all_from(&mut bins);
|
||||
}
|
||||
None => {
|
||||
self.ready = Some(bins);
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
TimeBinnerCommonV0Func::push_in_progress(self, push_empty)
|
||||
panic!("TODO do not use")
|
||||
}
|
||||
|
||||
// TODO there is too much common code between implementors:
|
||||
fn cycle(&mut self) {
|
||||
/*let n = self.bins_ready_count();
|
||||
self.push_in_progress(true);
|
||||
if self.bins_ready_count() == n {
|
||||
if let Some(range) = self.next_bin_range() {
|
||||
let mut bins = BinsDim0::<NTY>::empty();
|
||||
bins.append_zero(range.beg, range.end);
|
||||
match self.ready.as_mut() {
|
||||
Some(ready) => {
|
||||
ready.append_all_from(&mut bins);
|
||||
}
|
||||
None => {
|
||||
self.ready = Some(bins);
|
||||
}
|
||||
}
|
||||
if self.bins_ready_count() <= n {
|
||||
error!("failed to push a zero bin");
|
||||
}
|
||||
} else {
|
||||
warn!("cycle: no in-progress bin pushed, but also no more bin to add as zero-bin");
|
||||
}
|
||||
}*/
|
||||
TimeBinnerCommonV0Func::cycle(self)
|
||||
panic!("TODO do not use")
|
||||
}
|
||||
|
||||
fn set_range_complete(&mut self) {
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
use crate::ts_offs_from_abs;
|
||||
use crate::ts_offs_from_abs_with_anchor;
|
||||
use crate::IsoDateTime;
|
||||
use crate::RangeOverlapInfo;
|
||||
use crate::TimeBinnableType;
|
||||
use crate::TimeBinnableTypeAggregator;
|
||||
use chrono::{TimeZone, Utc};
|
||||
use err::Error;
|
||||
use items_0::collect_s::CollectableDyn;
|
||||
use items_0::collect_s::CollectableType;
|
||||
@@ -235,20 +233,6 @@ impl<STY> Resettable for BinsXbinDim0<STY> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<NTY> RangeOverlapInfo for BinsXbinDim0<NTY> {
|
||||
fn ends_before(&self, range: &SeriesRange) -> bool {
|
||||
todo!()
|
||||
}
|
||||
|
||||
fn ends_after(&self, range: &SeriesRange) -> bool {
|
||||
todo!()
|
||||
}
|
||||
|
||||
fn starts_after(&self, range: &SeriesRange) -> bool {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
|
||||
impl<NTY: ScalarOps> AppendEmptyBin for BinsXbinDim0<NTY> {
|
||||
fn append_empty_bin(&mut self, ts1: u64, ts2: u64) {
|
||||
self.ts1s.push_back(ts1);
|
||||
|
||||
@@ -7,7 +7,6 @@ use items_0::collect_s::CollectorDyn;
|
||||
use items_0::container::ByteEstimate;
|
||||
use items_0::framable::FrameTypeInnerStatic;
|
||||
use items_0::isodate::IsoDateTime;
|
||||
use items_0::overlap::RangeOverlapInfo;
|
||||
use items_0::streamitem::ITEMS_2_CHANNEL_EVENTS_FRAME_TYPE_ID;
|
||||
use items_0::timebin::TimeBinnable;
|
||||
use items_0::timebin::TimeBinnableTy;
|
||||
@@ -827,20 +826,6 @@ impl Mergeable for ChannelEvents {
|
||||
}
|
||||
}
|
||||
|
||||
impl RangeOverlapInfo for ChannelEvents {
|
||||
fn ends_before(&self, range: &SeriesRange) -> bool {
|
||||
todo!()
|
||||
}
|
||||
|
||||
fn ends_after(&self, range: &SeriesRange) -> bool {
|
||||
todo!()
|
||||
}
|
||||
|
||||
fn starts_after(&self, range: &SeriesRange) -> bool {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
|
||||
impl TimeBinnable for ChannelEvents {
|
||||
fn time_binner_new(
|
||||
&self,
|
||||
@@ -865,7 +850,7 @@ impl EventsNonObj for ChannelEvents {
|
||||
fn into_tss_pulses(self: Box<Self>) -> (VecDeque<u64>, VecDeque<u64>) {
|
||||
match *self {
|
||||
ChannelEvents::Events(k) => k.into_tss_pulses(),
|
||||
ChannelEvents::Status(k) => (VecDeque::new(), VecDeque::new()),
|
||||
ChannelEvents::Status(_) => (VecDeque::new(), VecDeque::new()),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -910,7 +895,7 @@ impl Events for ChannelEvents {
|
||||
todo!()
|
||||
}
|
||||
|
||||
fn take_new_events_until_ts(&mut self, ts_end: u64) -> Box<dyn Events> {
|
||||
fn take_new_events_until_ts(&mut self, _ts_end: u64) -> Box<dyn Events> {
|
||||
todo!()
|
||||
}
|
||||
|
||||
@@ -937,15 +922,15 @@ impl Events for ChannelEvents {
|
||||
}
|
||||
}
|
||||
|
||||
fn find_lowest_index_gt_evs(&self, ts: u64) -> Option<usize> {
|
||||
fn find_lowest_index_gt_evs(&self, _ts: u64) -> Option<usize> {
|
||||
todo!()
|
||||
}
|
||||
|
||||
fn find_lowest_index_ge_evs(&self, ts: u64) -> Option<usize> {
|
||||
fn find_lowest_index_ge_evs(&self, _ts: u64) -> Option<usize> {
|
||||
todo!()
|
||||
}
|
||||
|
||||
fn find_highest_index_lt_evs(&self, ts: u64) -> Option<usize> {
|
||||
fn find_highest_index_lt_evs(&self, _ts: u64) -> Option<usize> {
|
||||
todo!()
|
||||
}
|
||||
|
||||
@@ -953,7 +938,7 @@ impl Events for ChannelEvents {
|
||||
todo!()
|
||||
}
|
||||
|
||||
fn partial_eq_dyn(&self, other: &dyn Events) -> bool {
|
||||
fn partial_eq_dyn(&self, _other: &dyn Events) -> bool {
|
||||
todo!()
|
||||
}
|
||||
|
||||
@@ -990,7 +975,7 @@ impl Events for ChannelEvents {
|
||||
fn to_json_string(&self) -> String {
|
||||
match self {
|
||||
ChannelEvents::Events(item) => item.to_json_string(),
|
||||
ChannelEvents::Status(item) => {
|
||||
ChannelEvents::Status(_item) => {
|
||||
error!("TODO convert status to json");
|
||||
String::new()
|
||||
}
|
||||
@@ -1000,7 +985,7 @@ impl Events for ChannelEvents {
|
||||
fn to_json_vec_u8(&self) -> Vec<u8> {
|
||||
match self {
|
||||
ChannelEvents::Events(item) => item.to_json_vec_u8(),
|
||||
ChannelEvents::Status(item) => {
|
||||
ChannelEvents::Status(_item) => {
|
||||
error!("TODO convert status to json");
|
||||
Vec::new()
|
||||
}
|
||||
@@ -1010,7 +995,7 @@ impl Events for ChannelEvents {
|
||||
fn to_cbor_vec_u8(&self) -> Vec<u8> {
|
||||
match self {
|
||||
ChannelEvents::Events(item) => item.to_cbor_vec_u8(),
|
||||
ChannelEvents::Status(item) => {
|
||||
ChannelEvents::Status(_item) => {
|
||||
error!("TODO convert status to cbor");
|
||||
Vec::new()
|
||||
}
|
||||
@@ -1030,7 +1015,7 @@ impl Events for ChannelEvents {
|
||||
use ChannelEvents::*;
|
||||
match self {
|
||||
Events(x) => x.to_dim0_f32_for_binning(),
|
||||
Status(x) => panic!("ChannelEvents::to_dim0_f32_for_binning"),
|
||||
Status(_x) => panic!("ChannelEvents::to_dim0_f32_for_binning"),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
use crate::binsdim0::BinsDim0;
|
||||
use crate::framable::FrameType;
|
||||
use crate::framable::FrameTypeStatic;
|
||||
use crate::timebin::ChooseIndicesForTimeBin;
|
||||
use crate::timebin::ChooseIndicesForTimeBinEvents;
|
||||
use crate::timebin::TimeAggregatorCommonV0Func;
|
||||
@@ -8,44 +6,35 @@ use crate::timebin::TimeAggregatorCommonV0Trait;
|
||||
use crate::timebin::TimeBinnerCommonV0Func;
|
||||
use crate::timebin::TimeBinnerCommonV0Trait;
|
||||
use crate::IsoDateTime;
|
||||
use crate::RangeOverlapInfo;
|
||||
use crate::TimeBinnableType;
|
||||
use crate::TimeBinnableTypeAggregator;
|
||||
use err::Error;
|
||||
use items_0::collect_s::CollectableDyn;
|
||||
use items_0::collect_s::CollectedDyn;
|
||||
use items_0::collect_s::CollectorDyn;
|
||||
use items_0::collect_s::CollectorTy;
|
||||
use items_0::collect_s::ToJsonBytes;
|
||||
use items_0::collect_s::ToJsonResult;
|
||||
use items_0::container::ByteEstimate;
|
||||
use items_0::framable::FrameTypeInnerStatic;
|
||||
use items_0::overlap::HasTimestampDeque;
|
||||
use items_0::scalar_ops::ScalarOps;
|
||||
use items_0::test::f32_iter_cmp_near;
|
||||
use items_0::timebin::TimeBinnable;
|
||||
use items_0::timebin::TimeBinned;
|
||||
use items_0::timebin::TimeBinner;
|
||||
use items_0::AppendAllFrom;
|
||||
use items_0::AppendEmptyBin;
|
||||
use items_0::Appendable;
|
||||
use items_0::AsAnyMut;
|
||||
use items_0::AsAnyRef;
|
||||
use items_0::Empty;
|
||||
use items_0::Events;
|
||||
use items_0::EventsNonObj;
|
||||
use items_0::HasNonemptyFirstBin;
|
||||
use items_0::MergeError;
|
||||
use items_0::Resettable;
|
||||
use items_0::TypeName;
|
||||
use items_0::WithLen;
|
||||
use netpod::is_false;
|
||||
use netpod::log::*;
|
||||
use netpod::range::evrange::NanoRange;
|
||||
use netpod::range::evrange::SeriesRange;
|
||||
use netpod::timeunits::MS;
|
||||
use netpod::timeunits::SEC;
|
||||
use netpod::BinnedRange;
|
||||
use netpod::BinnedRangeEnum;
|
||||
use netpod::TsNano;
|
||||
use serde::Deserialize;
|
||||
@@ -244,8 +233,6 @@ impl<STY: ScalarOps> HasTimestampDeque for EventsDim0<STY> {
|
||||
}
|
||||
}
|
||||
|
||||
items_0::impl_range_overlap_info_events!(EventsDim0);
|
||||
|
||||
impl<STY> ChooseIndicesForTimeBin for EventsDim0<STY> {
|
||||
fn choose_indices_unweight(&self, beg: u64, end: u64) -> (Option<usize>, usize, usize) {
|
||||
ChooseIndicesForTimeBinEvents::choose_unweight(beg, end, &self.tss)
|
||||
@@ -1431,30 +1418,6 @@ mod test_serde_opt {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn overlap_info_00() {
|
||||
let mut ev1 = EventsDim0::empty();
|
||||
ev1.push(MS * 1200, 3, 1.2f32);
|
||||
ev1.push(MS * 3200, 3, 3.2f32);
|
||||
let range = SeriesRange::TimeRange(NanoRange {
|
||||
beg: MS * 1000,
|
||||
end: MS * 2000,
|
||||
});
|
||||
assert_eq!(ev1.ends_after(&range), true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn overlap_info_01() {
|
||||
let mut ev1 = EventsDim0::empty();
|
||||
ev1.push(MS * 1200, 3, 1.2f32);
|
||||
ev1.push(MS * 1400, 3, 3.2f32);
|
||||
let range = SeriesRange::TimeRange(NanoRange {
|
||||
beg: MS * 1000,
|
||||
end: MS * 2000,
|
||||
});
|
||||
assert_eq!(ev1.ends_after(&range), false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn binner_00() {
|
||||
let mut ev1 = EventsDim0::empty();
|
||||
@@ -1553,7 +1516,7 @@ fn bin_binned_02() {
|
||||
|
||||
#[test]
|
||||
fn events_timebin_ingest_continuous_00() {
|
||||
let binrange = BinnedRangeEnum::Time(BinnedRange {
|
||||
let binrange = BinnedRangeEnum::Time(netpod::BinnedRange {
|
||||
bin_len: TsNano::from_ns(SEC * 2),
|
||||
bin_off: 9,
|
||||
bin_cnt: 20,
|
||||
@@ -1573,5 +1536,10 @@ fn events_timebin_ingest_continuous_00() {
|
||||
let mut exp = BinsDim0::empty();
|
||||
// exp.push(SEC * 18, SEC * 20, 0, 0, 0, 0., None);
|
||||
exp.push(SEC * 20, SEC * 22, 1, 20, 20, 20., 20);
|
||||
assert!(f32_iter_cmp_near(got.avgs.clone(), exp.avgs.clone(), 0.0001, 0.0001));
|
||||
assert!(items_0::test::f32_iter_cmp_near(
|
||||
got.avgs.clone(),
|
||||
exp.avgs.clone(),
|
||||
0.0001,
|
||||
0.0001
|
||||
));
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@ use items_0::collect_s::ToJsonBytes;
|
||||
use items_0::collect_s::ToJsonResult;
|
||||
use items_0::container::ByteEstimate;
|
||||
use items_0::isodate::IsoDateTime;
|
||||
use items_0::overlap::RangeOverlapInfo;
|
||||
use items_0::scalar_ops::ScalarOps;
|
||||
use items_0::timebin::TimeBinnable;
|
||||
use items_0::timebin::TimeBinnableTy;
|
||||
@@ -284,20 +283,6 @@ impl EventsNonObj for EventsDim0Enum {
|
||||
}
|
||||
}
|
||||
|
||||
impl RangeOverlapInfo for EventsDim0Enum {
|
||||
fn ends_before(&self, range: &SeriesRange) -> bool {
|
||||
todo!()
|
||||
}
|
||||
|
||||
fn ends_after(&self, range: &SeriesRange) -> bool {
|
||||
todo!()
|
||||
}
|
||||
|
||||
fn starts_after(&self, range: &SeriesRange) -> bool {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
|
||||
// NOTE just a dummy because currently we don't use this for time binning
|
||||
#[derive(Debug)]
|
||||
pub struct EventsDim0EnumTimeBinner;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
use crate::binsdim0::BinsDim0;
|
||||
use crate::eventsxbindim0::EventsXbinDim0;
|
||||
use crate::IsoDateTime;
|
||||
use crate::RangeOverlapInfo;
|
||||
use crate::TimeBinnableType;
|
||||
use crate::TimeBinnableTypeAggregator;
|
||||
use err::Error;
|
||||
@@ -187,8 +186,6 @@ impl<STY: ScalarOps> HasTimestampDeque for EventsDim1<STY> {
|
||||
}
|
||||
}
|
||||
|
||||
items_0::impl_range_overlap_info_events!(EventsDim1);
|
||||
|
||||
impl<STY> TimeBinnableType for EventsDim1<STY>
|
||||
where
|
||||
STY: ScalarOps,
|
||||
@@ -196,7 +193,7 @@ where
|
||||
type Output = BinsDim0<STY>;
|
||||
type Aggregator = EventsDim1Aggregator<STY>;
|
||||
|
||||
fn aggregator(range: SeriesRange, x_bin_count: usize, do_time_weight: bool) -> Self::Aggregator {
|
||||
fn aggregator(_range: SeriesRange, _x_bin_count: usize, _do_time_weight: bool) -> Self::Aggregator {
|
||||
panic!("TODO remove")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
use crate::binsxbindim0::BinsXbinDim0;
|
||||
use crate::IsoDateTime;
|
||||
use crate::RangeOverlapInfo;
|
||||
use crate::TimeBinnableType;
|
||||
use crate::TimeBinnableTypeAggregator;
|
||||
use err::Error;
|
||||
@@ -8,7 +7,6 @@ use items_0::collect_s::CollectableDyn;
|
||||
use items_0::collect_s::CollectableType;
|
||||
use items_0::collect_s::CollectedDyn;
|
||||
use items_0::collect_s::CollectorTy;
|
||||
use items_0::collect_s::ToJsonBytes;
|
||||
use items_0::collect_s::ToJsonResult;
|
||||
use items_0::container::ByteEstimate;
|
||||
use items_0::overlap::HasTimestampDeque;
|
||||
@@ -187,8 +185,6 @@ impl<STY: ScalarOps> HasTimestampDeque for EventsXbinDim0<STY> {
|
||||
}
|
||||
}
|
||||
|
||||
items_0::impl_range_overlap_info_events!(EventsXbinDim0);
|
||||
|
||||
impl<STY: ScalarOps> EventsNonObj for EventsXbinDim0<STY> {
|
||||
fn into_tss_pulses(self: Box<Self>) -> (VecDeque<u64>, VecDeque<u64>) {
|
||||
info!(
|
||||
@@ -455,70 +451,7 @@ impl<STY: ScalarOps> TimeBinner for EventsXbinDim0TimeBinner<STY> {
|
||||
}
|
||||
|
||||
fn ingest(&mut self, item: &mut dyn TimeBinnable) {
|
||||
trace2!(
|
||||
"TimeBinner for {} ingest agg.range {:?} item {:?}",
|
||||
Self::type_name(),
|
||||
self.agg.range(),
|
||||
item
|
||||
);
|
||||
if item.len() == 0 {
|
||||
// Return already here, RangeOverlapInfo would not give much sense.
|
||||
return;
|
||||
}
|
||||
// TODO optimize by remembering at which event array index we have arrived.
|
||||
// That needs modified interfaces which can take and yield the start and latest index.
|
||||
loop {
|
||||
while item.starts_after(self.agg.range()) {
|
||||
trace!(
|
||||
"{} IGNORE ITEM AND CYCLE BECAUSE item.starts_after",
|
||||
Self::type_name()
|
||||
);
|
||||
self.cycle();
|
||||
if self.rng.is_none() {
|
||||
warn!("{} no more bin in edges B", Self::type_name());
|
||||
return;
|
||||
}
|
||||
}
|
||||
if item.ends_before(self.agg.range()) {
|
||||
trace!(
|
||||
"{} IGNORE ITEM BECAUSE ends_before {:?} {:?}",
|
||||
Self::type_name(),
|
||||
self.agg.range(),
|
||||
item
|
||||
);
|
||||
return;
|
||||
} else {
|
||||
if self.rng.is_none() {
|
||||
trace!("{} no more bin in edges D", Self::type_name());
|
||||
return;
|
||||
} else {
|
||||
if let Some(item) = item
|
||||
.as_any_ref()
|
||||
// TODO make statically sure that we attempt to cast to the correct type here:
|
||||
.downcast_ref::<<EventsXbinDim0Aggregator<STY> as TimeBinnableTypeAggregator>::Input>()
|
||||
{
|
||||
// TODO collect statistics associated with this request:
|
||||
trace_ingest!("{} FEED THE ITEM...", Self::type_name());
|
||||
self.agg.ingest(item);
|
||||
if item.ends_after(self.agg.range()) {
|
||||
trace_ingest!("{} FED ITEM, ENDS AFTER.", Self::type_name());
|
||||
self.cycle();
|
||||
if self.rng.is_none() {
|
||||
warn!("{} no more bin in edges C", Self::type_name());
|
||||
return;
|
||||
} else {
|
||||
trace_ingest!("{} FED ITEM, CYCLED, CONTINUE.", Self::type_name());
|
||||
}
|
||||
} else {
|
||||
trace_ingest!("{} FED ITEM.", Self::type_name());
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
error!("{}::ingest unexpected item type", Self::type_name());
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
panic!("TODO remove TimeBinner for EventsXbinDim0TimeBinner ingest")
|
||||
}
|
||||
|
||||
fn push_in_progress(&mut self, push_empty: bool) {
|
||||
|
||||
@@ -24,7 +24,6 @@ pub mod transform;
|
||||
use channelevents::ChannelEvents;
|
||||
use futures_util::Stream;
|
||||
use items_0::isodate::IsoDateTime;
|
||||
use items_0::overlap::RangeOverlapInfo;
|
||||
use items_0::streamitem::Sitemty;
|
||||
use items_0::transform::EventTransform;
|
||||
use items_0::Empty;
|
||||
@@ -175,7 +174,7 @@ impl Mergeable for Box<dyn Events> {
|
||||
}
|
||||
|
||||
// TODO rename to `Typed`
|
||||
pub trait TimeBinnableType: Send + Unpin + RangeOverlapInfo + Empty {
|
||||
pub trait TimeBinnableType: Send + Unpin + Empty {
|
||||
type Output: TimeBinnableType;
|
||||
type Aggregator: TimeBinnableTypeAggregator<Input = Self, Output = Self::Output> + Send + Unpin;
|
||||
fn aggregator(range: SeriesRange, bin_count: usize, do_time_weight: bool) -> Self::Aggregator;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
use items_0::overlap::RangeOverlapInfo;
|
||||
use items_0::timebin::TimeBinnable;
|
||||
use items_0::AppendEmptyBin;
|
||||
use items_0::Empty;
|
||||
@@ -23,7 +22,7 @@ macro_rules! trace_ingest_event { ($($arg:tt)*) => ( if false { trace!($($arg)*)
|
||||
macro_rules! trace_ingest_detail { ($($arg:tt)*) => ( if true { trace!($($arg)*); }) }
|
||||
|
||||
pub trait TimeBinnerCommonV0Trait {
|
||||
type Input: RangeOverlapInfo + 'static;
|
||||
type Input: 'static;
|
||||
type Output: WithLen + Empty + AppendEmptyBin + HasNonemptyFirstBin + 'static;
|
||||
fn type_name() -> &'static str;
|
||||
fn common_bins_ready_count(&self) -> usize;
|
||||
@@ -45,89 +44,7 @@ impl TimeBinnerCommonV0Func {
|
||||
where
|
||||
B: TimeBinnerCommonV0Trait,
|
||||
{
|
||||
let self_name = B::type_name();
|
||||
trace_ingest_item!(
|
||||
"TimeBinner for {} ingest common_range_current {:?} item {:?}",
|
||||
self_name,
|
||||
binner.common_range_current(),
|
||||
item
|
||||
);
|
||||
if item.len() == 0 {
|
||||
// Return already here, RangeOverlapInfo would not give much sense.
|
||||
return;
|
||||
}
|
||||
// TODO optimize by remembering at which event array index we have arrived.
|
||||
// That needs modified interfaces which can take and yield the start and latest index.
|
||||
// Or consume the input data.
|
||||
if B::common_has_lst(binner) == false {
|
||||
if let Some(item) = item
|
||||
.as_any_mut()
|
||||
// TODO make statically sure that we attempt to cast to the correct type here:
|
||||
.downcast_mut::<B::Input>()
|
||||
{
|
||||
B::common_feed_lst(binner, item);
|
||||
} else {
|
||||
error!(
|
||||
"{self_name}::ingest unexpected item type {} expected {}",
|
||||
item.type_name(),
|
||||
any::type_name::<B::Input>()
|
||||
);
|
||||
return;
|
||||
}
|
||||
}
|
||||
loop {
|
||||
while item.starts_after(B::common_range_current(binner)) {
|
||||
trace_ingest_item!("{self_name} ignore item and cycle starts_after");
|
||||
TimeBinnerCommonV0Func::cycle(binner);
|
||||
if !B::common_has_more_range(binner) {
|
||||
debug!("{self_name} no more bin in edges after starts_after");
|
||||
return;
|
||||
}
|
||||
}
|
||||
if item.ends_before(B::common_range_current(binner)) {
|
||||
trace_ingest_item!("{self_name} ignore item ends_before");
|
||||
return;
|
||||
}
|
||||
{
|
||||
if !B::common_has_more_range(binner) {
|
||||
trace_ingest_item!("{self_name} no more bin in edges");
|
||||
return;
|
||||
} else {
|
||||
if let Some(item) = item
|
||||
.as_any_mut()
|
||||
// TODO make statically sure that we attempt to cast to the correct type here:
|
||||
.downcast_mut::<B::Input>()
|
||||
{
|
||||
// TODO collect statistics associated with this request:
|
||||
trace_ingest_item!("{self_name} FEED THE ITEM...");
|
||||
TimeBinnerCommonV0Func::agg_ingest(binner, item);
|
||||
if item.ends_after(B::common_range_current(binner)) {
|
||||
trace_ingest_item!(
|
||||
"{self_name} FED ITEM, ENDS AFTER agg-range {:?}",
|
||||
B::common_range_current(binner)
|
||||
);
|
||||
TimeBinnerCommonV0Func::cycle(binner);
|
||||
if !B::common_has_more_range(binner) {
|
||||
warn!("{self_name} no more bin in edges after ingest and cycle");
|
||||
return;
|
||||
} else {
|
||||
trace_ingest_item!("{self_name} item fed, cycled, continue");
|
||||
}
|
||||
} else {
|
||||
trace_ingest_item!("{self_name} item fed, break");
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
error!(
|
||||
"{self_name}::ingest unexpected item type {} expected {}",
|
||||
item.type_name(),
|
||||
any::type_name::<B::Input>()
|
||||
);
|
||||
return;
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
panic!("TimeBinnerCommonV0Func::ingest")
|
||||
}
|
||||
|
||||
fn agg_ingest<B>(binner: &mut B, item: &mut <B as TimeBinnerCommonV0Trait>::Input)
|
||||
@@ -243,7 +160,7 @@ impl ChooseIndicesForTimeBinEvents {
|
||||
}
|
||||
|
||||
pub trait TimeAggregatorCommonV0Trait {
|
||||
type Input: WithLen + RangeOverlapInfo + ChooseIndicesForTimeBin + 'static;
|
||||
type Input: WithLen + ChooseIndicesForTimeBin + 'static;
|
||||
type Output: WithLen + Empty + AppendEmptyBin + HasNonemptyFirstBin + 'static;
|
||||
fn type_name() -> &'static str;
|
||||
fn common_range_current(&self) -> &SeriesRange;
|
||||
|
||||
Reference in New Issue
Block a user