diff --git a/doc/conf.py b/doc/conf.py index 43b8ea82..4c9d361a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -14,9 +14,9 @@ master_doc = 'index' project = u'urbs' -copyright = u'2014-2016, tum-ens' -version = '0.5' -release = '0.5' +copyright = u'2014-2017, tum-ens' +version = '0.7' +release = '0.7' exclude_patterns = ['_build'] #pygments_style = 'sphinx' @@ -72,7 +72,7 @@ epub_title = u'urbs' epub_author = u'tum-ens' epub_publisher = u'tum-ens' -epub_copyright = u'2014-2016, tum-ens' +epub_copyright = u'2014-2017, tum-ens' epub_exclude_files = ['search.html'] diff --git a/doc/index.rst b/doc/index.rst index b1319bd6..fe3190b0 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -9,8 +9,8 @@ urbs: A linear optimisation model for distributed energy systems ================================================================ :Maintainer: Johannes Dorfner, -:Organization: `Institute for Renewable and Sustainable Energy Systems`_, - Technische Universität München +:Organization: `Chair of Renewable and Sustainable Energy Systems`_, + Technical University of Munich :Version: |version| :Date: |today| :Copyright: @@ -69,11 +69,13 @@ Features Changes ------- -(Upcoming) Version 0.7 +2017-01-13 Version 0.7 ^^^^^^^^^^^^^^^^^^^^^^ -* Plot function (and ``get_timeseries``) now support grouping of multiple sites -* Environmental commodity costs (e.g. emission taxes or other pollution externalities) +* Maintenance: Model file ``urbs.py`` split into subfiles in folder ``urbs`` +* Feature: Usable area in site implemented as possible constraint +* Feature: Plot function (and ``get_timeseries``) now support grouping of multiple sites +* Feature: Environmental commodity costs (e.g. emission taxes or other pollution externalities) * Bugfix: column *Overproduction* in report sheet did not respect DSM @@ -159,7 +161,7 @@ Dependencies * Any solver supported by pyomo; suggestion: `GLPK`_ .. _glpk: https://www.gnu.org/software/glpk/ -.. _Institute for Renewable and Sustainable Energy Systems: http://www.ens.ei.tum.de/ +.. _Chair of Renewable and Sustainable Energy Systems: http://www.ens.ei.tum.de/ .. _matplotlib: http://matplotlib.org .. _pandas: http://pandas.pydata.org .. _pyomo: http://www.pyomo.org