Merge pull request #2 from NFFT/python-code-format-patches

Fixes by format action

Author: passscoed

src/pyANOVAapprox/__init__.py

@@ -1,14 +1,16 @@
+import math
 import threading
 from math import acos, isnan
-import math
 
 import numpy as np
 from pyGroupedTransforms import *
 from scipy.sparse.linalg import lsqr
 from scipy.special import erf
-#from sklearn.metrics import roc_auc_score
 
-def get_superposition_set(d, ds):    #TODO: Später funktion aut GT verwenden
+# from sklearn.metrics import roc_auc_score
+
+
+def get_superposition_set(d, ds):  # TODO: Später funktion aut GT verwenden
     """
     get_superposition_set( d::Int, ds::Int )::Vector{Vector{Int}}
 
@@ -27,6 +29,7 @@ def get_superposition_set(d, ds):    #TODO: Später funktion aut GT verwenden
 
     return [tuple(item) for item in returnset]
 
+
 def bisection(l, r, fun, maxiter=1000):
     lval = fun(l)
     rval = fun(r)

src/pyANOVAapprox/approx.py

@@ -1,6 +1,7 @@
+from pyGroupedTransforms.GroupedTransform import *  # TODO: Kann wahrscheinlich weg sobald in pyGroupedTransform GreoupedTransform exportiert wird
+
 from pyANOVAapprox import *
 from pyANOVAapprox.fista import *
-from pyGroupedTransforms.GroupedTransform import *  #TODO: Kann wahrscheinlich weg sobald in pyGroupedTransform GreoupedTransform exportiert wird
 
 bases = ["per", "cos", "cheb", "std", "chui1", "chui2", "chui3", "chui4", "mixed"]
 types = {

src/pyANOVAapprox/errors.py

@@ -164,7 +164,7 @@ def get_acc(a, X=None, y=None, lam=None):
         return {l: _acc(a, l, X, y) for l in list(a.fc)}
 
 
-#def _auc(a, lam, X, y):  # helpfunction for get_auc    #TODO: implement ROC AUC Score
+# def _auc(a, lam, X, y):  # helpfunction for get_auc    #TODO: implement ROC AUC Score
 #    if y is None:
 #        y = a.y
 #

src/pyANOVAapprox/fista.py

@@ -1,5 +1,7 @@
+from pyGroupedTransforms.GroupedCoefficients import *  # TODO: Kann wahrscheinlich weg sobald in pyGroupedTransform GreoupedTransform exportiert wird
+
 from pyANOVAapprox import *
-from pyGroupedTransforms.GroupedCoefficients import *  #TODO: Kann wahrscheinlich weg sobald in pyGroupedTransform GreoupedTransform exportiert wird
+
 
 def bisection(
     fun, fval, left, right, fleft, fright, max_iter=10, tol=1e-15, verbose=False

tests/cheb_fista.py

@@ -6,9 +6,10 @@
 
 import numpy as np
 import TestFunctionCheb
-import pyANOVAapprox as ANOVAapprox
 from pyGroupedTransforms import *
 
+import pyANOVAapprox as ANOVAapprox
+
 d = 8
 ds = 2
 M = 1000  # eigentlich 10000

tests/cheb_lsqr.py

@@ -6,9 +6,10 @@
 
 import numpy as np
 import TestFunctionCheb
-import pyANOVAapprox as ANOVAapprox
 from pyGroupedTransforms import *
 
+import pyANOVAapprox as ANOVAapprox
+
 d = 8
 ds = 2
 M = 1000  # eigentlich 10000

tests/per_fista.py

@@ -5,9 +5,10 @@
 sys.path.insert(0, src_aa)
 
 import numpy as np
-import pyANOVAapprox as ANOVAapprox
-from TestFunctionPeriodic import AS, f, fc, norm
 from pyGroupedTransforms import *
+from TestFunctionPeriodic import AS, f, fc, norm
+
+import pyANOVAapprox as ANOVAapprox
 
 d = 6
 ds = 2

tests/per_lsqr.py

@@ -7,9 +7,10 @@
 sys.path.insert(0, src_aa)
 
 import numpy as np
-import pyANOVAapprox as ANOVAapprox
-from TestFunctionPeriodic import *
 from pyGroupedTransforms import *
+from TestFunctionPeriodic import *
+
+import pyANOVAapprox as ANOVAapprox
 
 d = 6
 ds = 2
@@ -55,9 +56,9 @@
 print("l2 rand ds: ", err_l2_rand_ds)
 print("l2 rand U: ", err_l2_rand_U)
 
-assert err_L2_ds < 0.01 
+assert err_L2_ds < 0.01
 assert err_L2_U < 0.005
 assert err_l2_ds < 0.01
 assert err_l2_U < 0.005
-assert err_l2_rand_ds < 0.01 
+assert err_l2_rand_ds < 0.01
 assert err_l2_rand_U < 0.005

tests/run_tests.py

@@ -12,7 +12,7 @@
 # Script to run all tests and return any failures
 def run_tests():
     test_files = [
-#        "tests/wav_lsqr.py",
+        #        "tests/wav_lsqr.py",
         "tests/cheb_fista.py",
         "tests/cheb_lsqr.py",
         "tests/per_fista.py",