Updates needed to evaluate 10-fold

Author: jonnor

microesc/report.py

@@ -84,7 +84,7 @@ def print_accuracies(accs, title):
 
 def get_accuracies(confusions):
     accs = [ cm_accuracy(confusions[f]) for f in range(0, len(confusions)) ]
-    assert len(accs) == 9, len(accs) 
+    assert len(accs) == 10, len(accs) 
     return pandas.Series(accs) 
 
 def plot_accuracy_comparison(experiments, ylim=(0.60, 0.80), figsize=(12, 4)):

microesc/test.py

@@ -19,7 +19,7 @@ def load_model_info(jobs_dir, job_dir):
     df = pandas.read_csv(hist_path)
 
     df['epoch'] = df.epoch + 1
-    df['fold'] = int(fold[-1])
+    df['fold'] = int(fold.lstrip('fold'))
     df['experiment'] = experiment
     df['run'] = '-'.join([date, time, rnd])
 
@@ -129,7 +129,7 @@ def eval_experiment(df):
 
             train_data = folds_data[fold-1][0]
             train_files = set(train_data.slice_file_name.unique())
-            assert len(train_files) > 7000, len(train_files)
+            assert len(train_files) > 6500, len(train_files)
             test_files = set(test.slice_file_name.unique())
             assert len(test_files) > 700
             common_files = train_files.intersection(test_files)