Remove AggregatableTdim and AggregatorTdim

This commit is contained in:
Dominik Werder
2021-06-09 20:16:32 +02:00
parent ba7ea80093
commit 131283fab9
6 changed files with 7 additions and 443 deletions

View File

@@ -1,5 +1,4 @@
use super::agg::IntoDim1F32Stream;
use crate::agg::binnedt::IntoBinnedT;
use crate::agg::binnedx::IntoBinnedXBins1;
use crate::binned::BinnedStreamKindScalar;
use crate::eventblobs::EventBlobsComplete;
@@ -68,13 +67,9 @@ async fn agg_x_dim_0_inner() {
);
let fut1 = IntoDim1F32Stream::into_dim_1_f32_stream(fut1);
let fut1 = IntoBinnedXBins1::<_, BinnedStreamKindScalar>::into_binned_x_bins_1(fut1);
let fut1 = IntoBinnedT::<BinnedStreamKindScalar, _>::into_binned_t(
fut1,
BinnedRange::covering_range(range, bin_count).unwrap().unwrap(),
);
let fut1 = fut1
//.into_binned_t(BinnedRange::covering_range(range, bin_count).unwrap().unwrap())
.for_each(|_k| ready(()));
// TODO add the t binning and expectation.
let fut1 = fut1.for_each(|_k| ready(()));
fut1.await;
}
@@ -138,10 +133,8 @@ async fn agg_x_dim_1_inner() {
//info!("after X binning {:?}", k.as_ref().unwrap());
k
});
let fut1 = crate::agg::binnedt::IntoBinnedT::<BinnedStreamKindScalar, _>::into_binned_t(
fut1,
BinnedRange::covering_range(range, bin_count).unwrap().unwrap(),
);
// TODO add T-binning and expectation.
let fut1 = fut1
.map(|k| {
info!("after T binning {:?}", k.as_ref().unwrap());