pyANOVAapprox 2.0.2__tar.gz → 2.0.3__tar.gz

{pyanovaapprox-2.0.2 → pyanovaapprox-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyANOVAapprox
-Version: 2.0.2
+Version: 2.0.3
 Summary: Approximation Package for High-Dimensional Functions
 Project-URL: Homepage, https://github.com/NFFT/pyGroupedTransforms
 Author-email: Felix Wirth <fwi012001@gmail.com>

{pyanovaapprox-2.0.2 → pyanovaapprox-2.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyANOVAapprox"
-version = "2.0.2"
+version = "2.0.3"
 authors = [
   { name="Felix Wirth", email="fwi012001@gmail.com" },
 ]

{pyanovaapprox-2.0.2 → pyanovaapprox-2.0.3}/simpleTest/exampleNonPeriodic.py

@@ -150,7 +150,9 @@ print(
 ################################################
 
 Umask = np.append(np.array([True]), gsis > 1e-2)
-U = [ads.getSetting().U[i] for i in np.arange(0, len(Umask))[Umask]]  # get important subsets
+U = [
+    ads.getSetting().U[i] for i in np.arange(0, len(Umask))[Umask]
+]  # get important subsets
 bws = M / (math.log10(M) * (len(U) - 1))  # calculate frequencies per subset
 N = [
     math.floor(bws ** (1 / max(1, len(u))) / 2) * 2 for u in U

{pyanovaapprox-2.0.2 → pyanovaapprox-2.0.3}/simpleTest/exampleWavelet.py

@@ -82,7 +82,7 @@ print("Total number of used parameters = " + str(len(anova_model.fc[lambdas[0]].
 
 ### Do sensitivity analysis ####
 anova_model.get_GSI(
-  lam=0.0
+    lam=0.0
 )  # calculates indices for importance of terms (gsis is vector, with indices belonging to terms in anova_model.U)
 anova_model.get_GSI(lam=0.0, Dict=true)
 

{pyanovaapprox-2.0.2 → pyanovaapprox-2.0.3}/src/pyANOVAapprox/approx.py

@@ -187,7 +187,7 @@ class approx:
     ):
 
         self.X = X
-        
+
         if X.shape[0] != y.shape[0]:
             raise ValueError("X and y have different lengths.")
 
@@ -401,12 +401,12 @@ class approx:
 
         D = dict([(u, tuple([1.0] * len(u))) for u in setting.U])
         t = dict([(u, tuple([1.0] * len(u))) for u in setting.U])
-        
-        if verbosity>3:
+
+        if verbosity > 3:
             if not os.path.exists("log"):
                 os.mkdir("log")
-            with open('log/log.csv', 'w', newline='') as csvfile:
-                csv.writer(csvfile, delimiter=',').writerow(["it"] + setting.U)
+            with open("log/log.csv", "w", newline="") as csvfile:
+                csv.writer(csvfile, delimiter=",").writerow(["it"] + setting.U)
 
         for idx in range(maxiter):
             if verbosity > 0:
@@ -423,11 +423,13 @@ class approx:
             if verbosity > 0:
                 for i in setting.U:
                     print("bw in", str(i), ":", bw[i])
-                #print("bw in iteration", str(idx + 1), "are", str(bw))
+                # print("bw in iteration", str(idx + 1), "are", str(bw))
                 print()
             if verbosity > 3:
-                with open('log/log.csv', 'a', newline='') as csvfile:
-                    csv.writer(csvfile, delimiter=',').writerow(["bw in it"+str(idx+1)] + [str(bw[i]) for i in setting.U])
+                with open("log/log.csv", "a", newline="") as csvfile:
+                    csv.writer(csvfile, delimiter=",").writerow(
+                        ["bw in it" + str(idx + 1)] + [str(bw[i]) for i in setting.U]
+                    )
             self.approximate(
                 lam=lam,
                 solver=solver,
@@ -440,22 +442,33 @@ class approx:
             D, t = self.estimate_rates(lam=lam, verbosity=verbosity)
             if verbosity > 1:
                 for i in setting.U:
-                    print("estimated rates for", str(i), ": D = ", str(D[i]), "and t = ", str(t[i]) )
+                    print(
+                        "estimated rates for",
+                        str(i),
+                        ": D = ",
+                        str(D[i]),
+                        "and t = ",
+                        str(t[i]),
+                    )
                 print()
-                
-                #print(
+
+                # print(
                 #    "estimated rates in iteration",
                 #    str(idx + 1),
                 #    "are D =",
                 #    str(D),
                 #    "and t =",
                 #    str(t),
-                #)
+                # )
             if verbosity > 3:
-                with open('log/log.csv', 'a', newline='') as csvfile:
-                    wr = csv.writer(csvfile, delimiter=',')
-                    wr.writerow(["D in it"+str(idx+1)] + [str(D[i]) for i in setting.U])
-                    wr.writerow(["t in it"+str(idx+1)] + [str(t[i]) for i in setting.U])
+                with open("log/log.csv", "a", newline="") as csvfile:
+                    wr = csv.writer(csvfile, delimiter=",")
+                    wr.writerow(
+                        ["D in it" + str(idx + 1)] + [str(D[i]) for i in setting.U]
+                    )
+                    wr.writerow(
+                        ["t in it" + str(idx + 1)] + [str(t[i]) for i in setting.U]
+                    )
         return D, t
 
     def autoapproximate(
@@ -567,9 +580,11 @@ class approx:
         Xt = transformX(X, setting.basis)
 
         if self.getSetting(settingnr).basis == "per":
-            values = np.zeros((Xt.shape[0], len(self.setting[settingnr].U)), "complex")
+            values = np.zeros(
+                (Xt.shape[0], len(self.getSetting(settingnr).U)), "complex"
+            )
         else:
-            values = np.zeros((Xt.shape[0], len(self.setting[settingnr].U)), "float")
+            values = np.zeros((Xt.shape[0], len(self.getSetting(settingnr).U)), "float")
 
         trafo = GroupedTransform(
             system=gt_systems[setting.basis],

{pyanovaapprox-2.0.2 → pyanovaapprox-2.0.3}/src/pyANOVAapprox/bandwidth.py

@@ -5,11 +5,11 @@ def getfcu(ghat, u):
     idx = [s.u for s in ghat.settings].index(u)
     bws = ghat.settings[idx].bandwidths
 
-    #fcu = ghat[u].reshape(bws[::-1] - 1)
-    #fcu = np.permute_dims(fcu, range(len(bws))[::-1])
+    # fcu = ghat[u].reshape(bws[::-1] - 1)
+    # fcu = np.permute_dims(fcu, range(len(bws))[::-1])
     fcu = ghat[u].reshape(bws - 1)
     fcu = np.permute_dims(fcu, range(len(bws)))
-    
+
     return fcu
 
 
@@ -37,7 +37,7 @@ def compute_bandwidth(B, D, t):
     us = set(D.keys()) - {()}
     bw = {u: [6] * len(u) for u in us}
     bw[()] = []
-    
+
     minfreqs = sum(math.prod((bw[u][j] - 1) for j in range(len(u))) for u in us)
     if B < minfreqs:
         raise ValueError(f"Budget too small: {B} < {minfreqs}")
@@ -123,19 +123,19 @@ def estimate_rates(self, lam, settingnr=None, verbosity=0):
 
     mcl = np.exp(most_common_value(np.log(abs(self.getFc(settingnr)[lam].data))))
     threshold = 100 * mcl**2
-    
-    if verbosity>5:
-        if not os.path.exists(os.path.join("log","figures")):
-            os.mkdir(os.path.join("log","figures"))
+
+    if verbosity > 5:
+        if not os.path.exists(os.path.join("log", "figures")):
+            os.mkdir(os.path.join("log", "figures"))
         num = 0
-        
+
     system = self.getTrafo(settingnr).system
 
     for u in us:
         if len(u) == 0:
             continue
 
-        if verbosity>5:
+        if verbosity > 5:
             fig, ax = plt.subplots()
             ax.set_xscale("log")
             ax.set_yscale("log")
@@ -154,7 +154,7 @@ def estimate_rates(self, lam, settingnr=None, verbosity=0):
                 None,
             )
 
-            if verbosity>5:
+            if verbosity > 5:
 
                 y = np.cumsum(axissum[::-1])[::-1]
                 ax.plot(
@@ -174,7 +174,7 @@ def estimate_rates(self, lam, settingnr=None, verbosity=0):
                 D[u][j] = Duj
                 t[u][j] = -tuj / 2
 
-                if verbosity>5:
+                if verbosity > 5:
                     x = np.arange(1, idx + 1)
                     ax.plot(
                         x,
@@ -182,12 +182,18 @@ def estimate_rates(self, lam, settingnr=None, verbosity=0):
                         linewidth=2,
                         #                        color=j
                     )
-        if verbosity>5:
-            #plt.figure(figsize=(12, 9))
-            #for ax in ps:
+        if verbosity > 5:
+            # plt.figure(figsize=(12, 9))
+            # for ax in ps:
             #    plt.sca(ax)
-            fig.savefig(os.path.join("log","figures", str(num).strip()+ "_rates_" + str(u).strip() + ".png"))
+            fig.savefig(
+                os.path.join(
+                    "log",
+                    "figures",
+                    str(num).strip() + "_rates_" + str(u).strip() + ".png",
+                )
+            )
             num = num + 1
-            plt.close(fig) 
+            plt.close(fig)
 
     return D, t

{pyanovaapprox-2.0.2 → pyanovaapprox-2.0.3}/src/pyANOVAapprox/__init__.py

@@ -1,4 +1,6 @@
+import csv
 import math
+import os
 import threading
 from math import acos, isnan
 
@@ -8,8 +10,6 @@ from pyGroupedTransforms import *
 from scipy.optimize import bisect
 from scipy.sparse.linalg import lsqr
 from scipy.special import erf
-import csv
-import os
 
 # from sklearn.metrics import roc_auc_score