Feature matching in Matlab with multiple images

Hi,

this code, taken from Matlab documentation, detects keypoints, extracts features and matches vectors of features.

points1 = detectSURFFeatures(im1);
[featuresIm1, valid_points] = extractFeatures(im1, points1);
points2 = detectSURFFeatures(im2);
[featuresIm2, valid_points] = extractFeatures(im2, points2);
indexPairs = matchFeatures(featuresIm1, featuresIm2)

But what if I need to match the features of a test image with those of a training set? I'm currently calling matchPoints once for each train image, speeding up the process with a parfor. Is there a better (less computational time) and smart way to do this?