diff --git a/tests/ConsumptionSaving/__init__.py b/tests/ConsumptionSaving/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/ConsumptionSavings/test_ConsAggShockModel.py b/tests/ConsumptionSaving/test_ConsAggShockModel.py similarity index 99% rename from tests/ConsumptionSavings/test_ConsAggShockModel.py rename to tests/ConsumptionSaving/test_ConsAggShockModel.py index 8db13fc54..bb9a58a03 100644 --- a/tests/ConsumptionSavings/test_ConsAggShockModel.py +++ b/tests/ConsumptionSaving/test_ConsAggShockModel.py @@ -12,7 +12,7 @@ KrusellSmithType, ) from HARK.distributions import Uniform -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION class testAggShockConsumerType(unittest.TestCase): diff --git a/tests/ConsumptionSavings/test_ConsBequestModel.py b/tests/ConsumptionSaving/test_ConsBequestModel.py similarity index 98% rename from tests/ConsumptionSavings/test_ConsBequestModel.py rename to tests/ConsumptionSaving/test_ConsBequestModel.py index 958dcc43f..992078a9f 100644 --- a/tests/ConsumptionSavings/test_ConsBequestModel.py +++ b/tests/ConsumptionSaving/test_ConsBequestModel.py @@ -1,5 +1,5 @@ import unittest -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION from HARK.ConsumptionSaving.ConsBequestModel import ( BequestWarmGlowConsumerType, BequestWarmGlowPortfolioType, diff --git a/tests/ConsumptionSavings/test_ConsGenIncProcessModel.py b/tests/ConsumptionSaving/test_ConsGenIncProcessModel.py similarity index 99% rename from tests/ConsumptionSavings/test_ConsGenIncProcessModel.py rename to tests/ConsumptionSaving/test_ConsGenIncProcessModel.py index b740c1ff8..2e8b4e5b1 100644 --- a/tests/ConsumptionSavings/test_ConsGenIncProcessModel.py +++ b/tests/ConsumptionSaving/test_ConsGenIncProcessModel.py @@ -7,7 +7,7 @@ IndShockExplicitPermIncConsumerType, PersistentShockConsumerType, ) -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION GenIncDictionary = { "CRRA": 2.0, # Coefficient of relative risk aversion diff --git a/tests/ConsumptionSavings/test_ConsLabeledModel.py b/tests/ConsumptionSaving/test_ConsLabeledModel.py similarity index 98% rename from tests/ConsumptionSavings/test_ConsLabeledModel.py rename to tests/ConsumptionSaving/test_ConsLabeledModel.py index 0ebafda37..2557b85a0 100644 --- a/tests/ConsumptionSavings/test_ConsLabeledModel.py +++ b/tests/ConsumptionSaving/test_ConsLabeledModel.py @@ -6,7 +6,7 @@ PerfForesightLabeledType, PortfolioLabeledType, ) -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION class test_PerfForesightLabeledType(unittest.TestCase): diff --git a/tests/ConsumptionSavings/test_ConsLaborModel.py b/tests/ConsumptionSaving/test_ConsLaborModel.py similarity index 100% rename from tests/ConsumptionSavings/test_ConsLaborModel.py rename to tests/ConsumptionSaving/test_ConsLaborModel.py diff --git a/tests/ConsumptionSavings/test_ConsMarkovModel.py b/tests/ConsumptionSaving/test_ConsMarkovModel.py similarity index 100% rename from tests/ConsumptionSavings/test_ConsMarkovModel.py rename to tests/ConsumptionSaving/test_ConsMarkovModel.py diff --git a/tests/ConsumptionSavings/test_ConsMedModel.py b/tests/ConsumptionSaving/test_ConsMedModel.py similarity index 96% rename from tests/ConsumptionSavings/test_ConsMedModel.py rename to tests/ConsumptionSaving/test_ConsMedModel.py index 64311c847..2dfd7e805 100644 --- a/tests/ConsumptionSavings/test_ConsMedModel.py +++ b/tests/ConsumptionSaving/test_ConsMedModel.py @@ -1,5 +1,5 @@ import unittest -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION from HARK.ConsumptionSaving.ConsMedModel import MedShockConsumerType diff --git a/tests/ConsumptionSavings/test_ConsNewKeynesianModel.py b/tests/ConsumptionSaving/test_ConsNewKeynesianModel.py similarity index 98% rename from tests/ConsumptionSavings/test_ConsNewKeynesianModel.py rename to tests/ConsumptionSaving/test_ConsNewKeynesianModel.py index c2b654882..531a196de 100644 --- a/tests/ConsumptionSavings/test_ConsNewKeynesianModel.py +++ b/tests/ConsumptionSaving/test_ConsNewKeynesianModel.py @@ -3,7 +3,7 @@ import numpy as np from HARK.ConsumptionSaving.ConsNewKeynesianModel import NewKeynesianConsumerType -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION # %% Test Transition Matrix Methods diff --git a/tests/ConsumptionSavings/test_ConsPortfolioModel.py b/tests/ConsumptionSaving/test_ConsPortfolioModel.py similarity index 99% rename from tests/ConsumptionSavings/test_ConsPortfolioModel.py rename to tests/ConsumptionSaving/test_ConsPortfolioModel.py index 37de70f4f..8e60200b3 100644 --- a/tests/ConsumptionSavings/test_ConsPortfolioModel.py +++ b/tests/ConsumptionSaving/test_ConsPortfolioModel.py @@ -3,7 +3,7 @@ import numpy as np import HARK.ConsumptionSaving.ConsPortfolioModel as cpm -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION class PortfolioConsumerTypeTestCase(unittest.TestCase): diff --git a/tests/ConsumptionSavings/test_ConsPrefShockModel.py b/tests/ConsumptionSaving/test_ConsPrefShockModel.py similarity index 98% rename from tests/ConsumptionSavings/test_ConsPrefShockModel.py rename to tests/ConsumptionSaving/test_ConsPrefShockModel.py index 045bfa7cf..56842980a 100644 --- a/tests/ConsumptionSavings/test_ConsPrefShockModel.py +++ b/tests/ConsumptionSaving/test_ConsPrefShockModel.py @@ -6,7 +6,7 @@ KinkyPrefConsumerType, PrefShockConsumerType, ) -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION class testPrefShockConsumerType(unittest.TestCase): diff --git a/tests/ConsumptionSavings/test_ConsRepAgentModel.py b/tests/ConsumptionSaving/test_ConsRepAgentModel.py similarity index 97% rename from tests/ConsumptionSavings/test_ConsRepAgentModel.py rename to tests/ConsumptionSaving/test_ConsRepAgentModel.py index 53aa7883a..bf27dcd31 100644 --- a/tests/ConsumptionSavings/test_ConsRepAgentModel.py +++ b/tests/ConsumptionSaving/test_ConsRepAgentModel.py @@ -4,7 +4,7 @@ RepAgentConsumerType, RepAgentMarkovConsumerType, ) -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION class testRepAgentConsumerType(unittest.TestCase): diff --git a/tests/ConsumptionSavings/test_ConsRiskyAssetModel.py b/tests/ConsumptionSaving/test_ConsRiskyAssetModel.py similarity index 96% rename from tests/ConsumptionSavings/test_ConsRiskyAssetModel.py rename to tests/ConsumptionSaving/test_ConsRiskyAssetModel.py index 036b00daf..998a3bd2c 100644 --- a/tests/ConsumptionSavings/test_ConsRiskyAssetModel.py +++ b/tests/ConsumptionSaving/test_ConsRiskyAssetModel.py @@ -1,5 +1,5 @@ import unittest -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION from HARK.ConsumptionSaving.ConsRiskyAssetModel import IndShockRiskyAssetConsumerType diff --git a/tests/ConsumptionSavings/test_ConsRiskyContribModel.py b/tests/ConsumptionSaving/test_ConsRiskyContribModel.py similarity index 99% rename from tests/ConsumptionSavings/test_ConsRiskyContribModel.py rename to tests/ConsumptionSaving/test_ConsRiskyContribModel.py index 33a778232..8fca3dcb2 100644 --- a/tests/ConsumptionSavings/test_ConsRiskyContribModel.py +++ b/tests/ConsumptionSaving/test_ConsRiskyContribModel.py @@ -13,7 +13,7 @@ RiskyContribConsumerType, init_risky_contrib, ) -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION class test_(unittest.TestCase): diff --git a/tests/ConsumptionSavings/test_IndShockConsumerType.py b/tests/ConsumptionSaving/test_IndShockConsumerType.py similarity index 99% rename from tests/ConsumptionSavings/test_IndShockConsumerType.py rename to tests/ConsumptionSaving/test_IndShockConsumerType.py index 7f8e0a421..4c0d91da1 100644 --- a/tests/ConsumptionSavings/test_IndShockConsumerType.py +++ b/tests/ConsumptionSaving/test_IndShockConsumerType.py @@ -8,7 +8,7 @@ init_idiosyncratic_shocks, init_lifecycle, ) -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION class testIndShockConsumerType(unittest.TestCase): diff --git a/tests/ConsumptionSavings/test_IndShockConsumerTypeFast.py b/tests/ConsumptionSaving/test_IndShockConsumerTypeFast.py similarity index 98% rename from tests/ConsumptionSavings/test_IndShockConsumerTypeFast.py rename to tests/ConsumptionSaving/test_IndShockConsumerTypeFast.py index 130cf2177..6fdb55e79 100644 --- a/tests/ConsumptionSavings/test_IndShockConsumerTypeFast.py +++ b/tests/ConsumptionSaving/test_IndShockConsumerTypeFast.py @@ -8,12 +8,12 @@ init_lifecycle, ) from HARK.ConsumptionSaving.ConsIndShockModelFast import IndShockConsumerTypeFast -from HARK.ConsumptionSaving.tests.test_IndShockConsumerType import ( +from tests.ConsumptionSaving.test_IndShockConsumerType import ( CyclicalDict, IdiosyncDict, LifecycleDict, ) -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION class testIndShockConsumerTypeFast(unittest.TestCase): diff --git a/tests/ConsumptionSavings/test_KinkedRconsumerType.py b/tests/ConsumptionSaving/test_KinkedRconsumerType.py similarity index 96% rename from tests/ConsumptionSavings/test_KinkedRconsumerType.py rename to tests/ConsumptionSaving/test_KinkedRconsumerType.py index bde126727..44ada9511 100644 --- a/tests/ConsumptionSavings/test_KinkedRconsumerType.py +++ b/tests/ConsumptionSaving/test_KinkedRconsumerType.py @@ -1,7 +1,7 @@ import unittest from HARK.ConsumptionSaving.ConsIndShockModel import KinkedRconsumerType -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION class testKinkedRConsumerType(unittest.TestCase): diff --git a/tests/ConsumptionSavings/test_PerfForesightConsumerType.py b/tests/ConsumptionSaving/test_PerfForesightConsumerType.py similarity index 99% rename from tests/ConsumptionSavings/test_PerfForesightConsumerType.py rename to tests/ConsumptionSaving/test_PerfForesightConsumerType.py index 2f37ae64c..2ada42bec 100644 --- a/tests/ConsumptionSavings/test_PerfForesightConsumerType.py +++ b/tests/ConsumptionSaving/test_PerfForesightConsumerType.py @@ -3,7 +3,7 @@ import numpy as np from HARK.ConsumptionSaving.ConsIndShockModel import PerfForesightConsumerType -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION class testPerfForesightConsumerType(unittest.TestCase): diff --git a/tests/ConsumptionSavings/test_PerfForesightFastConsumerType.py b/tests/ConsumptionSaving/test_PerfForesightFastConsumerType.py similarity index 92% rename from tests/ConsumptionSavings/test_PerfForesightFastConsumerType.py rename to tests/ConsumptionSaving/test_PerfForesightFastConsumerType.py index 4d249232c..55eafc094 100644 --- a/tests/ConsumptionSavings/test_PerfForesightFastConsumerType.py +++ b/tests/ConsumptionSaving/test_PerfForesightFastConsumerType.py @@ -1,6 +1,6 @@ from HARK.ConsumptionSaving.ConsIndShockModel import PerfForesightConsumerType from HARK.ConsumptionSaving.ConsIndShockModelFast import PerfForesightConsumerTypeFast -from HARK.ConsumptionSaving.tests.test_PerfForesightConsumerType import ( +from tests.ConsumptionSaving.test_PerfForesightConsumerType import ( testPerfForesightConsumerType, ) diff --git a/tests/ConsumptionSavings/test_SmallOpenEconomy.py b/tests/ConsumptionSaving/test_SmallOpenEconomy.py similarity index 100% rename from tests/ConsumptionSavings/test_SmallOpenEconomy.py rename to tests/ConsumptionSaving/test_SmallOpenEconomy.py diff --git a/tests/ConsumptionSavings/test_TractableBufferStockModel.py b/tests/ConsumptionSaving/test_TractableBufferStockModel.py similarity index 100% rename from tests/ConsumptionSavings/test_TractableBufferStockModel.py rename to tests/ConsumptionSaving/test_TractableBufferStockModel.py diff --git a/tests/ConsumptionSavings/test_modelInits.py b/tests/ConsumptionSaving/test_modelInits.py similarity index 100% rename from tests/ConsumptionSavings/test_modelInits.py rename to tests/ConsumptionSaving/test_modelInits.py diff --git a/tests/ConsumptionSavings/test_modelcomparisons.py b/tests/ConsumptionSaving/test_modelcomparisons.py similarity index 100% rename from tests/ConsumptionSavings/test_modelcomparisons.py rename to tests/ConsumptionSaving/test_modelcomparisons.py diff --git a/tests/test_distribution.py b/tests/test_distribution.py index da1500eb1..d514178a8 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -23,7 +23,7 @@ distr_of_function, expected, ) -from HARK.tests import HARK_PRECISION +from tests import HARK_PRECISION class DiscreteDistributionTests(unittest.TestCase):