Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo in recently merged PR #1253

Merged
merged 2 commits into from
Apr 5, 2023
Merged

Fix typo in recently merged PR #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc61235
Fix typo
Mv77 Apr 4, 2023
2c6e26a
Update CHANGELOG.md
Mv77 Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Documentation/CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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