DONTMERGE: improve repr by a lot

.gitignore

@@ -9,7 +9,6 @@
 .spyproject/
 .spyderproject
 .spyderworkspace
-.spyproject/
 
 # PyCharm project files
 .idea

doc/gitwash_dumper.py

@@ -1,17 +1,17 @@
 ''' Checkout gitwash repo into directory and do search replace on name '''
 
-from __future__ import (absolute_import, division, print_function)
+from __future__ import absolute_import, division, print_function
 
+import fnmatch
+import glob
 import os
-from os.path import join as pjoin
+import re
 import shutil
 import sys
-import re
-import glob
-import fnmatch
 import tempfile
-from subprocess import call
 from optparse import OptionParser
+from os.path import join as pjoin
+from subprocess import call
 
 verbose = False
 

doc/source/conf.py

@@ -7,12 +7,14 @@
 # obtain one at https://mozilla.org/MPL/2.0/.
 
 from __future__ import print_function
-from distutils.version import StrictVersion
-import sphinx
+
 import glob
 import os
-import sphinx_rtd_theme
 import sys
+from distutils.version import StrictVersion
+
+import sphinx
+import sphinx_rtd_theme
 
 # --- General configuration --- #
 

doc/source/generate_doc.py

@@ -7,10 +7,11 @@
 # obtain one at https://mozilla.org/MPL/2.0/.
 
 from __future__ import print_function
-import inspect
+
 import importlib
-import odl
+import inspect
 
+import odl
 
 __all__ = ('make_interface',)
 

doc/source/getting_started/code/getting_started_convolution.py

@@ -1,9 +1,10 @@
 """Source code for the getting started example."""
 
-import odl
 import scipy
 import scipy.signal
 
+import odl
+
 
 class Convolution(odl.Operator):
     """Operator calculating the convolution of a kernel with a function.

doc/source/guide/code/functional_indepth_example.py

@@ -1,6 +1,7 @@
 """Example of how to implement and use functionals."""
 
 from __future__ import division, print_function
+
 import odl
 
 

examples/deform/linearized_fixed_displacement.py

@@ -17,8 +17,8 @@
 """
 
 import numpy as np
-import odl
 
+import odl
 
 # --- Create template and displacement field --- #
 

examples/deform/linearized_fixed_template.py

@@ -16,8 +16,8 @@
 """
 
 import numpy as np
-import odl
 
+import odl
 
 # --- Create template and displacement field --- #
 

examples/operator/convolution_operator.py

@@ -1,9 +1,10 @@
 """Create a convolution operator by wrapping a library."""
 
-import odl
 import scipy
 import scipy.signal
 
+import odl
+
 
 class Convolution(odl.Operator):
     """Operator calculating the convolution of a kernel with a function.

examples/solvers/admm_tomography.py

@@ -22,6 +22,7 @@
 """
 
 import numpy as np
+
 import odl
 
 # --- Set up the forward operator (ray transform) --- #

examples/solvers/conjugate_gradient_tomography.py

@@ -9,8 +9,8 @@
 """
 
 import numpy as np
-import odl
 
+import odl
 
 # --- Set up the forward operator (ray transform) --- #
 

examples/solvers/deconvolution_1d.py

@@ -1,8 +1,9 @@
 """Example of a deconvolution problem with different solvers (CPU)."""
 
-import numpy as np
 import matplotlib.pyplot as plt
+import numpy as np
 import scipy.signal
+
 import odl
 
 

examples/solvers/denoising_with_entropy_type_regularization.py

@@ -14,8 +14,8 @@
 
 import numpy as np
 import scipy
-import odl
 
+import odl
 
 # Read test image:
 # convert integer values to float, and rotate to get the image upright

examples/solvers/douglas_rachford_pd_heron.py

@@ -15,6 +15,7 @@
 
 import matplotlib.pyplot as plt
 import numpy as np
+
 import odl
 
 # Create the solution space

examples/solvers/douglas_rachford_pd_mri.py

@@ -9,6 +9,7 @@
 """
 
 import numpy as np
+
 import odl
 
 # Parameters

examples/solvers/douglas_rachford_pd_tomography_tv.py

@@ -31,6 +31,7 @@
 """
 
 import numpy as np
+
 import odl
 
 # Parameters

examples/solvers/find_optimal_parameters.py

@@ -10,6 +10,7 @@
 
 import numpy as np
 import scipy
+
 import odl
 
 

examples/solvers/forward_backward_pd_denoising.py

@@ -9,6 +9,7 @@
 
 import numpy as np
 import scipy.misc
+
 import odl
 
 # Load image

examples/solvers/functional_basic_example.py

@@ -6,6 +6,7 @@
 """
 
 import numpy as np
+
 import odl
 
 

examples/solvers/functional_basic_example_solver.py

@@ -16,6 +16,7 @@
 """
 
 import numpy as np
+
 import odl
 
 # Create a space with dimensiona n=10.

examples/solvers/kaczmarz_tomography.py

@@ -14,7 +14,6 @@
 
 import odl
 
-
 # --- Set up the forward operator (ray transform) --- #
 
 

examples/solvers/lbfgs_tomography.py

@@ -9,8 +9,8 @@
 """
 
 import numpy as np
-import odl
 
+import odl
 
 # --- Set up the forward operator (ray transform) --- #
 

examples/solvers/lbfgs_tomography_tv.py

@@ -13,8 +13,8 @@
 """
 
 import numpy as np
-import odl
 
+import odl
 
 # --- Set up the forward operator (ray transform) --- #
 

examples/solvers/nuclear_norm_tomography.py

@@ -24,8 +24,8 @@
 
 
 import numpy as np
-import odl
 
+import odl
 
 # --- Set up the forward operator (ray transform) --- #
 

examples/solvers/pdhg_deconvolve.py

@@ -12,6 +12,7 @@
 """
 
 import numpy as np
+
 import odl
 
 # Discretization parameters

examples/solvers/pdhg_denoising.py

@@ -12,6 +12,7 @@
 
 import numpy as np
 import scipy.misc
+
 import odl
 
 # Read test image: use only every second pixel, convert integer to float,

examples/solvers/pdhg_denoising_L1_HuberTV.py

@@ -13,9 +13,10 @@
 https://odlgroup.github.io/odl/guide/pdhg_guide.html in the ODL documentation.
 """
 
+import matplotlib.pyplot as plt
 import numpy as np
+
 import odl
-import matplotlib.pyplot as plt
 
 # Define ground truth, space and noisy data
 shape = [100, 100]

examples/solvers/pdhg_denoising_L2_HuberTV.py

@@ -25,10 +25,11 @@
 https://odlgroup.github.io/odl/guide/pdhg_guide.html in the ODL documentation.
 """
 
+import matplotlib.pyplot as plt
 import numpy as np
 import scipy
+
 import odl
-import matplotlib.pyplot as plt
 
 # Define ground truth, space and noisy data
 image = np.rot90(scipy.misc.ascent()[::2, ::2].astype('float'), 3)

examples/solvers/pdhg_denoising_ROF_algorithm_comparison.py

@@ -15,10 +15,11 @@
 https://odlgroup.github.io/odl/guide/pdhg_guide.html in the ODL documentation.
 """
 
+import matplotlib.pyplot as plt
 import numpy as np
 import scipy
+
 import odl
-import matplotlib.pyplot as plt
 
 # --- define setting --- #
 

examples/solvers/pdhg_denoising_complex.py

@@ -12,6 +12,7 @@
 
 import numpy as np
 import scipy.misc
+
 import odl
 
 # Read test image: use only every second pixel, convert integer to float,

examples/solvers/pdhg_denoising_tgv.py

@@ -29,6 +29,7 @@
 """
 
 import numpy as np
+
 import odl
 
 # --- Set up the forward operator (identity) --- #

examples/solvers/pdhg_tomography.py

@@ -12,6 +12,7 @@
 """
 
 import numpy as np
+
 import odl
 
 # --- Set up the forward operator (ray transform) --- #

examples/solvers/pdhg_tomography_tgv.py

@@ -29,6 +29,7 @@
 """
 
 import numpy as np
+
 import odl
 
 # --- Set up the forward operator (ray transform) --- #

examples/solvers/proximal_gradient_denoising.py

@@ -11,7 +11,6 @@
 
 import odl
 
-
 # --- Set up problem definition --- #
 
 

examples/solvers/proximal_gradient_wavelet_tomography.py

@@ -10,9 +10,9 @@
 The proximal gradient solvers are also known as ISTA and FISTA.
 """
 
-import odl
 import numpy as np
 
+import odl
 
 # --- Set up problem definition --- #
 

examples/solvers/proximal_lang_poisson.py

@@ -9,6 +9,7 @@
 """
 
 import numpy as np
+
 import odl
 import proximal
 

examples/solvers/proximal_lang_tomography.py

@@ -9,10 +9,10 @@
 """
 
 import numpy as np
+
 import odl
 import proximal
 
-
 # --- Set up the forward operator (ray transform) --- #
 
 

examples/solvers/rosenbrock_minimization.py

@@ -20,9 +20,10 @@
 This example shows how this can be done using a variety of solution methods.
 """
 
-import odl
 from matplotlib import pyplot as plt
 
+import odl
+
 # Create the solution space
 space = odl.rn(2)
 

examples/solvers/scipy_solvers.py

@@ -9,6 +9,7 @@
 
 import numpy as np
 import scipy.sparse.linalg as sl
+
 import odl
 
 # Create discrete space, a square from [-1, 1] x [-1, 1] with (11 x 11) points