Merge branch 'econ-ark:master' into estimagic

econ-ark · Nov 15, 2024 · 58c2df2 · 58c2df2
2 parents fefc1e8 + 80eed31
commit 58c2df2
Show file tree

Hide file tree

Showing 11 changed files with 380 additions and 4,209 deletions.
diff --git a/Documentation/reference/ConsumptionSaving/ConsPortfolioFrameModel.rst b/Documentation/reference/ConsumptionSaving/ConsPortfolioFrameModel.rst
diff --git a/Documentation/reference/index.rst b/Documentation/reference/index.rst
@@ -10,7 +10,6 @@ API Reference
    tools/distribution
    tools/econforgeinterp
    tools/estimation
-   tools/frame
    tools/helpers
    tools/interpolation
    tools/incomeprocess
@@ -34,7 +33,6 @@ API Reference
    ConsumptionSaving/ConsLaborModel
    ConsumptionSaving/ConsMarkovModel
    ConsumptionSaving/ConsMedModel
-   ConsumptionSaving/ConsPortfolioFrameModel
    ConsumptionSaving/ConsPortfolioModel
    ConsumptionSaving/ConsPrefShochModel
    ConsumptionSaving/ConsRepAgentModel

diff --git a/Documentation/reference/tools/frame.rst b/Documentation/reference/tools/frame.rst
diff --git a/HARK/ConsumptionSaving/ConsPortfolioFrameModel.py b/HARK/ConsumptionSaving/ConsPortfolioFrameModel.py