Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'dt' of github.com:quantombone/exemplarsvm into dt

  • Loading branch information...
commit 996faf56bf4d89edb99b50ef30ec13ebe3d4d0c2 2 parents 5d62deb + 76d9f50
Tomasz J Malisiewicz authored
View
11 applyModel.m
@@ -18,8 +18,9 @@
test_params.detect_max_windows_per_exemplar = 200;
test_params.detect_keep_threshold = -1.5;
test_params.calibrate_nms = 1.0;
+
if length(data_set) == 0
- data_set = get_screenshot_bg(50,@(x)imresize_max(x,400));
+ data_set = get_screenshot_bg(5000,@(x)imresize_max(x,400));
%data_set = get_screenshot_bg(20);
test_params.display_detections = 1;
%test_params.write_top_detection = 1;
@@ -34,13 +35,16 @@
test_params.display_detections = 1;
end
+
if isnumeric(data_set) && ...
size(data_set,4) == 1 && ...
size(data_set,3) == 3
data_set = {data_set};
%Given a single image
- boxes = esvm_detect_imageset(data_set, model, test_params, test_set_name);
+ boxes = esvm_detect_imageset(data_set, model, test_params, ...
+ test_set_name);
+
elseif isnumeric(data_set) && ...
size(data_set,4) > 1 && ...
size(data_set, 3)==3
@@ -55,7 +59,8 @@
end
else
%% Apply on test set
- boxes = esvm_detect_imageset(data_set, model, test_params, test_set_name);
+ boxes = esvm_detect_imageset(data_set, model, test_params, ...
+ test_set_name);
end
View
5 internal/esvm_detect.m
@@ -202,7 +202,6 @@
t = get_pyramid(I, sbin, params);
-
resstruct.padder = t.padder;
resstruct.bbs = cell(N,1);
xs = cell(N,1);
@@ -550,6 +549,10 @@
else
t = I{1};
end
+ elseif length(I)==2 && params.detect_add_flip==1
+ t =I(2);
+ elseif length(I)==2 && params.detect_add_flip==0
+ t = I(1);
else
t = I;
end
View
2  internal/esvm_get_default_params.m
@@ -219,7 +219,7 @@
%Information about where we mine images from
params.mine_from_negatives = 1;
params.mine_from_positives = 0;
-
+params.mine_from_positives_do_latent_update = 1;
% If enabled, skips objects durning mining when mining from positives
params.mine_skip_positive_objects = 1;
View
2  libsvm/libsvm_compile.m
@@ -5,6 +5,6 @@
mex -largeArrayDims -O libsvmtrain.c svm.o svm_model_matlab.o
%These files are not used
-%mex -O svmpredict.c svm.obj svm_model_matlab.obj
+mex -O libsvmpredict.c svm.o svm_model_matlab.o
%mex -O libsvmread.c
%mex -O libsvmwrite.c
View
BIN  libsvm/libsvmpredict.mexmaci64
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.