Commit 4adddadc authored by Russell Luke's avatar Russell Luke
Browse files

changed configuration and main index.rst

parent 175dacba
...@@ -36,10 +36,16 @@ extensions = [ ...@@ -36,10 +36,16 @@ extensions = [
'sphinx.ext.inheritance_diagram', 'sphinx.ext.inheritance_diagram',
#'sphinx.ext.napoleon', #'sphinx.ext.napoleon',
'sphinx.ext.mathjax', 'sphinx.ext.mathjax',
'sphinx.ext.autosummary', #'sphinx.ext.pngmath',
'sphinx.ext.viewcode',
'sphinx.ext.autosummary',
'numpydoc' 'numpydoc'
] ]
# Intersphinx mapping
intersphinx_mapping = {'numpy': ('http://docs.scipy.org/doc/numpy/', None)}
# General information about the project. # General information about the project.
project = u'ProxToolbox' project = u'ProxToolbox'
copyright = u'2015, Russell Luke' copyright = u'2015, Russell Luke'
...@@ -120,7 +126,8 @@ modindex_common_prefix = ['proxtoolbox.'] ...@@ -120,7 +126,8 @@ modindex_common_prefix = ['proxtoolbox.']
# The theme to use for HTML and HTML Help pages. See the documentation for # The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes. # a list of builtin themes.
html_theme = 'sphinxdoc' # html_theme = 'sphinxdoc'
html_theme = 'sphinx_rtd_theme'
# Theme options are theme-specific and customize the look and feel of a theme # Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the # further. For a list of options available for each theme, see the
......
...@@ -14,7 +14,7 @@ For a complete listing of papers with links go to `publications <http://vaopt.ma ...@@ -14,7 +14,7 @@ For a complete listing of papers with links go to `publications <http://vaopt.ma
This site is maintained by the This site is maintained by the
`Working Group in Variational Analysis <http://vaopt.math.uni-goettingen.de/en>`_ `Working Group in Variational Analysis <http://vaopt.math.uni-goettingen.de/en>`_
at the University of Göttingen of the `Institute for Numerical and Applied Mathematics <http://www.uni-goettingen.de/de/85746.html>`_ at the `University of Göttingen <https://www.uni-goettingen.de/en/1.html>`_.
.. raw:: html .. raw:: html
...@@ -40,7 +40,7 @@ Python version (still in development) |version| ...@@ -40,7 +40,7 @@ Python version (still in development) |version|
Matlab version (3.0, August 2017) Matlab version (3.0, August 2017)
--------------------------------- ---------------------------------
`Source <http://vaopt.math.uni-goettingen.de/en/software/ProxMatlab3.0.tar.gz>`_ (10.5mb) `Source <http://vaopt.math.uni-goettingen.de/en/software/ProxMatlab-Release3.0.tar.gz>`_ (10.5mb)
Additional data Additional data
...@@ -52,7 +52,8 @@ Additional data ...@@ -52,7 +52,8 @@ Additional data
`CT <http://vaopt.math.uni-goettingen.de/data/CT.tar.gz>`_ (1.7mb) `CT <http://vaopt.math.uni-goettingen.de/data/CT.tar.gz>`_ (1.7mb)
The binary data need to be unpacked in the InputData/ subdirectory source code. The binary data need to be unpacked in the InputData/ subdirectory source code. For example, the Phase data in
ProxMatlab would be in ProxMatlab/InputData/Phase.
.. automodule:: proxtoolbox .. automodule:: proxtoolbox
...@@ -65,8 +66,9 @@ in the ProxMatlab tar-ball. ...@@ -65,8 +66,9 @@ in the ProxMatlab tar-ball.
Tutorial/tutorial Tutorial/tutorial
Manual/content Manual/content
Manual/addons Manual/addons
Matlab-to-Python
credits
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment