Merge branch 'master' into i1346

sbenthall · Sep 25, 2023 · 4fcc41e · 4fcc41e
2 parents 4890fd5 + da30b24
commit 4fcc41e
Show file tree

Hide file tree

Showing 14 changed files with 1,359 additions and 469 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -38,3 +38,5 @@ jobs:
           pytest --cov=./ --cov-report=xml
       - name: upload coverage report
         uses: codecov/codecov-action@v3
+        with:
+          fail_ci_if_error: false
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,29 +2,28 @@ exclude: Documentation/example_notebooks/
 
 repos:
   - repo: https://github.com/mwouts/jupytext
-    rev: v1.14.5
+    rev: v1.15.0
     hooks:
       - id: jupytext
-        args:
-          [--sync, --set-formats, "ipynb,py:percent", --pipe, black, --execute]
+        args: [--sync, --set-formats, "ipynb", --pipe, black, --execute]
         additional_dependencies: [jupytext, black, nbconvert]
         files: ^examples/.*\.ipynb$
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
         exclude: ^examples/
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.4.0
+    rev: v3.10.1
     hooks:
       - id: pyupgrade
         args: ["--py38-plus"]
         exclude: ^examples/
 
   - repo: https://github.com/asottile/blacken-docs
-    rev: 1.13.0
+    rev: 1.15.0
     hooks:
       - id: blacken-docs
         exclude: ^examples/
@@ -38,7 +37,7 @@ repos:
         exclude: ^examples/
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.9-for-vscode
+    rev: v3.0.1
     hooks:
       - id: prettier
         exclude: ^examples/

diff --git a/Documentation/CHANGELOG.md b/Documentation/CHANGELOG.md
@@ -15,6 +15,7 @@ Release Date: TBD
 ### Major Changes
 
 - Adds `HARK.core.AgentPopulation` class to represent a population of agents with ex-ante heterogeneous parametrizations as distributions. [#1237](https://github.com/econ-ark/HARK/pull/1237)
+- Adds `HARK.core.Parameters` class to represent a collection of time varying and time invariant parameters in a model. [#1240](https://github.com/econ-ark/HARK/pull/1240)
 
 ### Minor Changes
 
@@ -23,6 +24,8 @@ Release Date: TBD
 - Fixes bug in the metric that compares dictionaries with the same keys. [#1260](https://github.com/econ-ark/HARK/pull/1260)
 - Fixes bug in the calc_jacobian method. [#1342](https://github.com/econ-ark/HARK/pull/1342)
 - Fixes bug that prevented risky-asset consumer types from working with time-varying interest rates `Rfree`. [1343](https://github.com/econ-ark/HARK/pull/1343)
+- Overhauls and expands condition checking for the ConsIndShock model [#1294](https://github.com/econ-ark/HARK/pull/1294). Condition values and a description of their interpretation is stored in the bilt dictionary of IndShockConsumerType.
+
 ### 0.13.0
 
 Release Date: February, 16, 2023

diff --git a/HARK/ConsumptionSaving/ConsGenIncProcessModel.py b/HARK/ConsumptionSaving/ConsGenIncProcessModel.py
@@ -862,7 +862,7 @@ def solve(self):
 # long run permanent income growth doesn't work yet
 init_explicit_perm_inc["PermGroFac"] = [1.0]
 init_explicit_perm_inc["aXtraMax"] = 30
-init_explicit_perm_inc["aXtraExtra"] = [0.005, 0.01]
+init_explicit_perm_inc["aXtraExtra"] = np.array([0.005, 0.01])
 
 
 class GenIncProcessConsumerType(IndShockConsumerType):