pyANOVAapprox 0.2.2__tar.gz → 1.0.0__tar.gz

{pyanovaapprox-0.2.2 → pyanovaapprox-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyANOVAapprox
-Version: 0.2.2
+Version: 1.0.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.2.2 → pyanovaapprox-1.0.0}/pyproject.toml

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

{pyanovaapprox-0.2.2 → pyanovaapprox-1.0.0}/simpleTest/exampleWavelet.py

@@ -84,7 +84,7 @@ print("Total number of used parameters = " + str(len(anova_model.fc[lambdas[0]].
 gsis = ANOVAapprox.get_GSI(
     anova_model, 0.0
 )  # calculates indices for importance of terms (gsis is vector, with indices belonging to terms in anova_model.U)
-# gsis_as_dict = ANOVAapprox.get_GSI(anova_model,0.0,dict=true)
+gsis_as_dict = ANOVAapprox.get_GSI(anova_model, 0.0, dict=true)
 
 y_min_calc = 10 ** (np.min(np.log10(gsis)) - 0.5)
 label = list(anova_model.U[1:])

{pyanovaapprox-0.2.2 → pyanovaapprox-1.0.0}/src/pyANOVAapprox/__init__.py

@@ -10,26 +10,6 @@ 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
-    """
-    get_superposition_set( d::Int, ds::Int )::Vector{Vector{Int}}
-
-    This function returns ``U^{(d,ds)} = \{  \pmb u \subset \{1,2,\dots,d\} : |\pmb u| \leq ds \}``.
-    """
-    nset = [[j] for j in range(d)]
-    returnset = [[]] + nset
-    for i in range(ds - 1):
-        nextnset = []
-        for s in nset:
-            for j in range(d):
-                if s[-1] < j:
-                    nextnset.append(s + [j])
-        returnset = returnset + nextnset
-        nset = nextnset
-
-    return [tuple(item) for item in returnset]
-
-
 def bisection(l, r, fun, maxiter=1000):
     lval = fun(l)
     rval = fun(r)

{pyanovaapprox-0.2.2 → pyanovaapprox-1.0.0}/src/pyANOVAapprox/approx.py

@@ -1,5 +1,3 @@
-# from pyGroupedTransforms.GroupedTransform import *  # TODO: Kann wahrscheinlich weg sobald in pyGroupedTransform GreoupedTransform exportiert wird
-
 from pyANOVAapprox import *
 from pyANOVAapprox.fista import *
 

{pyanovaapprox-0.2.2 → pyanovaapprox-1.0.0}/src/pyANOVAapprox/errors.py

@@ -156,6 +156,43 @@ def _acc(a, lam, X, y):  # helpfunction for get_acc
     return np.sum(np.sign(y_eval) == y) / len(y) * 100.0
 
 
+def auc_score(y_true, y_pred_proba):
+    combined_data = sorted(zip(y_pred_proba, y_true), key=lambda x: x[0], reverse=True)
+
+    P = sum(y_true)
+    N = len(y_true) - P
+
+    tp, fp = 0, 0
+    tpr, fpr = 0, 0
+    auc = 0.0
+
+    for i in range(len(combined_data)):
+        score, label = combined_data[i]
+
+        current_tp = 0
+        current_fp = 0
+        j = i
+        while j < len(combined_data) and combined_data[j][0] == score:
+            if combined_data[j][1] == 1:
+                current_tp += 1
+            else:
+                current_fp += 1
+            j += 1
+
+        i = j - 1
+
+        tp += current_tp
+        fp += current_fp
+
+        new_tpr = tp / P
+        new_fpr = fp / N
+
+        auc += (new_fpr - fpr) * (tpr + new_tpr) * 0.5
+
+        tpr, fpr = new_tpr, new_fpr
+    return auc
+
+
 def get_acc(a, X=None, y=None, lam=None):
 
     if lam is not None:
@@ -164,26 +201,24 @@ 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
-#    if y is None:
-#        y = a.y
-#
-#    if X is not None:
-#        y_eval = a.evaluate(lam, X)
-#    else:
-#        y_eval = a.evaluate(lam)
-#
-#    y_sc = (y_eval - np.min(y_eval)) / (np.max(y_eval) - np.min(y_eval))
-#    y = np.where(y == -1.0, 0, y)
-#    y = np.where(y == 1.0, 1, y)
-#    y_int = y.astype(np.int64)
-#
-#    return roc_auc_score(y_int, y_sc)
-
-
-def get_auc(
-    a, X=None, y=None, lam=None
-):  # gab einen Error in julia und in Python, als ich es mit komplexen werten getestet habe...
+def _auc(a, lam, X, y):
+    if y is None:
+        y = a.y
+
+    if X is not None:
+        y_eval = a.evaluate(lam, X)
+    else:
+        y_eval = a.evaluate(lam)
+
+    y_sc = (y_eval - np.min(y_eval)) / (np.max(y_eval) - np.min(y_eval))
+    y = np.where(y == -1.0, 0, y)
+    y = np.where(y == 1.0, 1, y)
+    y_int = y.astype(np.int64)
+
+    return auc_score(y_int, y_sc)
+
+
+def get_auc(a, X=None, y=None, lam=None):
 
     if lam is not None:
         return _auc(a, lam, X, y)

{pyanovaapprox-0.2.2 → pyanovaapprox-1.0.0}/src/pyANOVAapprox/fista.py

@@ -1,5 +1,3 @@
-# from pyGroupedTransforms.GroupedCoefficients import *  # TODO: Kann wahrscheinlich weg sobald in pyGroupedTransform GreoupedTransform exportiert wird
-
 from pyANOVAapprox import *