From 7caf345d36ea842f2361b61f409431a59e5b473b Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 01 Mar 2018 13:42:30 +0000
Subject: [PATCH] One more fix
---
src/detector.c | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index d860a6a..43d92df 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -245,8 +245,8 @@
if (ymax > h) ymax = h;
for(j = 0; j < classes; ++j){
- int class = j;
- if (probs[i][class]) fprintf(fp, "%d %d %f %f %f %f %f\n", id, j+1, probs[i][class],
+ int class_id = j;
+ if (probs[i][class_id]) fprintf(fp, "%d %d %f %f %f %f %f\n", id, j+1, probs[i][class_id],
xmin, ymin, xmax, ymax);
}
}
@@ -777,7 +777,7 @@
avg_precision += cur_precision;
}
avg_precision = avg_precision / 11;
- printf("class = %d, name = %s, \t ap = %2.2f %% \n", i, names[i], avg_precision*100);
+ printf("class_id = %d, name = %s, \t ap = %2.2f %% \n", i, names[i], avg_precision*100);
mean_average_precision += avg_precision;
}
@@ -798,7 +798,7 @@
fprintf(stderr, "Total Detection Time: %f Seconds\n", (double)(time(0) - start));
}
-void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filename, float thresh)
+void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filename, float thresh, int dont_show)
{
list *options = read_data_cfg(datacfg);
char *name_list = option_find_str(options, "names", "data/names.list");
@@ -843,15 +843,19 @@
if (nms) do_nms_sort(boxes, probs, l.w*l.h*l.n, l.classes, nms);
draw_detections(im, l.w*l.h*l.n, thresh, boxes, probs, names, alphabet, l.classes);
save_image(im, "predictions");
- show_image(im, "predictions");
+ if (!dont_show) {
+ show_image(im, "predictions");
+ }
free_image(im);
free_image(sized);
free(boxes);
free_ptrs((void **)probs, l.w*l.h*l.n);
#ifdef OPENCV
- cvWaitKey(0);
- cvDestroyAllWindows();
+ if (!dont_show) {
+ cvWaitKey(0);
+ cvDestroyAllWindows();
+ }
#endif
if (filename) break;
}
@@ -859,6 +863,8 @@
void run_detector(int argc, char **argv)
{
+ int dont_show = find_arg(argc, argv, "-dont_show");
+ int http_stream_port = find_int_arg(argc, argv, "-http_port", -1);
char *out_filename = find_char_arg(argc, argv, "-out_filename", 0);
char *prefix = find_char_arg(argc, argv, "-prefix", 0);
float thresh = find_float_arg(argc, argv, "-thresh", .24);
@@ -899,7 +905,7 @@
if(weights)
if (weights[strlen(weights) - 1] == 0x0d) weights[strlen(weights) - 1] = 0;
char *filename = (argc > 6) ? argv[6]: 0;
- if(0==strcmp(argv[2], "test")) test_detector(datacfg, cfg, weights, filename, thresh);
+ if(0==strcmp(argv[2], "test")) test_detector(datacfg, cfg, weights, filename, thresh, dont_show);
else if(0==strcmp(argv[2], "train")) train_detector(datacfg, cfg, weights, gpus, ngpus, clear);
else if(0==strcmp(argv[2], "valid")) validate_detector(datacfg, cfg, weights);
else if(0==strcmp(argv[2], "recall")) validate_detector_recall(datacfg, cfg, weights);
@@ -911,6 +917,7 @@
char **names = get_labels(name_list);
if(filename)
if (filename[strlen(filename) - 1] == 0x0d) filename[strlen(filename) - 1] = 0;
- demo(cfg, weights, thresh, cam_index, filename, names, classes, frame_skip, prefix, out_filename);
+ demo(cfg, weights, thresh, cam_index, filename, names, classes, frame_skip, prefix, out_filename,
+ http_stream_port, dont_show);
}
}
--
Gitblit v1.10.0