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.

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

Documentation of model parameters #963

Merged
merged 11 commits into from
Aug 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: |
pip install -e .
python -m ipykernel install --user --name=ogcore-dev
jb build ./docs/book
make build-docs

- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ jobs:
run: |
pip install -e .
python -m ipykernel install --user --name=ogcore-dev
jb build ./docs/book
make build-docs
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ help:
@echo "coverage : generate test coverage report"
@echo "git-sync : synchronize local, origin, and upstream Git repos"
@echo "git-pr N=n : create local pr-n branch containing upstream PR"
@echo "make-docs : build new Jupyter Book documentation files"

.PHONY=clean
clean:
Expand Down Expand Up @@ -65,6 +66,10 @@ git-sync:
git-pr:
@./gitpr $(N)

.PHONY=build-docs
build-docs:
@cd ./docs ; python make_params.py; jb build ./book

pip-package:
pip install wheel
python setup.py sdist bdist_wheel
1 change: 1 addition & 0 deletions docs/book/_toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ parts:
- caption: Appendix
chapters:
- file: content/theory/derivations
- file: content/intro/parameters
- caption: References
chapters:
- file: content/OGCore_references
Expand Down
16 changes: 16 additions & 0 deletions docs/book/content/api/pensions.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.. _pensions:

Pension Functions
=================================================

**pensions.py modules**

ogcore.pensions
------------------------------------------

.. automodule:: ogcore.pensions
:members: replacement_rate_vals, pension_amount, SS_amount, DB_amount,
NDC_amount, PS_amount, deriv_theta, deriv_NDC, deriv_DB, deriv_PS,
delta_point, g_ndc, g_dir, delta_ret, deriv_DB_loop, deriv_PS_loop,
deriv_NDC_loop, delta_ret_loop, PS_1dim_loop, PS_2dim_loop, DB_1dim_loop,
DB_2dim_loop, NDC_1dim_loop, NDC_2dim_loop
Loading
Loading