From c769e4c39d21fd8a7d352ba1393f3f5a6d53e5ce Mon Sep 17 00:00:00 2001 From: David Jefferson Date: Thu, 25 Jun 2015 16:18:10 +0200 Subject: [PATCH 1/4] Update main_vis_clsSaliency.m --- script/vis/main_vis_clsSaliency.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/vis/main_vis_clsSaliency.m b/script/vis/main_vis_clsSaliency.m index 3bf1685..4ba66be 100644 --- a/script/vis/main_vis_clsSaliency.m +++ b/script/vis/main_vis_clsSaliency.m @@ -1,5 +1,5 @@ %% load model -tmp = load('mo.mat', 'h','mu'); +tmp = load('mo_for_vis.mat', 'h','mu'); h = tmp.h; mu = tmp.mu; clear tmp; @@ -25,4 +25,4 @@ imtool(I', 'InitialMagnification',800); Mmax = max(M(:)); Mmin = min(M(:)); MM = (M - Mmin)./(Mmax-Mmin); -imtool(MM', 'InitialMagnification',800); \ No newline at end of file +imtool(MM', 'InitialMagnification',800); From 4562e4280c773ffda0f5fcc9ccf2e95fd2a89c73 Mon Sep 17 00:00:00 2001 From: David Jefferson Date: Thu, 25 Jun 2015 16:19:26 +0200 Subject: [PATCH 2/4] Update main_vis_clsModel.m --- script/vis/main_vis_clsModel.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/vis/main_vis_clsModel.m b/script/vis/main_vis_clsModel.m index d4c3b0e..4c6eb5e 100644 --- a/script/vis/main_vis_clsModel.m +++ b/script/vis/main_vis_clsModel.m @@ -1,5 +1,5 @@ %% load model -tmp = load('mo.mat', 'h','mu'); +tmp = load('mo_for_vis.mat', 'h','mu'); h = tmp.h; mu = tmp.mu; clear tmp; @@ -26,4 +26,4 @@ %% print fprintf('c = %d\n', c); fprintf('class score:\n'); -disp(s); \ No newline at end of file +disp(s); From 010e545ea952a6374819cd31eaa6d4d3c1ef8ac2 Mon Sep 17 00:00:00 2001 From: David Jefferson Date: Thu, 25 Jun 2015 17:00:48 +0200 Subject: [PATCH 3/4] Attempt to execute SCRIPT MaxPooling as a function: this file is a script while in the visualization of saliency map it is being called as function which raise an error compiling vis_saliency --- util_3rdparty/MaxPooling.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util_3rdparty/MaxPooling.m b/util_3rdparty/MaxPooling.m index 0895116..d68c3b9 100644 --- a/util_3rdparty/MaxPooling.m +++ b/util_3rdparty/MaxPooling.m @@ -2,7 +2,7 @@ % (rows, cols, channels, samples) and returns the pooled data with the % corresponding indices. % -% [m, idx] = MaxPooling(IM, [2 2]) + [m, idx] = MaxPooling(IM, [2 2]) % % IM can also be a 2D tensor, the missing dims are set to 1. @@ -10,4 +10,4 @@ % Copyright (C) 2011 Jonathan Masci % % This file is available under the terms of the -% GNU GPLv2. \ No newline at end of file +% GNU GPLv2. From be719afecfc091512fab17a68cf872e9dc2d02aa Mon Sep 17 00:00:00 2001 From: David Jefferson Date: Thu, 25 Jun 2015 17:00:58 +0200 Subject: [PATCH 4/4] Update MaxPooling.m --- util_3rdparty/MaxPooling.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util_3rdparty/MaxPooling.m b/util_3rdparty/MaxPooling.m index d68c3b9..26d6d83 100644 --- a/util_3rdparty/MaxPooling.m +++ b/util_3rdparty/MaxPooling.m @@ -2,7 +2,7 @@ % (rows, cols, channels, samples) and returns the pooled data with the % corresponding indices. % - [m, idx] = MaxPooling(IM, [2 2]) +%[m, idx] = MaxPooling(IM, [2 2]) % % IM can also be a 2D tensor, the missing dims are set to 1.