Skip to content

Fixing some issues #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixing some issues #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dec2119
Updating Readme for non multi threaded boost library support in Rigor
DushyantaDhyani Apr 5, 2015
121c545
Fixing a few latent issues that also ensure compatibility with older …
DushyantaDhyani Apr 5, 2015
94911e0
Adding Base Directory to Output Path
DushyantaDhyani Apr 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
======
Expand Down
2 changes: 1 addition & 1 deletion edgeBoxes/API/calcedgeBoxes.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion evaluation-metrics/aboEvaluation/compute_abo_candidates.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
2 changes: 1 addition & 1 deletion evaluation-metrics/recall/compute_best_recall_candidates.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
2 changes: 1 addition & 1 deletion evaluation-metrics/recall/evaluateAUC.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'};
Expand Down
4 changes: 2 additions & 2 deletions initialize.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down