pyANOVAapprox 0.2.0__tar.gz → 0.2.1__tar.gz

{pyanovaapprox-0.2.0 → pyanovaapprox-0.2.1}/PKG-INFO

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

{pyanovaapprox-0.2.0 → pyanovaapprox-0.2.1}/pyproject.toml

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

{pyanovaapprox-0.2.0 → pyanovaapprox-0.2.1}/simpleTest/examplePeriodic.py

@@ -39,27 +39,28 @@ num = np.sum([math.comb(6, k) for k in np.arange(1, 2 + 1)])  # number of used s
 b = M / (
     math.log10(M) * num
 )  # number for the number of frequencies if we use logarithmic oversampling and distribute it evenly to all subsets
-bw = np.array(
-    [math.floor(b / 2) * 2, math.floor(math.sqrt(b) / 2) * 2]
-)  # bandwidths (use even numbers)
+bw = [
+    math.floor(b / 2) * 2,
+    math.floor(math.sqrt(b) / 2) * 2,
+]  # bandwidths (use even numbers)
 # Use all subsets up to ds and use bw[1] many frequences in the the subsets with one element, b[2]^2 many for subsets with two elements and so on
 #
 ########### Variant 2:
 # used subsets:
-# U = [Int[], [1], [2], [3], [4], [5], [6],
-#     [1, 2], [1, 3], [1, 4], [1, 5], [1, 6], [2, 3], [2, 4], [2, 5], [2, 6], [3, 4], [3, 5], [3, 6], [4, 5], [4, 6], [5, 6]]
+# U = [(), (0,), (1,), (2,), (3,), (4,), (5,),
+#      (0, 1), (0, 2), (0, 3), (0, 4), (0, 5), (1, 2), (1, 3), (1, 4), (1, 5), (2, 3), (2, 4), (2, 5), (3, 4), (3, 5), (4, 5)]
 # Bandwidths for these subsets:
-# N = [[0]  , 100, 100, 100, 100, 100, 100,
-#         10,     10,     10,     10,     10,     10,     10,     10,     10,     10,     10,     10,     10,     10,     10]
+# N = [0 ,  100,  100,  100,  100,  100,  100,
+#          10,     10,     10,     10,     10,     10,     10,     10,     10,     10,     10,     10,     10,     10,     10]
 # Use the subsets U with the bandwiths N. The bandwith N[i] corresponds to the subset U[i]. For subsets with more then one direction is the same bandwidth in all directions used
 #
 ########### Variant 3:
 # used subsets:
-# U = [Int[],   [1],   [2],   [3],   [4],   [5],   [6],
-#      [ 1, 2],[ 1, 3],[ 1, 4],[ 1, 5],[ 1, 6],[ 2, 3],[ 2, 4],[ 2, 5],[ 2, 6],[ 3, 4],[ 3, 5],[ 3, 6],[ 4, 5],[ 4, 6],[ 5, 6]]
+# U = [(),   (0,),   (1,),   (2,),   (3,),   (4,),   (5,),
+#        (0, 1),  (0, 2),  (0, 3),  (0, 4),  (0, 5),  (1, 2),  (1, 3),  (1, 4),  (1, 5),  (2, 3),  (2, 4),  (2, 5),  (3, 4),  (3, 5),  (4, 5)]
 # Bandwidths for these subsets:
-# N = [Int[], [100], [100], [100], [100], [100], [100],
-#      [10,10],[10,10],[10,10],[10,10],[10,10],[10,10],[10,10],[10,10],[10,10],[10,10],[10,10],[10,10],[10,10],[10,10],[10,10]]
+# N = [(), (100,), (100,), (100,), (100,), (100,), (100,),
+#      (10,10,),(10,10,),(10,10,),(10,10,),(10,10,),(10,10,),(10,10,),(10,10,),(10,10,),(10,10,),(10,10,),(10,10,),(10,10,),(10,10,),(10,10,)]
 # Use the subsets U with the bandwiths N. The bandwith N[i] corresponds to the subset U[i]. The bandwidth N[i][j] corresponds to the direction U[i][j]
 
 lambdas = np.array([0.0, 1.0])  # used regularisation parameters λ
@@ -155,9 +156,9 @@ print(
 Umask = np.append(np.array([True]), gsis > 1e-2)
 U = [ads.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 = np.array(
-    [math.floor(bws ** (1 / max(1, len(u))) / 2) * 2 for u in U]
-)  # distribute the frequencies evenly and make them even
+N = [
+    math.floor(bws ** (1 / max(1, len(u))) / 2) * 2 for u in U
+]  # distribute the frequencies evenly and make them even
 N[0] = 0
 
 a = ANOVAapprox.approx(
@@ -183,27 +184,21 @@ print("mse = " + str(mse_min))
 
 # In the following we plot the real and the approximated anova term for the subset u=[3]
 
-y_eval_anova = a.evaluateANOVAterms(X=X_test, lam=λ_min) # evaluate all of the ANOVA terms 
-pos = a.U.index((3,)) # find the index for the subset u=[3]
+y_eval_anova = a.evaluateANOVAterms(
+    X=X_test, lam=λ_min
+)  # evaluate all of the ANOVA terms
+pos = a.U.index((3,))  # find the index for the subset u=[3]
 y_eval_anova_3 = y_eval_anova.T[pos]
 
 perm = np.argsort(X_test.T[3])
 X_plot = X_test.T[3][perm]
 y_eval_anova_3_plot = np.real(y_eval_anova_3[perm])
-y_anova_3_plot = -np.exp(np.sin(2*np.pi*X_plot))+1.26607
+y_anova_3_plot = -np.exp(np.sin(2 * np.pi * X_plot)) + 1.26607
 
 plt.figure()
-plt.plot(
-    X_plot,
-    y_eval_anova_3_plot,
-    label="approximation"
-)
-plt.plot(
-    X_plot,
-    y_anova_3_plot,
-    label="ANOVA term" # ... "ANOVA term"]
-)
-plt.title("Approximation of the ANOVA term 4") # title = "..."
-plt.legend() # Zeigt die Labels/Legende an
-plt.grid(True, linestyle='--', alpha=0.7)
+plt.plot(X_plot, y_eval_anova_3_plot, label="approximation")
+plt.plot(X_plot, y_anova_3_plot, label="ANOVA term")  # ... "ANOVA term"]
+plt.title("Approximation of the ANOVA term 4")  # title = "..."
+plt.legend()  # Zeigt die Labels/Legende an
+plt.grid(True, linestyle="--", alpha=0.7)
 plt.show()

{pyanovaapprox-0.2.0 → pyanovaapprox-0.2.1}/src/pyANOVAapprox/approx.py

@@ -86,7 +86,7 @@ class approx:
         ds=None,
     ):
 
-        if (N == None or len(N) == 0):
+        if N == None or len(N) == 0:
             ValueError("please define N")
 
         if (
@@ -94,8 +94,8 @@ class approx:
         ):  # setting U   #approx(X::Matrix{Float64}, y::Union{Vector{ComplexF64},Vector{Float64}}, ds::Int, N::Vector{Int}, basis::String = "cos"; classification::Bool = false, basis_vect::Vector{String} = Vector{String}([]), fastmult::Bool = classification ? true : false,)
             U = get_superposition_set(X.shape[1], ds)
 
-        if (
-            not isinstance(N[0], list)
+        if not isinstance(
+            N[0], tuple
         ):  # setting N    #approx( X::Matrix{Float64}, y::Union{Vector{ComplexF64},Vector{Float64}}, U::Vector{Vector{Int}}, N::Vector{Int}, basis::String = "cos"; classification::Bool = false, basis_vect::Vector{String} = Vector{String}([]), fastmult::Bool = classification ? true : false,)
             ds = max(len(u) for u in U)
 
@@ -116,9 +116,9 @@ class approx:
                     bws[i] = np.array([bw[i]] * len(u), np.int32)
 
             N = bws
-        
+
         else:
-            N = [np.array(u, dtype = np.int32) for u in N]
+            N = [np.array(u, dtype=np.int32) for u in N]
 
         if basis_vect is None:
             basis_vect = []