Skip to content

GitLab

Commit b5a90e52 authored by Davis King's avatar Davis King
Browse files

Updated tests to work with current code

parent 36d5677a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
dlib/test/object_detector.cpp
View file @ b5a90e52
...@@ -384,6 +384,7 @@ namespace ...@@ -384,6 +384,7 @@ namespace
const rectangle object_box = compute_box_dimensions(1,35*35); const rectangle object_box = compute_box_dimensions(1,35*35);
scanner.add_detection_template(object_box, create_grid_detection_template(object_box,2,2)); scanner.add_detection_template(object_box, create_grid_detection_template(object_box,2,2));
setup_hashed_features(scanner, images, 9); setup_hashed_features(scanner, images, 9);
use_uniform_feature_weights(scanner);
structural_object_detection_trainer<image_scanner_type> trainer(scanner); structural_object_detection_trainer<image_scanner_type> trainer(scanner);
trainer.set_num_threads(4); trainer.set_num_threads(4);
trainer.set_overlap_tester(test_box_overlap(0,0)); trainer.set_overlap_tester(test_box_overlap(0,0));
...@@ -424,6 +425,7 @@ namespace ...@@ -424,6 +425,7 @@ namespace
typedef scan_image_boxes<feature_extractor_type> image_scanner_type; typedef scan_image_boxes<feature_extractor_type> image_scanner_type;
image_scanner_type scanner; image_scanner_type scanner;
setup_hashed_features(scanner, images, 9); setup_hashed_features(scanner, images, 9);
use_uniform_feature_weights(scanner);
structural_object_detection_trainer<image_scanner_type> trainer(scanner); structural_object_detection_trainer<image_scanner_type> trainer(scanner);
trainer.set_num_threads(4); trainer.set_num_threads(4);
trainer.set_overlap_tester(test_box_overlap(0,0)); trainer.set_overlap_tester(test_box_overlap(0,0));
...@@ -472,6 +474,7 @@ namespace ...@@ -472,6 +474,7 @@ namespace
mboxes.push_back(centered_rect(0,0, mbox_size,mbox_size)); mboxes.push_back(centered_rect(0,0, mbox_size,mbox_size));
scanner.add_detection_template(object_box, create_grid_detection_template(object_box,1,1), mboxes); scanner.add_detection_template(object_box, create_grid_detection_template(object_box,1,1), mboxes);
setup_hashed_features(scanner, images, 9); setup_hashed_features(scanner, images, 9);
use_uniform_feature_weights(scanner);
structural_object_detection_trainer<image_scanner_type> trainer(scanner); structural_object_detection_trainer<image_scanner_type> trainer(scanner);
trainer.set_num_threads(4); trainer.set_num_threads(4);
trainer.set_overlap_tester(test_box_overlap(0,0)); trainer.set_overlap_tester(test_box_overlap(0,0));
...@@ -514,6 +517,7 @@ namespace ...@@ -514,6 +517,7 @@ namespace
const rectangle object_box = compute_box_dimensions(1,35*35); const rectangle object_box = compute_box_dimensions(1,35*35);
scanner.add_detection_template(object_box, create_grid_detection_template(object_box,2,2)); scanner.add_detection_template(object_box, create_grid_detection_template(object_box,2,2));
setup_hashed_features(scanner, images, 9); setup_hashed_features(scanner, images, 9);
use_uniform_feature_weights(scanner);
structural_object_detection_trainer<image_scanner_type> trainer(scanner); structural_object_detection_trainer<image_scanner_type> trainer(scanner);
trainer.set_num_threads(4); trainer.set_num_threads(4);
trainer.set_overlap_tester(test_box_overlap(0,0)); trainer.set_overlap_tester(test_box_overlap(0,0));
...@@ -556,6 +560,7 @@ namespace ...@@ -556,6 +560,7 @@ namespace
const rectangle object_box = compute_box_dimensions(1,35*35); const rectangle object_box = compute_box_dimensions(1,35*35);
scanner.add_detection_template(object_box, create_grid_detection_template(object_box,2,2)); scanner.add_detection_template(object_box, create_grid_detection_template(object_box,2,2));
setup_hashed_features(scanner, images, 9); setup_hashed_features(scanner, images, 9);
use_uniform_feature_weights(scanner);
structural_object_detection_trainer<image_scanner_type> trainer(scanner); structural_object_detection_trainer<image_scanner_type> trainer(scanner);
trainer.set_num_threads(4); trainer.set_num_threads(4);
trainer.set_overlap_tester(test_box_overlap(0,0)); trainer.set_overlap_tester(test_box_overlap(0,0));
...@@ -604,6 +609,7 @@ namespace ...@@ -604,6 +609,7 @@ namespace
mboxes.push_back(centered_rect(0,0, mbox_size,mbox_size)); mboxes.push_back(centered_rect(0,0, mbox_size,mbox_size));
scanner.add_detection_template(object_box, create_grid_detection_template(object_box,2,2), mboxes); scanner.add_detection_template(object_box, create_grid_detection_template(object_box,2,2), mboxes);
setup_hashed_features(scanner, images, 9); setup_hashed_features(scanner, images, 9);
use_uniform_feature_weights(scanner);
structural_object_detection_trainer<image_scanner_type> trainer(scanner); structural_object_detection_trainer<image_scanner_type> trainer(scanner);
trainer.set_num_threads(4); trainer.set_num_threads(4);
trainer.set_overlap_tester(test_box_overlap(0,0)); trainer.set_overlap_tester(test_box_overlap(0,0));
......
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