Merge remote-tracking branch 'origin/master'

2025-05-04 04:00:46 +02:00 · 2019-12-06 10:44:29 -05:00 · 2019-12-06 10:44:29 -05:00 · b60610d9a7
commit b60610d9a7
parent 217f94ef89 baf49a3c7a
16 changed files with 70057 additions and 50505 deletions
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx2-Mag)-LeNet)-150epochs(dataug:0)-1in_it-0.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx2-Mag)-LeNet)-150epochs(dataug:0)-1in_it-0.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx2-Mag)-LeNet)-150epochs(dataug:0)-1in_it-1.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx2-Mag)-LeNet)-150epochs(dataug:0)-1in_it-1.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx2-Mag)-LeNet)-150epochs(dataug:0)-1in_it-2.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx2-Mag)-LeNet)-150epochs(dataug:0)-1in_it-2.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-Mag)-LeNet)-150epochs(dataug:0)-1in_it-0.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-Mag)-LeNet)-150epochs(dataug:0)-1in_it-0.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-Mag)-LeNet)-150epochs(dataug:0)-1in_it-1.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-Mag)-LeNet)-150epochs(dataug:0)-1in_it-1.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-Mag)-LeNet)-150epochs(dataug:0)-1in_it-2.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-Mag)-LeNet)-150epochs(dataug:0)-1in_it-2.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-0.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-0.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-1.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-1.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-2.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx3-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-2.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-Mag)-LeNet)-150epochs(dataug:0)-1in_it-0.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-Mag)-LeNet)-150epochs(dataug:0)-1in_it-0.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-Mag)-LeNet)-150epochs(dataug:0)-1in_it-1.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-Mag)-LeNet)-150epochs(dataug:0)-1in_it-1.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-Mag)-LeNet)-150epochs(dataug:0)-1in_it-2.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-Mag)-LeNet)-150epochs(dataug:0)-1in_it-2.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-0.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-0.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-1.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-1.json
--- a/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-2.json
+++ b/higher/res/brutus-tests/log/Aug_mod(Data_augV5(Mix1.0-14TFx4-MagFxSh)-LeNet)-150epochs(dataug:0)-1in_it-2.json
--- a/higher/test_brutus.py
+++ b/higher/test_brutus.py
@ -124,4 +124,4 @@ if __name__ == "__main__":

                            #plot_resV2(log, fig_name=res_folder+filename, param_names=tf_names)
                            print('-'*9)
-    '''
+    '''