Skip to content

Commit

Permalink
Merge pull request #1253 from Mv77/plumbing/idio-Rrisky
Browse files Browse the repository at this point in the history
Fix typo in recently merged PR
  • Loading branch information
Mv77 authored Apr 5, 2023
2 parents a306caf + 2c6e26a commit 80d027d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Documentation/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions HARK/ConsumptionSaving/ConsRiskyAssetModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion HARK/ConsumptionSaving/tests/test_ConsPortfolioModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 80d027d

Please sign in to comment.