-scaled_english_counts = norms.scale(english_counts)
-
-
-metrics = [norms.l1, norms.l2, norms.l3, norms.cosine_distance, norms.harmonic_mean, norms.geometric_mean]
-corpus_frequencies = [normalised_english_counts, scaled_english_counts]
-scalings = [norms.normalise, norms.scale]
+euclidean_scaled_english_counts = norms.euclidean_scale(english_counts)
+
+metrics = [{'func': norms.l1, 'name': 'l1'},
+ {'func': norms.l2, 'name': 'l2'},
+ {'func': norms.l3, 'name': 'l2'},
+ {'func': norms.cosine_distance, 'name': 'cosine_distance'},
+ {'func': norms.harmonic_mean, 'name': 'harmonic_mean'},
+ {'func': norms.geometric_mean, 'name': 'geometric_mean'},
+ {'func': norms.inverse_log_pl, 'name': 'inverse_log_pl'}]
+scalings = [{'corpus_frequency': normalised_english_counts,
+ 'scaling': norms.normalise,
+ 'name': 'normalised'},
+ {'corpus_frequency': euclidean_scaled_english_counts,
+ 'scaling': norms.euclidean_scale,
+ 'name': 'euclidean_scaled'},
+ {'corpus_frequency': normalised_english_counts,
+ 'scaling': norms.identity_scale,
+ 'name': 'normalised_with_identity'}]