Skip to content

Commit

Permalink
Paths now are dependent on OS
Browse files Browse the repository at this point in the history
  • Loading branch information
Santiago Freixa committed May 25, 2016
1 parent 6e14594 commit 4bef556
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 9 deletions.
Binary file modified cmex/RP_mex.mexa64
Binary file not shown.
2 changes: 1 addition & 1 deletion config/GenerateRPConfig.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
% --> Size term alpha, as explained in the paper sec. 4.2.
% It is quantized to contain exactly 2^16 elements for speed
% purposes.
params.segmentations{1}.alpha = dlmread('alpha/alpha_voc07.dat');
params.segmentations{1}.alpha = dlmread(fullfile('alpha', 'alpha_voc07.dat'));
params.segmentations{1}.verbose = false; %Set to true to display more information during execution

%% Save parameters:
Expand Down
2 changes: 1 addition & 1 deletion config/GenerateRPConfig_4segs.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
% --> Size term alpha, as explained in the paper sec. 4.2.
% It is quantized to contain exactly 2^16 elements for speed
% purposes.
params.segmentations{1}.alpha = dlmread('alpha/alpha_voc07.dat');
params.segmentations{1}.alpha = dlmread(fullfile('alpha', 'alpha_voc07.dat'));
params.segmentations{1}.verbose = false; %Set to true to display more information during execution

% Opponent
Expand Down
2 changes: 1 addition & 1 deletion demo.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% Input
imgDir = 'test_images';
imgId = 1;
configFile = 'config/rp.mat';
configFile = fullfile('config', 'rp.mat');
%'config/rp_4segs.mat' to sample from 4 segmentations (slower but higher recall)
%'config/rp.mat' to sample from 1 segmentations (faster but lower recall)

Expand Down
9 changes: 3 additions & 6 deletions setup.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@
mkdir(mexDir)
cd(mexDir);
disp('Compiling RP mex file...');
% Release:
mex ../src/RP_mex.cpp ../src/stopwatch/Stopwatch.cpp
% Debug:
% mex -g ../src/RP_mex.cpp ../src/stopwatch/Stopwatch.cpp
cd('../');
mex(fullfile('..', 'src', 'RP_mex.cpp'), fullfile('..', 'src', 'stopwatch', 'Stopwatch.cpp'))
cd('..');

%% Generate configuration files:
cd('config')
disp('Generating configuration files...');
GenerateRPConfig();
GenerateRPConfig_4segs();
cd('../');
cd('..');

0 comments on commit 4bef556

Please sign in to comment.