WIP refactor

items_2/src/binsdim0.rs

@@ -19,10 +19,10 @@ use items_0::TimeBinner;
 use items_0::TimeBins;
 use items_0::WithLen;
 use netpod::log::*;
+use netpod::range::evrange::SeriesRange;
 use netpod::timeunits::SEC;
 use netpod::BinnedRangeEnum;
 use netpod::Dim0Kind;
-use netpod::SeriesRange;
 use serde::Deserialize;
 use serde::Serialize;
 use std::any;

items_2/src/binsxbindim0.rs

@@ -22,11 +22,11 @@ use items_0::TimeBinner;
 use items_0::TimeBins;
 use items_0::WithLen;
 use netpod::log::*;
+use netpod::range::evrange::NanoRange;
+use netpod::range::evrange::SeriesRange;
 use netpod::timeunits::SEC;
 use netpod::BinnedRangeEnum;
 use netpod::Dim0Kind;
-use netpod::NanoRange;
-use netpod::SeriesRange;
 use num_traits::Zero;
 use serde::Deserialize;
 use serde::Serialize;

items_2/src/channelevents.rs

@@ -12,10 +12,10 @@ use items_0::AsAnyRef;
 use items_0::MergeError;
 use items_0::WithLen;
 use netpod::log::*;
+use netpod::range::evrange::NanoRange;
+use netpod::range::evrange::SeriesRange;
 use netpod::BinnedRange;
 use netpod::BinnedRangeEnum;
-use netpod::NanoRange;
-use netpod::SeriesRange;
 use serde::Deserialize;
 use serde::Serialize;
 use std::any::Any;

items_2/src/eventsdim0.rs

@@ -22,11 +22,11 @@ use items_0::TimeBinnable;
 use items_0::TimeBinner;
 use items_0::WithLen;
 use netpod::log::*;
+use netpod::range::evrange::NanoRange;
+use netpod::range::evrange::SeriesRange;
 use netpod::timeunits::MS;
 use netpod::timeunits::SEC;
 use netpod::BinnedRangeEnum;
-use netpod::NanoRange;
-use netpod::SeriesRange;
 use serde::Deserialize;
 use serde::Serialize;
 use std::any;

items_2/src/eventsdim1.rs

@@ -22,9 +22,9 @@ use items_0::TimeBinnable;
 use items_0::TimeBinner;
 use items_0::WithLen;
 use netpod::log::*;
+use netpod::range::evrange::SeriesRange;
 use netpod::timeunits::SEC;
 use netpod::BinnedRangeEnum;
-use netpod::SeriesRange;
 use serde::Deserialize;
 use serde::Serialize;
 use std::any;

items_2/src/eventsxbindim0.rs

@@ -15,8 +15,8 @@ use items_0::AsAnyRef;
 use items_0::Empty;
 use items_0::WithLen;
 use netpod::log::*;
+use netpod::range::evrange::SeriesRange;
 use netpod::BinnedRangeEnum;
-use netpod::SeriesRange;
 use serde::Deserialize;
 use serde::Serialize;
 use std::any;

items_2/src/items_2.rs

@@ -29,8 +29,9 @@ use items_0::Events;
 use items_0::MergeError;
 use items_0::RangeOverlapInfo;
 use merger::Mergeable;
+use netpod::range::evrange::NanoRange;
+use netpod::range::evrange::SeriesRange;
 use netpod::timeunits::*;
-use netpod::SeriesRange;
 use serde::Deserialize;
 use serde::Serialize;
 use serde::Serializer;

items_2/src/test.rs

@@ -28,11 +28,12 @@ use items_0::Appendable;
 use items_0::Empty;
 use items_0::WithLen;
 use netpod::log::*;
+use netpod::range::evrange::NanoRange;
+use netpod::range::evrange::SeriesRange;
 use netpod::timeunits::*;
 use netpod::AggKind;
 use netpod::BinnedRange;
 use netpod::BinnedRangeEnum;
-use netpod::NanoRange;
 use netpod::ScalarType;
 use netpod::Shape;
 use std::time::Duration;