diff --git a/code/setups/fixpoint-density.py b/code/setups/fixpoint-density.py index f7ca465..3751788 100644 --- a/code/setups/fixpoint-density.py +++ b/code/setups/fixpoint-density.py @@ -36,7 +36,7 @@ if __name__ == '__main__': net_generators = [] for activation in ['linear', 'sigmoid', 'relu']: net_generators += [lambda activation=activation: WeightwiseNeuralNetwork(width=2, depth=2).with_keras_params(activation=activation, use_bias=False)] - net_generators += [lambda activation=activation: AggregatingNeuralNetwork(aggregates=4, width=2, depth=2).with_keras_params(activation=activation, use_bias=False)] + # net_generators += [lambda activation=activation: AggregatingNeuralNetwork(aggregates=4, width=2, depth=2).with_keras_params(activation=activation, use_bias=False)] # net_generators += [lambda activation=activation: FFTNeuralNetwork(aggregates=4, width=2, depth=2).with_keras_params(activation=activation, use_bias=False)] # net_generators += [lambda activation=activation: RecurrentNeuralNetwork(width=2, depth=2).with_keras_params(activation=activation, use_bias=False)] all_counters = [] diff --git a/code/setups/learn_from_soup.py b/code/setups/learn_from_soup.py index c002b1c..c925707 100644 --- a/code/setups/learn_from_soup.py +++ b/code/setups/learn_from_soup.py @@ -61,15 +61,15 @@ def count(counters, soup, notable_nets=[]): with SoupExperiment('learn-from-soup') as exp: exp.soup_size = 10 - exp.soup_life = 1000 - exp.trials = 20 + exp.soup_life = 100 + exp.trials = 10 exp.learn_from_severity_values = [10 * i for i in range(11)] exp.epsilon = 1e-4 net_generators = [] for activation in ['sigmoid']: #['linear', 'sigmoid', 'relu']: for use_bias in [False]: net_generators += [lambda activation=activation, use_bias=use_bias: WeightwiseNeuralNetwork(width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] - net_generators += [lambda activation=activation, use_bias=use_bias: AggregatingNeuralNetwork(aggregates=4, width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] + # net_generators += [lambda activation=activation, use_bias=use_bias: AggregatingNeuralNetwork(aggregates=4, width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] # net_generators += [lambda activation=activation, use_bias=use_bias: RecurrentNeuralNetwork(width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] all_names = [] diff --git a/code/setups/mixed-self-fixpoints.py b/code/setups/mixed-self-fixpoints.py index c8564fb..1d018b5 100644 --- a/code/setups/mixed-self-fixpoints.py +++ b/code/setups/mixed-self-fixpoints.py @@ -61,7 +61,7 @@ if __name__ == '__main__': for activation in ['linear']: # , 'sigmoid', 'relu']: for use_bias in [False]: net_generators += [lambda activation=activation, use_bias=use_bias: WeightwiseNeuralNetwork(width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] - net_generators += [lambda activation=activation, use_bias=use_bias: AggregatingNeuralNetwork(aggregates=4, width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] + # net_generators += [lambda activation=activation, use_bias=use_bias: AggregatingNeuralNetwork(aggregates=4, width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] # net_generators += [lambda activation=activation, use_bias=use_bias: FFTNeuralNetwork(aggregates=4, width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] # net_generators += [lambda activation=activation, use_bias=use_bias: RecurrentNeuralNetwork(width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] diff --git a/code/setups/mixed-soup.py b/code/setups/mixed-soup.py index 70d3f04..998fde4 100644 --- a/code/setups/mixed-soup.py +++ b/code/setups/mixed-soup.py @@ -54,7 +54,7 @@ def count(counters, soup, notable_nets=[]): with Experiment('mixed-self-fixpoints') as exp: - exp.trials = 100 + exp.trials = 10 exp.soup_size = 10 exp.soup_life = 5 exp.trains_per_selfattack_values = [10 * i for i in range(11)] diff --git a/code/setups/training-fixpoints.py b/code/setups/training-fixpoints.py index c44bc80..5467beb 100644 --- a/code/setups/training-fixpoints.py +++ b/code/setups/training-fixpoints.py @@ -40,7 +40,7 @@ if __name__ == '__main__': for activation in ['linear']: # , 'sigmoid', 'relu']: for use_bias in [False]: net_generators += [lambda activation=activation, use_bias=use_bias: WeightwiseNeuralNetwork(width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] - net_generators += [lambda activation=activation, use_bias=use_bias: AggregatingNeuralNetwork(aggregates=4, width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] + # net_generators += [lambda activation=activation, use_bias=use_bias: AggregatingNeuralNetwork(aggregates=4, width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] # net_generators += [lambda activation=activation, use_bias=use_bias: RecurrentNeuralNetwork(width=2, depth=2).with_keras_params(activation=activation, use_bias=use_bias)] all_counters = [] all_notable_nets = []