Commit 1b23bb13 authored by Davis King's avatar Davis King

Updated comments in examples to account for recent code change.

parent c9ed8aa6
......@@ -249,11 +249,11 @@ int main()
// We can easily test the new detector against our training data. This print
// statement will indicate that it has perfect precision and recall on this simple
// task. It will also print the mean average precision (MAP).
cout << "Test detector (precision,recall,MAP): " << test_object_detection_function(detector, images, object_locations) << endl;
// task. It will also print the average precision (AP).
cout << "Test detector (precision,recall,AP): " << test_object_detection_function(detector, images, object_locations) << endl;
// The cross validation should also indicate perfect precision and recall.
cout << "3-fold cross validation (precision,recall,MAP): "
cout << "3-fold cross validation (precision,recall,AP): "
<< cross_validate_object_detection_trainer(trainer, images, object_locations, 3) << endl;
......
......@@ -207,11 +207,11 @@ int main()
object_detector<image_scanner_type> detector = trainer.train(images, object_locations);
// We can easily test the new detector against our training data. This print statement will indicate that it
// has perfect precision and recall on this simple task. It will also print the mean average precision (MAP).
cout << "Test detector (precision,recall,MAP): " << test_object_detection_function(detector, images, object_locations) << endl;
// has perfect precision and recall on this simple task. It will also print the average precision (AP).
cout << "Test detector (precision,recall,AP): " << test_object_detection_function(detector, images, object_locations) << endl;
// The cross validation should also indicate perfect precision and recall.
cout << "3-fold cross validation (precision,recall,MAP): "
cout << "3-fold cross validation (precision,recall,AP): "
<< cross_validate_object_detection_trainer(trainer, images, object_locations, 3) << endl;
......
......@@ -189,15 +189,14 @@ int main(int argc, char** argv)
fout.close();
cout << "Testing detector on training data..." << endl;
cout << "Test detector (precision,recall,MAP): " << test_object_detection_function(detector, images, object_locations) << endl;
cout << "Test detector (precision,recall,AP): " << test_object_detection_function(detector, images, object_locations) << endl;
}
else
{
// shuffle the order of the training images
randomize_samples(images, object_locations);
// The cross validation should also indicate perfect precision and recall.
cout << num_folds << "-fold cross validation (precision,recall,MAP): "
cout << num_folds << "-fold cross validation (precision,recall,AP): "
<< cross_validate_object_detection_trainer(trainer, images, object_locations, num_folds) << endl;
}
......@@ -252,7 +251,7 @@ int main(int argc, char** argv)
if (parser.option("test"))
{
cout << "Testing detector on data..." << endl;
cout << "Results (precision,recall,MAP): " << test_object_detection_function(detector, images, object_locations) << endl;
cout << "Results (precision,recall,AP): " << test_object_detection_function(detector, images, object_locations) << endl;
return EXIT_SUCCESS;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment