pyANOVAapprox 0.1.2__tar.gz → 0.2.0__tar.gz

{pyanovaapprox-0.1.2 → pyanovaapprox-0.2.0}/.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: ['3.12']  # Specify the Python versions you want to test against
+        python-version: ['3.11', '3.12']  # Specify the Python versions you want to test against
         os: [ubuntu-latest, windows-latest]
     name: Python ${{ matrix.python-version }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}

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

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

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

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

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

@@ -181,19 +181,29 @@ print("mse = " + str(mse_min))
 # y_approx = a.evaluate(lam=λ_min) # evaluate the approximation at the training points for the regularisation λ_min
 # y_approx = a.evaluate(X=X_test, lam=λ_min) # evaluate the approximation at the points X_test for the regularisation λ_min
 
-# In the following we plot the real and the approximated anova term for the subset u=[4]
+# 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)
+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]
 
-# y_eval_anova = ANOVAapprox.evaluateANOVAterms(a, X_test, λ_min) # evaluate all of the ANOVA terms
-# pos = findfirst(==([4]), a.U) # find the index for the subset u=[4]
-# y_eval_anova_4 = y_eval_anova[:,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
 
-# perm = sortperm(X_test[4,:])
-# X_plot = X_test[4,perm]
-# y_eval_anova_4_plot = real.(y_eval_anova_4[perm])
-# y_anova_4_plot = -exp.(sin.(2 .* pi .* X_plot)) .+ 1.26607
-
-# p3 = Plots.plot(X_plot,[y_eval_anova_4_plot,y_anova_4_plot], reuse = false, title = "Approximation of the ANOVA term 4", labels = ["approximation" "ANOVA term"])
-
-# display(p1); display(p2); p3
+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.show()

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

@@ -50,7 +50,7 @@ def get_orderDependentBW(U, N):
         else:
             N_bw[i] = N[len(U[i]) - 1]
 
-    return np.array(N_bw, "int32")
+    return N_bw
 
 
 ### approx:
@@ -78,7 +78,7 @@ class approx:
         X,
         y,
         U=None,
-        N=np.array([]),
+        N=None,
         basis="cos",
         classification=False,
         basis_vect=[],
@@ -86,7 +86,7 @@ class approx:
         ds=None,
     ):
 
-        if len(N) == 0:
+        if (N == None or len(N) == 0):
             ValueError("please define N")
 
         if (
@@ -95,7 +95,7 @@ class approx:
             U = get_superposition_set(X.shape[1], ds)
 
         if (
-            N.ndim == 1
+            not isinstance(N[0], list)
         ):  # 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)
 
@@ -111,11 +111,14 @@ class approx:
             for i in range(len(U)):
                 u = U[i]
                 if len(u) == 0:
-                    bws[i] = np.array([0] * len(u), "int32")  # passt das so?
+                    bws[i] = np.array([0] * len(u), np.int32)
                 else:
-                    bws[i] = np.array([bw[i]] * len(u), "int32")
+                    bws[i] = np.array([bw[i]] * len(u), np.int32)
 
             N = bws
+        
+        else:
+            N = [np.array(u, dtype = np.int32) for u in N]
 
         if basis_vect is None:
             basis_vect = []

{pyanovaapprox-0.1.2 → pyanovaapprox-0.2.0}/tests/cheb_fista.py

@@ -14,7 +14,7 @@ d = 8
 ds = 2
 M = 1000  # eigentlich 10000
 max_iter = 50
-bw = np.array([20, 4], "int32")
+bw = [20, 4]
 lambdas = np.array([0.0, 1.0])
 
 (X, y) = TestFunctionCheb.generateData(M)

{pyanovaapprox-0.1.2 → pyanovaapprox-0.2.0}/tests/cheb_lsqr.py

@@ -14,7 +14,7 @@ d = 8
 ds = 2
 M = 1000  # eigentlich 10000
 max_iter = 50
-bw = np.array([20, 4], "int32")
+bw = [20, 4]
 lambdas = np.array([0.0, 1.0])
 
 (X, y) = TestFunctionCheb.generateData(M)

{pyanovaapprox-0.1.2 → pyanovaapprox-0.2.0}/tests/per_fista.py

@@ -14,7 +14,7 @@ d = 6
 ds = 2
 M = 10000
 max_iter = 50
-bw = np.array([100, 10], "int32")
+bw = [100, 10]
 lambdas = np.array([0.0, 1.0])
 
 rng = np.random.default_rng()

{pyanovaapprox-0.1.2 → pyanovaapprox-0.2.0}/tests/per_lsqr.py

@@ -16,7 +16,7 @@ d = 6
 ds = 2
 M = 10000  # should be 10000
 max_iter = 50
-bw = np.array([100, 10], "int32")
+bw = [100, 10]
 lambdas = np.array([0.0, 1.0])
 
 rng = np.random.default_rng()