tweaks

chf2117 · Apr 13, 2016 · a1dd954 · a1dd954
1 parent 38e5e45
commit a1dd954
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/prac11/e4896_coversongs.ipynb b/prac11/e4896_coversongs.ipynb
@@ -366,7 +366,9 @@
     "    # Return the reciprocal of the peak correlation score, so most similar -> smallest \"distance\".\n",
     "    return 1.0/np.max(correlation_matrix)\n",
     "\n",
-    "correlation_distances = calculate_track_distance_matrix(ids_A[:20], ids_B[:20], correlation_distance)"
+    "eval_size = 20\n",
+    "\n",
+    "correlation_distances = calculate_track_distance_matrix(ids_A[:eval_size], ids_B[:eval_size], correlation_distance)"
    ]
   },
   {
@@ -412,7 +414,7 @@
     "    accuracy = np.mean(per_row_match_index == np.arange(len(per_row_match_index)))\n",
     "    return accuracy\n",
     "\n",
-    "print(\"Accuracy=\", score_track_distance_matrix(correlation_distances, ids_A[:20]))"
+    "print(\"Accuracy=\", score_track_distance_matrix(correlation_distances, ids_A[:eval_size]))"
    ]
   },
   {
@@ -656,7 +658,7 @@
     "    path, total_costs, path_cost = dtw(local_costs, penalty=0.2)\n",
     "    return np.median(path_cost)\n",
     "\n",
-    "dtw_distances = calculate_track_distance_matrix(ids_A[:20], ids_B[:20], dtw_distance)"
+    "dtw_distances = calculate_track_distance_matrix(ids_A[:eval_size], ids_B[:eval_size], dtw_distance)"
    ]
   },
   {
@@ -685,7 +687,7 @@
     }
    ],
    "source": [
-    "print(\"Accuracy=\", score_track_distance_matrix(dtw_distances, ids_A[:20]))"
+    "print(\"Accuracy=\", score_track_distance_matrix(dtw_distances, ids_A[:eval_size]))"
    ]
   },
   {
@@ -820,8 +822,8 @@
     }
    ],
    "source": [
-    "rot_distances = calculate_track_distance_matrix(ids_A[:20], ids_B[:20], chromarot_dtw_distance)\n",
-    "print(\"Accuracy=\", score_track_distance_matrix(rot_distances, ids_A[:20]))"
+    "rot_distances = calculate_track_distance_matrix(ids_A[:eval_size], ids_B[:eval_size], chromarot_dtw_distance)\n",
+    "print(\"Accuracy=\", score_track_distance_matrix(rot_distances, ids_A[:eval_size]))"
    ]
   },
   {