Exception Optimierungsverfahren eingebaut

main.py

@@ -21,6 +21,8 @@ def run_cross_validation():
 
     # Initialisieren der KNN-Modellbau Eigenschaften
     for optimization_method in Optimierungsverfahren:
+        if optimization_method.name in config['knn']['exception_optimization_method']:
+            continue
         for activation_function_2 in Aktivierungsfunktion:
             if activation_function_2.name in config['knn']['exception_activation_funktion_1']:
                 continue

ressources/config/config.yaml

@@ -5,14 +5,29 @@ bilder:
   knn_path: "assets/Bilder/AktuelleTrainingsUndTestdaten/"
 knn:
   epochs: 10
+  exception_optimization_method:
+    ['SGD']
   exception_activation_funktion_1:
     ['ReLU']
   ignoreKnnCombinations:
     [
       ['SGD','ReLU','sigmoid'],
       ['SGD','sigmoid','sigmoid'],
+      # Adam Complete List
       ['Adam','ReLU','sigmoid'],
-      ['Adam','sigmoid','sigmoid']
+      ['Adam','sigmoid','sigmoid'],
+      # master_1
+      ['Adam','tanh','sigmoid'],
+      ['Adam','softmax','sigmoid'],
+      ['Adam','sigmoid','tanh' ],
+      ['Adam','softmax','tanh' ],
+      ['Adam','ReLU','tanh' ],
+      # master_2
+      ['Adam','tanh','tanh'],
+      ['Adam','sigmoid','softmax'],
+      ['Adam','tanh','softmax'],
+      ['Adam','ReLU','softmax'],
+      ['Adam','softmax','softmax']
     ]
 result:
   plot_path: "ressources/results/plot/"