Applied code formatting

Author: Auto Format

doc/source/conf.py

@@ -34,28 +34,24 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.coverage',
-    'sphinx.ext.githubpages']
+extensions = ["sphinx.ext.autodoc", "sphinx.ext.doctest", "sphinx.ext.intersphinx", "sphinx.ext.coverage", "sphinx.ext.githubpages"]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = 'pycarl'
-copyright = 'MOVES RWTH Aachen'
-author = 'Sebastian Junges, Matthias Volk'
+project = "pycarl"
+copyright = "MOVES RWTH Aachen"
+author = "Sebastian Junges, Matthias Volk"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -79,7 +75,7 @@
 exclude_patterns = []
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -90,7 +86,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'bootstrap'
+html_theme = "bootstrap"
 
 html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
 
@@ -101,78 +97,63 @@
 
 html_theme_options = {
     # Navigation bar title. (Default: ``project`` value)
-    'navbar_title': "Pycarl",
-
+    "navbar_title": "Pycarl",
     # Tab name for entire site. (Default: "Site")
-    'navbar_site_name': "Pycarl",
-
+    "navbar_site_name": "Pycarl",
     # A list of tuples containing pages or urls to link to.
     # Valid tuples should be in the following forms:
     #    (name, page)                 # a link to a page
     #    (name, "/aa/bb", 1)          # a link to an arbitrary relative url
     #    (name, "http://example.com", True) # arbitrary absolute url
     # Note the "1" or "True" value above as the third argument to indicate
     # an arbitrary url.
-    'navbar_links': [
-        ("Carl", "https://github.com/moves-rwth/carl-storm", True),
-        ("Github", "https://github.com/moves-rwth/pycarl", True)
-    ],
-
+    "navbar_links": [("Carl", "https://github.com/moves-rwth/carl-storm", True), ("Github", "https://github.com/moves-rwth/pycarl", True)],
     # Render the next and previous page links in navbar. (Default: true)
-    'navbar_sidebarrel': True,
-
+    "navbar_sidebarrel": True,
     # Render the current pages TOC in the navbar. (Default: true)
-    'navbar_pagenav': True,
-
+    "navbar_pagenav": True,
     # Tab name for the current pages TOC. (Default: "Page")
-    'navbar_pagenav_name': "Page",
-
+    "navbar_pagenav_name": "Page",
     # Global TOC depth for "site" navbar tab. (Default: 1)
     # Switching to -1 shows all levels.
-    'globaltoc_depth': 2,
-
+    "globaltoc_depth": 2,
     # Include hidden TOCs in Site navbar?
     #
     # Note: If this is "false", you cannot have mixed ``:hidden:`` and
     # non-hidden ``toctree`` directives in the same page, or else the build
     # will break.
     #
     # Values: "true" (default) or "false"
-    'globaltoc_includehidden': "true",
-
+    "globaltoc_includehidden": "true",
     # HTML navbar class (Default: "navbar") to attach to <div> element.
     # For black navbar, do "navbar navbar-inverse"
-    'navbar_class': "navbar navbar-inverse",
-
+    "navbar_class": "navbar navbar-inverse",
     # Fix navigation bar to top of page?
     # Values: "true" (default) or "false"
-    'navbar_fixed_top': "true",
-
+    "navbar_fixed_top": "true",
     # Location of link to source.
     # Options are "nav" (default), "footer" or anything else to exclude.
-    'source_link_position': "footer",
-
+    "source_link_position": "footer",
     # Bootswatch (http://bootswatch.com/) theme.
     #
     # Options are nothing (default) or the name of a valid theme
     # such as "cosmo" or "sandstone".
-    'bootswatch_theme': "united",
-
+    "bootswatch_theme": "united",
     # Choose Bootstrap version.
     # Values: "3" (default) or "2" (in quotes)
-    'bootstrap_version': "3",
+    "bootstrap_version": "3",
 }
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 
 # -- Options for HTMLHelp output ------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'pycarldoc'
+htmlhelp_basename = "pycarldoc"
 
 
 # -- Options for LaTeX output ---------------------------------------------
@@ -181,15 +162,12 @@
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -199,19 +177,15 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'pycarl.tex', 'pycarl Documentation',
-     'Sebastian Junges, Matthias Volk', 'manual'),
+    (master_doc, "pycarl.tex", "pycarl Documentation", "Sebastian Junges, Matthias Volk", "manual"),
 ]
 
 
 # -- Options for manual page output ---------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'pycarl', 'pycarl Documentation',
-     [author], 1)
-]
+man_pages = [(master_doc, "pycarl", "pycarl Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -220,10 +194,5 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'pycarl', 'pycarl Documentation',
-     author, 'pycarl', 'One line description of project.',
-     'Miscellaneous'),
+    (master_doc, "pycarl", "pycarl Documentation", author, "pycarl", "One line description of project.", "Miscellaneous"),
 ]
-
-
-

examples/01-getting-started.py

@@ -12,5 +12,5 @@ def example_getting_started_01():
     print("({}) * ({}) = {}".format(pol1, pol2, result))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     example_getting_started_01()

lib/pycarl/__init__.py

@@ -1,7 +1,7 @@
 import sys
 
 if sys.version_info[0] == 2:
-    raise ImportError('Python 2.x is not supported for pycarl.')
+    raise ImportError("Python 2.x is not supported for pycarl.")
 
 from . import core
 from .core import *

lib/pycarl/cln/__init__.py

@@ -19,6 +19,7 @@ def denominator(x):
     else:
         return 1
 
+
 def expand(x):
     if type(x) == cln.FactorizedRationalFunction:
         return x.rational_function()

lib/pycarl/convert/__init__.py

@@ -15,7 +15,6 @@ def convert_to_gmp(data):
 if has_cln:
     from . import cln_converter
 
-
     def convert_to_cln(data):
         """
         Convert data type to cln.

lib/pycarl/convert/cln_converter.py

@@ -92,10 +92,10 @@ def convert_factorized_polynomial(polynomial):
     elif isinstance(polynomial, pycarl.gmp.FactorizedPolynomial):
         coefficient = convert_rational(polynomial.coefficient)
         converted = pycarl.cln.FactorizedPolynomial(coefficient)
-        for (factor, exponent) in polynomial.factorization():
+        for factor, exponent in polynomial.factorization():
             pol = convert_polynomial(factor.polynomial())
             factorized = pycarl.cln.create_factorized_polynomial(pol)
-            converted *= factorized ** exponent
+            converted *= factorized**exponent
         return converted
     else:
         raise TypeError("Factorized polynomial of type {} cannot be convert to cln".format(type(polynomial)))
@@ -131,8 +131,9 @@ def convert_constraint(constraint):
     else:
         raise TypeError("Constraint of type {} cannot be convert to cln".format(type(constraint)))
 
+
 def convert_formula(formula):
-    if  isinstance(formula, pycarl.cln.formula.Formula):
+    if isinstance(formula, pycarl.cln.formula.Formula):
         return formula
     elif isinstance(formula, pycarl.gmp.formula.Formula):
         if formula.type == pycarl.formula.FormulaType.TRUE:
@@ -166,8 +167,7 @@ def convert(data):
         return convert_rational_function(data)
     elif isinstance(data, pycarl.cln.FactorizedPolynomial) or isinstance(data, pycarl.gmp.FactorizedPolynomial):
         return convert_factorized_polynomial(data)
-    elif isinstance(data, pycarl.cln.FactorizedRationalFunction) or isinstance(data,
-                                                                               pycarl.gmp.FactorizedRationalFunction):
+    elif isinstance(data, pycarl.cln.FactorizedRationalFunction) or isinstance(data, pycarl.gmp.FactorizedRationalFunction):
         return convert_factorized_rational_function(data)
     elif isinstance(data, pycarl.cln.formula.Constraint) or isinstance(data, pycarl.gmp.formula.Constraint):
         return convert_constraint(data)

lib/pycarl/convert/gmp_converter.py

@@ -92,10 +92,10 @@ def convert_factorized_polynomial(polynomial):
     if has_cln and isinstance(polynomial, pycarl.cln.FactorizedPolynomial):
         coefficient = convert_rational(polynomial.coefficient)
         converted = pycarl.gmp.FactorizedPolynomial(coefficient)
-        for (factor, exponent) in polynomial.factorization():
+        for factor, exponent in polynomial.factorization():
             pol = convert_polynomial(factor.polynomial())
             factorized = pycarl.gmp.create_factorized_polynomial(pol)
-            converted *= factorized ** exponent
+            converted *= factorized**exponent
         return converted
     elif isinstance(polynomial, pycarl.gmp.FactorizedPolynomial):
         return polynomial
@@ -133,6 +133,7 @@ def convert_constraint(constraint):
     else:
         raise TypeError("Constraint of type {} cannot be convert to gmp".format(type(constraint)))
 
+
 def convert_formula(formula):
     if isinstance(formula, pycarl.gmp.formula.Formula):
         return formula
@@ -141,43 +142,37 @@ def convert_formula(formula):
     if formula.type == pycarl.formula.FormulaType.FALSE:
         return pycarl.gmp.formula.Formula(pycarl.gmp.formula.Constraint(False))
     if formula.type == pycarl.formula.FormulaType.CONSTRAINT:
-            return convert_constraint(formula.get_constraint())
+        return convert_constraint(formula.get_constraint())
     if has_cln and isinstance(formula, pycarl.cln.formula.Formula):
         csubformulae = [pycarl.gmp.formula.Formula(convert(subf)) for subf in formula.get_subformulas()]
         return pycarl.gmp.formula.Formula(formula.type, csubformulae)
     else:
         raise TypeError("Formula of type {} cannot be convert to gmp".format(type(formula)))
 
+
 def convert(data):
     """
     Convert arbitrary data type to gmp.
     :param data: data structure.
     :return: gmp data structure.
     """
-    if (has_cln and isinstance(data, pycarl.cln.Integer)) or isinstance(data, pycarl.gmp.Integer) or isinstance(data,
-                                                                                                                int):
+    if (has_cln and isinstance(data, pycarl.cln.Integer)) or isinstance(data, pycarl.gmp.Integer) or isinstance(data, int):
         return convert_integer(data)
-    elif (has_cln and isinstance(data, pycarl.cln.Rational)) or isinstance(data, pycarl.gmp.Rational) or isinstance(
-            data, float):
+    elif (has_cln and isinstance(data, pycarl.cln.Rational)) or isinstance(data, pycarl.gmp.Rational) or isinstance(data, float):
         return convert_rational(data)
     elif (has_cln and isinstance(data, pycarl.cln.Term)) or isinstance(data, pycarl.gmp.Term):
         return convert_term(data)
     elif (has_cln and isinstance(data, pycarl.cln.Polynomial)) or isinstance(data, pycarl.gmp.Polynomial):
         return convert_polynomial(data)
     elif (has_cln and isinstance(data, pycarl.cln.RationalFunction)) or isinstance(data, pycarl.gmp.RationalFunction):
         return convert_rational_function(data)
-    elif (has_cln and isinstance(data, pycarl.cln.FactorizedPolynomial)) or isinstance(data,
-                                                                                       pycarl.gmp.FactorizedPolynomial):
+    elif (has_cln and isinstance(data, pycarl.cln.FactorizedPolynomial)) or isinstance(data, pycarl.gmp.FactorizedPolynomial):
         return convert_factorized_polynomial(data)
-    elif (has_cln and isinstance(data, pycarl.cln.FactorizedRationalFunction)) or isinstance(data,
-                                                                                             pycarl.gmp.FactorizedRationalFunction):
+    elif (has_cln and isinstance(data, pycarl.cln.FactorizedRationalFunction)) or isinstance(data, pycarl.gmp.FactorizedRationalFunction):
         return convert_factorized_rational_function(data)
-    elif (has_cln and isinstance(data, pycarl.cln.formula.Constraint)) or isinstance(data,
-                                                                                     pycarl.gmp.formula.Constraint):
+    elif (has_cln and isinstance(data, pycarl.cln.formula.Constraint)) or isinstance(data, pycarl.gmp.formula.Constraint):
         return convert_constraint(data)
-    elif (has_cln and isinstance(data, pycarl.cln.formula.Formula)) or isinstance(data,
-                                                                                pycarl.gmp.formula.Formula):
-
+    elif (has_cln and isinstance(data, pycarl.cln.formula.Formula)) or isinstance(data, pycarl.gmp.formula.Formula):
         return convert_formula(data)
 
     else:

lib/pycarl/gmp/__init__.py

@@ -15,13 +15,15 @@ def denominator(x):
     else:
         return 1
 
+
 def expand(x):
     if type(x) == gmp.FactorizedRationalFunction:
         return x.rational_function()
     if type(x) == gmp.FactorizedPolynomial:
         return x.polynomial()
     return x
 
+
 factorization_cache = gmp._FactorizationCache()