diff --git a/README.md b/README.md index 4ff18cf..684f6bb 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Compile: ======== i. Run compile.m - +During Rigor compilation, if ld cannot find -lboost_system-mt or -lboost_timer-mt, use their non-multithreaded counterparts by removing '-mt' Generating proposals: ====== diff --git a/edgeBoxes/API/calcedgeBoxes.m b/edgeBoxes/API/calcedgeBoxes.m index 37ed47b..75ddb09 100644 --- a/edgeBoxes/API/calcedgeBoxes.m +++ b/edgeBoxes/API/calcedgeBoxes.m @@ -2,7 +2,7 @@ function calcedgeBoxes( config ) ebconfig = config.edgeBoxes; if(~exist([config.outputLocation '/edgeBoxes'], 'dir')) - mkdir(config.outputLocation,'/dgeBoxes') + mkdir(config.outputLocation,'/edgeBoxes') end %Load All images in a particular folder diff --git a/evaluation-metrics/aboEvaluation/compute_abo_candidates.m b/evaluation-metrics/aboEvaluation/compute_abo_candidates.m index b3d5844..6f29523 100644 --- a/evaluation-metrics/aboEvaluation/compute_abo_candidates.m +++ b/evaluation-metrics/aboEvaluation/compute_abo_candidates.m @@ -9,7 +9,7 @@ function compute_abo_candidates(testset, config) for i = 1:length(proposalsToEvaluate) method = config.(char(proposalsToEvaluate{i})); - candidate_dir=[config.outputLocation proposalsToEvaluate{i}]; + candidate_dir=[config.outputLocation '/' proposalsToEvaluate{i}]; fileName=[ candidate_dir '/' 'abo_candidates.mat']; try method=config.(char(proposalsToEvaluate(i))) diff --git a/evaluation-metrics/recall/compute_best_recall_candidates.m b/evaluation-metrics/recall/compute_best_recall_candidates.m index b179c61..32e7081 100644 --- a/evaluation-metrics/recall/compute_best_recall_candidates.m +++ b/evaluation-metrics/recall/compute_best_recall_candidates.m @@ -8,7 +8,7 @@ function compute_best_recall_candidates(testset, config) for i = 1:length(proposalsToEvaluate) method = config.(char(proposalsToEvaluate{i})); - candidate_dir=[config.outputLocation proposalsToEvaluate{i}]; + candidate_dir=[config.outputLocation '/' proposalsToEvaluate{i}]; fileName=[candidate_dir '/' 'best_recall_candidates.mat'] try method=config.(char(proposalsToEvaluate(i))) diff --git a/evaluation-metrics/recall/evaluateAUC.m b/evaluation-metrics/recall/evaluateAUC.m index c86e220..561f765 100644 --- a/evaluation-metrics/recall/evaluateAUC.m +++ b/evaluation-metrics/recall/evaluateAUC.m @@ -46,7 +46,7 @@ function evaluateAUC( methods, outputLocation) wid = 10; set(gcf, 'Units','centimeters', 'Position',[0 0 wid hei]); set(gcf, 'PaperPositionMode','auto'); - printpdf('figures/num_candidates_area_under_recall.pdf'); + printpdf([outputLocation '/' 'figures/num_candidates_area_under_recall.pdf']); % fixed threshold legend_locations = {'SouthEast', 'NorthWest', 'NorthWest'}; diff --git a/initialize.m b/initialize.m index b0b1445..05f6c6e 100644 --- a/initialize.m +++ b/initialize.m @@ -136,8 +136,8 @@ if((strcmp(proposalNames(i), 'imageLocation')==1 || strcmp(proposalNames(i), 'outputLocation')==1 || strcmp(proposalNames(i), 'params')==1)) continue; else - eval(sprintf('configjson.%s.opts.outputLocation = fullfile(configjson.outputLocation,proposalNames(i));',char(proposalNames(i)))) - eval(sprintf('configjson.%s.opts.name = proposalNames(i);', char(proposalNames(i)) )) + eval(sprintf('configjson.%s.opts.outputLocation = fullfile(configjson.outputLocation,char(proposalNames(i)));',char(proposalNames(i)))) + eval(sprintf('configjson.%s.opts.name = char(proposalNames(i));', char(proposalNames(i)) )) eval(sprintf('configjson.%s.opts.color = (randi(256,1,3)-1)/256;', char(proposalNames(i)) )) end