Move Subgrid implementations into subgrid module

Author: cschwan

pineappl/src/empty_subgrid.rs

@@ -4,10 +4,9 @@ use super::boc::{Channel, Kinematics, Order};
 use super::convolutions::ConvType;
 use super::error::{Error, Result};
 use super::grid::Grid;
-use super::import_subgrid::ImportSubgridV1;
 use super::packed_array::PackedArray;
 use super::pids::PidBasis;
-use super::subgrid::{self, Subgrid, SubgridEnum};
+use super::subgrid::{self, ImportSubgridV1, Subgrid, SubgridEnum};
 use float_cmp::approx_eq;
 use itertools::izip;
 use itertools::Itertools;

pineappl/src/evolution.rs

@@ -2,11 +2,10 @@
 
 use super::boc::{Channel, Kinematics, Order};
 use super::convolutions::ConvolutionCache;
-use super::empty_subgrid::EmptySubgridV1;
 use super::error::{Error, Result};
 use super::grid::Grid;
 use super::pids::OptRules;
-use super::subgrid::{self, Subgrid};
+use super::subgrid::{self, EmptySubgridV1, Subgrid};
 use ndarray::{s, ArrayD};
 use std::collections::BTreeMap;
 use std::fmt::{self, Display, Formatter};

pineappl/src/fk_table.rs

@@ -2,16 +2,15 @@
 
 use super::boc::{BinsWithFillLimits, Channel, Kinematics, Order, ScaleFuncForm, Scales};
 use super::convolutions::{Conv, ConvType, ConvolutionCache};
-use super::empty_subgrid::EmptySubgridV1;
 use super::error::{Error, Result};
 use super::evolution::{self, AlphasTable, EvolveInfo, OperatorSliceInfo};
 use super::fk_table::FkTable;
-use super::import_subgrid::ImportSubgridV1;
-use super::interp_subgrid::InterpSubgridV1;
 use super::interpolation::Interp;
 use super::pids::PidBasis;
 use super::reference::Reference;
-use super::subgrid::{self, Subgrid, SubgridEnum};
+use super::subgrid::{
+    self, EmptySubgridV1, ImportSubgridV1, InterpSubgridV1, Subgrid, SubgridEnum,
+};
 use super::v0;
 use bitflags::bitflags;
 use float_cmp::{approx_eq, assert_approx_eq};