Revert "Revert "set up for experiment 9""

This reverts commit bafb085.

dagcnn_torch/abstract_conv_gene.py

@@ -14,7 +14,7 @@ def copy(self):
         return self.__class__(self.input_indices, self._output_feature_depth, self._kernel_size)
 
     def _class_specific_mutations(self):
-        return [ChooseOutputFeatureDepthMutation]
+        return [ChooseKernelSizeMutation, ChooseOutputFeatureDepthMutation]
 
     @classmethod
     def make_random(cls, index):

dagcnn_torch/conv_gene.py

@@ -21,4 +21,4 @@ def arity(cls):
 
     @classmethod
     def _valid_kernel_sizes(cls):
-        return([3])
+        return([1, 3])

dagcnn_torch/dep_sep_conv_gene.py

@@ -21,6 +21,6 @@ def arity(cls):
 
     @classmethod
     def _valid_kernel_sizes(cls):
-        return([3])
+        return([3, 5])
 
 

dagcnn_torch/gene.py

@@ -46,7 +46,7 @@ def _get_input_shape(self, input_index, model_input_shape, layer_output_shapes):
             return layer_output_shapes[input_index]
 
     def _valid_mutations(self):
-        basic_mutations = [InsertionMutation, ChooseInputMutation]
+        basic_mutations = [DeletionMutation, InsertionMutation, ChooseInputMutation]
         return basic_mutations + self._class_specific_mutations()
 
     def _class_specific_mutations(self):

dagcnn_torch/gene_picker.py

@@ -12,4 +12,4 @@ def pick(self):
         return choice(self._instantiable_classes())
 
     def _instantiable_classes(self):
-        return [ConvGene, DepSepConvGene, MaxPoolGene, SumGene]
+        return [ConvGene, DepSepConvGene, AvgPoolGene, MaxPoolGene, SumGene, CatGene]

evolve_cifar_classifiers.py

@@ -30,7 +30,7 @@ def saynow(text):
 
 grid_search = GridSearch(
     [
-        [['min_n_genes', 'max_n_genes'], [1, 1]],
+        [['min_n_genes', 'max_n_genes'], [10, 20]],
         [['elitism_fraction'], [0.05], [0.1], [0.2], [0.4]],
         [['mutation_probability'], [0.05], [0.1], [0.2], [0.4]],
         [['mean_threshold', 'std_threshold'], [0.01, 0.001]]