From 5c81c7b5dadd1469c67f145e98397ab7631dfbe4 Mon Sep 17 00:00:00 2001 From: Alan Lujan Date: Thu, 7 Nov 2024 15:03:20 -0500 Subject: [PATCH] fix tests --- HARK/distributions/continuous.py | 3 ++- HARK/distributions/discrete.py | 4 +++- HARK/distributions/multivariate.py | 3 ++- HARK/distributions/utils.py | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/HARK/distributions/continuous.py b/HARK/distributions/continuous.py index e5db04547..1eb96524f 100644 --- a/HARK/distributions/continuous.py +++ b/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 diff --git a/HARK/distributions/discrete.py b/HARK/distributions/discrete.py index f1335361f..79dfda2cc 100644 --- a/HARK/distributions/discrete.py +++ b/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 diff --git a/HARK/distributions/multivariate.py b/HARK/distributions/multivariate.py index b4cdd5091..e31377785 100644 --- a/HARK/distributions/multivariate.py +++ b/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 diff --git a/HARK/distributions/utils.py b/HARK/distributions/utils.py index 2d7186399..c522c7867 100644 --- a/HARK/distributions/utils.py +++ b/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