fixes in code

Author: Tomasz Latkowski

config/experiments/simple_experiment.ini

@@ -1,6 +1,6 @@
 [SELECTION]
 num_features = 100
-method = 'fisher'
+method = fisher
 
 [CLASSIFIER]
-hidden_sizes = 20, 10
+hidden_sizes = 20

experiments/experiment.py

@@ -14,10 +14,11 @@
 
 class Experiment:
 
-    def __init__(self, experiment_config, num_features, num_instances, classifier, dataset):
+    def __init__(self, experiment_config, num_instances, classifier, dataset):
 
         selection_method = methods[experiment_config['SELECTION']['method']]
-        num_features = experiment_config['SELECTION']['num_features']
+        num_features = int(experiment_config['SELECTION']['num_features'])
+        hidden_sizes = int(experiment_config['CLASSIFIER']['hidden_sizes'])
 
         with tf.name_scope('selection'):
             self.selection_wrapper = SelectionWrapper(dataset,
@@ -26,4 +27,4 @@ def __init__(self, experiment_config, num_features, num_instances, classifier, d
                                                       num_features=num_features)
 
         with tf.name_scope('classifier'):
-            self.clf = NeuralNetworkClassifier(num_features, 20)
+            self.clf = classifier(num_features, hidden_sizes)

requirements.txt

@@ -1,5 +1,17 @@
-tqdm==4.15.0
-pandas==0.22.0
-numpy==1.14.1
+bleach==1.5.0
+enum34==1.1.6
+html5lib==0.9999999
+Markdown==2.6.11
+numpy==1.13.3
+pandas==0.19.0
+protobuf==3.5.1
+python-dateutil==2.6.1
+pytz==2018.3
+scikit-learn==0.19.1
+scipy==1.0.0
+six==1.11.0
+sklearn==0.0
 tensorflow==1.4.0
-scikit_learn==0.19.1
+tensorflow-tensorboard==0.4.0
+tqdm==4.19.6
+Werkzeug==0.14.1

run.py

@@ -4,14 +4,14 @@
 import tensorflow as tf
 from tqdm import tqdm
 
+from experiments.classifier import NeuralNetworkClassifier
 from experiments.dataset import Dataset
 from experiments.experiment import Experiment
 from utils.log_saver import LogSaver
 
 
 def run_experiment(experiment_config):
     dataset = Dataset('data/autism.tsv')
-
     num_epochs = 1000
     eval_every = 10
 
@@ -25,7 +25,7 @@ def run_experiment(experiment_config):
 
         with tf.Graph().as_default() as graph:
 
-            experiment = Experiment(experiment_config, num_instances, None, data_train_fold)
+            experiment = Experiment(experiment_config, num_instances, NeuralNetworkClassifier, data_train_fold)
 
             with tf.Session() as session:
 
@@ -64,7 +64,7 @@ def main():
 
     args = parser.parse_args()
     experiment_config = configparser.ConfigParser()
-    experiment_config.read('config/{}.ini'.format(args.experiment))
+    experiment_config.read('config/experiments/{}.ini'.format(args.experiment))
 
     run_experiment(experiment_config)