From fc61235f9d7cd40e587b87bd16b0e22a671d0fab Mon Sep 17 00:00:00 2001 From: Mateo VG Date: Tue, 4 Apr 2023 19:19:58 -0400 Subject: [PATCH 1/2] Fix typo --- HARK/ConsumptionSaving/ConsRiskyAssetModel.py | 8 ++++---- HARK/ConsumptionSaving/tests/test_ConsPortfolioModel.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/HARK/ConsumptionSaving/ConsRiskyAssetModel.py b/HARK/ConsumptionSaving/ConsRiskyAssetModel.py index 6bcf1f0d2..dfdf5582a 100644 --- a/HARK/ConsumptionSaving/ConsRiskyAssetModel.py +++ b/HARK/ConsumptionSaving/ConsRiskyAssetModel.py @@ -63,8 +63,8 @@ def __init__(self, verbose=False, quiet=False, **kwds): # Boolean determines whether, when simulating a given time period, # all agents will draw the same risky return factor (true by default) - if not hasattr(self, "sim_common_Rriksy"): - self.sim_common_Rriksy = True + if not hasattr(self, "sim_common_Rrisky"): + self.sim_common_Rrisky = True # Initialize a basic consumer type IndShockConsumerType.__init__(self, verbose=verbose, quiet=quiet, **kwds) @@ -325,7 +325,7 @@ def get_Risky(self): RiskyStd = self.RiskyStd # Draw either a common economy-wide return, or one for each agent - if self.sim_common_Rriksy: + if self.sim_common_Rrisky: self.shocks["Risky"] = Lognormal.from_mean_std( RiskyAvg, RiskyStd, seed=self.RNG.integers(0, 2**31 - 1) ).draw(1) @@ -1318,7 +1318,7 @@ def v_next(shocks, a_nrm): "AdjustPrb": 1.0, # When simulating the model, should all agents get the same risky return in # a given period? - "sim_common_Rriksy": True, + "sim_common_Rrisky": True, } # Make a dictionary to specify a risky asset consumer type diff --git a/HARK/ConsumptionSaving/tests/test_ConsPortfolioModel.py b/HARK/ConsumptionSaving/tests/test_ConsPortfolioModel.py index 331d09bc9..3cc8bb80e 100644 --- a/HARK/ConsumptionSaving/tests/test_ConsPortfolioModel.py +++ b/HARK/ConsumptionSaving/tests/test_ConsPortfolioModel.py @@ -245,7 +245,7 @@ def test_simulation(self): ) ) # Agent specific simulation - self.pcct.sim_common_Rriksy = False + self.pcct.sim_common_Rrisky = False self.pcct.initialize_sim() self.pcct.simulate() # Assety that all columns of Risky are not the same From 2c6e26a2b6d1a98bb8a6a2730ac620622c800d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Vel=C3=A1squez-Giraldo?= Date: Tue, 4 Apr 2023 19:27:40 -0400 Subject: [PATCH 2/2] Update CHANGELOG.md --- Documentation/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/CHANGELOG.md b/Documentation/CHANGELOG.md index bc380b4da..65ccd00ee 100644 --- a/Documentation/CHANGELOG.md +++ b/Documentation/CHANGELOG.md @@ -15,7 +15,7 @@ Release Date: TBD ### Major Changes ### Minor Changes -- Adds option `sim_common_Rriksy` to control whether risky-asset models draw common or idiosyncratic returns in simulation. [#1250](https://github.com/econ-ark/HARK/pull/1250) +- Adds option `sim_common_Rrisky` to control whether risky-asset models draw common or idiosyncratic returns in simulation. [#1250](https://github.com/econ-ark/HARK/pull/1250),[#1253](https://github.com/econ-ark/HARK/pull/1253) ### 0.13.0