fix tests

HARK/distributions/continuous.py

@@ -6,7 +6,8 @@
 from scipy.stats import rv_continuous
 from scipy.stats._distn_infrastructure import rv_continuous_frozen
 
-from HARK.distributions.base import DiscreteDistribution, Distribution
+from HARK.distributions.base import Distribution
+from HARK.distributions.discrete import DiscreteDistribution
 
 # CONTINUOUS DISTRIBUTIONS
 

HARK/distributions/discrete.py

@@ -1,6 +1,8 @@
-from typing import Any
+from typing import Any, Callable, Dict, List, Optional, Union
 
+from copy import deepcopy
 import numpy as np
+import xarray as xr
 from scipy import stats
 from scipy.stats import rv_discrete
 from scipy.stats._distn_infrastructure import rv_discrete_frozen

HARK/distributions/multivariate.py

@@ -6,8 +6,9 @@
 from scipy import special
 from scipy.stats._multivariate import multi_rv_frozen, multivariate_normal_frozen
 
-from HARK.distributions.base import DiscreteDistribution, Distribution
+from HARK.distributions.base import Distribution
 from HARK.distributions.continuous import Lognormal, Normal
+from HARK.distributions.discrete import DiscreteDistribution
 
 # MULTIVARIATE DISTRIBUTIONS
 

HARK/distributions/utils.py

@@ -4,10 +4,10 @@
 import numpy as np
 from scipy import stats
 
-from HARK.distributions.base import (
+from HARK.distributions.base import TimeVaryingDiscreteDistribution
+from HARK.distributions.discrete import (
     DiscreteDistribution,
     DiscreteDistributionLabeled,
-    TimeVaryingDiscreteDistribution,
 )
 from HARK.distributions.continuous import Normal