Skip to content

Commit

Permalink
Updates to documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
williamjameshandley committed Aug 15, 2018
1 parent 48a1368 commit f9b3963
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 23 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
include README.rst
recursive-include fgivenx/test/baseline_images/ *.pdf
7 changes: 4 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fgivenx: Functional Posterior Plotter
=====================================
:fgivenx: Functional Posterior Plotter
:Author: Will Handley
:Version: 2.1.10
:Version: 2.1.11
:Homepage: https://github.com/williamjameshandley/fgivenx
:Documentation: http://fgivenx.readthedocs.io/

Expand Down Expand Up @@ -285,9 +285,10 @@ Pull requests are very welcome. Note that if you are going to propose drastic
changes, be sure to open an issue for discussion first, to make sure that your
PR will be accepted before you spend effort coding it.

.. |image0| image:: https://github.com/williamjameshandley/fgivenx/blob/master/plot.png
.. |image1| image:: https://github.com/williamjameshandley/fgivenx/blob/master/planck.png
.. |image0| image:: https://raw.githubusercontent.com/williamjameshandley/fgivenx/master/plot.png
.. |image1| image:: https://raw.githubusercontent.com/williamjameshandley/fgivenx/master/planck.png

Changelog
=========
:v2.1.11: Documentation upgrades
:v2.1.10: Added changelog
5 changes: 1 addition & 4 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,11 @@ def get_version(short=False):
# ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.doctest',
'sphinx.ext.intersphinx',
'sphinx.ext.todo',
'sphinx.ext.coverage',
'sphinx.ext.mathjax',
'sphinx.ext.ifconfig',
'sphinx.ext.viewcode',
'sphinx.ext.githubpages',
'sphinx.ext.imgconverter',
'numpydoc',
]

Expand Down
17 changes: 8 additions & 9 deletions docs/source/fgivenx.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
fgivenx package
===============

Module contents
---------------

.. automodule:: fgivenx
:members:
:undoc-members:
:show-inheritance:

Submodules
----------

Expand Down Expand Up @@ -59,12 +67,3 @@ fgivenx.samples module
:members:
:undoc-members:
:show-inheritance:


Module contents
---------------

.. automodule:: fgivenx
:members:
:undoc-members:
:show-inheritance:
27 changes: 27 additions & 0 deletions fgivenx/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,29 @@
"""
The main driving routines for this package are:
* :func:`plot_contours <fgivenx.drivers.plot_contours>`
* :func:`plot_lines <fgivenx.drivers.plot_lines>`
* :func:`plot_dkl <fgivenx.drivers.plot_dkl>`
* :func:`samples_from_getdist_chains <fgivenx.samples.samples_from_getdist_chains>`
Example import and usage:
>>> import numpy
>>> from fgivenx import plot_contours, plot_lines, plot_dkl, samples_from_getdist_chains
>>>
>>> file_root = '/my/getdist/file/root'
>>> params = ['m', 'c']
>>> samples = samples_from_getdist_chains(params, file_root)
>>> x = numpy.linspace(-1, 1, 100)
>>>
>>> def f(x, theta):
>>> m, c = params
>>> y = m * x + c
>>> return y
>>>
>>> plot_contours(f, x, samples)
"""

from fgivenx.drivers import plot_contours, plot_lines, plot_dkl
from fgivenx.samples import samples_from_getdist_chains
9 changes: 4 additions & 5 deletions paper/paper.bib
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,12 @@ @ARTICLE{Higson2018

@article{zenodo,
Author = {Handley, W},
Date-Modified = {2018-07-12 11:21:25 +0000},
doi = {10.5281/zenodo.1310715},
Month = {Jul},
doi = {10.5281/zenodo.1344097},
Month = {Aug},
Publisher = {Zenodo},
Title = {fgivenx: v2.0},
Title = {fgivenx: v2.1.10},
Year = {2018},
Bdsk-Url-1 = {http://dx.doi.org/10.5281/zenodo.1310715}
Bdsk-Url-1 = {http://dx.doi.org/10.5281/zenodo.1344097}
}

@unpublished{Higson2018b,
Expand Down
4 changes: 2 additions & 2 deletions paper/paper.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ sensing [@Higson2018b].
used in astronomy, but will be of use to scientists performing any Bayesian
analysis which has predictive posteriors that are functions. The source code
for ``fgivenx`` is available on
[GitHub](https://github.com/williamjameshandley/fgivenx) and has been archived to
Zenodo with the linked DOI: [@zenodo]
[GitHub](https://github.com/williamjameshandley/fgivenx) and has been archived
as ``v2.1.11`` to Zenodo with the linked DOI: [@zenodo]

# Acknowledgements

Expand Down

0 comments on commit f9b3963

Please sign in to comment.