Permalink
Browse files

minor fixes on TSS evaluation

  • Loading branch information...
Ignacio Rocco Spremolla
Ignacio Rocco Spremolla committed Jul 31, 2017
1 parent ef511f2 commit 93a7b0e2311180cfe50b7746f372a89e91a0a966
Showing with 15 additions and 6 deletions.
  1. +9 −0 .gitignore
  2. +2 −2 evaluate.m
  3. +4 −4 evaluation/TSS/evaluateTSS.m
@@ -1 +1,10 @@
*.m~
trained_models/
results/
matlab/matconvnet-1.0-beta20/
matconvnet-1.0-beta20.tar.gz
pax_global_header
datasets/
evaluation/TSS/TSS_CVPR2016_EvaluationKit.zip
evaluation/TSS/TSS_CVPR2016_EvaluationKit-master/
@@ -26,7 +26,7 @@
datasets = {'caltech-101','PF-dataset','PF-dataset-PASCAL','TSS_CVPR2016'};
evaluationDataset = datasets{1};
evaluationDataset = datasets{4};
%% ======================================== Evaluate on Caltech-101 dataset
if strcmp(evaluationDataset,'caltech-101')==1
@@ -89,7 +89,7 @@
paths.TSSPath = fullfile(paths.baseDir,'datasets','TSS_CVPR2016'); % PF dataset
% download Proposal Flow dataset if needed
if ~exist(fullfile(paths.pfPascalPath), 'file')
if ~exist(fullfile(paths.TSSPath), 'file')
downloadTSSdataset;
end
% evaluate on Proposal Flow dataset
@@ -1,4 +1,4 @@
function results = evaluateTSSFun(paths,varargin)
function results = evaluateTSS(paths,varargin)
% TSS dataset base path
datasetDir = paths.TSSPath;
@@ -151,9 +151,9 @@
results.pckPASCAL = importdata(fullfile(resultsDir,'PASCAL','scores.csv'));
results.pckJODS = importdata(fullfile(resultsDir,'JODS','scores.csv'));
results.meanPckFG3DCar = mean(scoresFG3DCar.data(1:end-2,7));
results.meanPckPASCAL = mean(scoresPASCAL.data(1:end-2,7));
results.meanPckJODS = mean(scoresJODS.data(1:end-2,7));
results.meanPckFG3DCar = mean(results.pckFG3DCar.data(1:end-2,7));
results.meanPckPASCAL = mean(results.pckPASCAL.data(1:end-2,7));
results.meanPckJODS = mean(results.pckJODS.data(1:end-2,7));
results.meanPckAll = mean([scoresFG3DCar.data(1:end-2,7);scoresPASCAL.data(1:end-2,7);scoresJODS.data(1:end-2,7)]);

0 comments on commit 93a7b0e

Please sign in to comment.