update

luanfujun · Apr 10, 2018 · 4339cce · 4339cce
1 parent 41d3115
commit 4339cce
Show file tree

Hide file tree

Showing 36 changed files with 25 additions and 23 deletions.
diff --git a/filt_cnn_artifact.m b/filt_cnn_artifact.m
@@ -1,36 +1,38 @@
-% parpool(8)
-% parfor i = 0 : 43
-for i = 2:2 % 70:72
-% parfor i = 0 : 149
+
+for i = 0:34
     close all
+
+    in_fn  = ['results/' int2str(i) '_final_res.png'];
+    out_fn = ['results/' int2str(i) '_final_res2.png'];
 
-     in_fn  = [int2str(i) '_result.jpg'];
-     out_fn = [int2str(i) '_result2.jpg'];
-
-
-%     in_fn  = ['../tmp36_wikiart2_current_more/' int2str(i) '_result.png'];
-%     out_fn = ['../tmp36_wikiart2_current_more/' int2str(i) '_result2.png'];
-
-
+    if exist(in_fn, 'file') ~= 2 
+        fprintf('file doesn''t exist: %s\n', in_fn); 
+        continue
+    end 
+    if exist(out_fn, 'file') == 2 
+        fprintf('result already exists: %s\n', out_fn); 
+        continue
+    end 
+
     I = im2double(imread(in_fn));
-    
-     G = im2double(imread(['free2use/' int2str(i) '_naive.png']));
-     M = im2double(imread(['free2use/' int2str(i) '_c_mask.png']));
-     B = im2double(imread(['free2use/' int2str(i) '_target.jpg']));
- 
-    
+
+    G = im2double(imread(['data/' int2str(i) '_naive.jpg']));
+    M = im2double(imread(['data/' int2str(i) '_c_mask.jpg']));
+    B = im2double(imread(['data/' int2str(i) '_target.jpg']));
+
+
     tr= 3;
     h = fspecial('gaussian', [2*tr+1 2*tr+1], tr);
     sM = imfilter(M, h, 'same'); 
     sM(sM > 0.01) = 1; % dialte
     sM(sM < 0.01) = 0;
     sM = imfilter(sM, h, 'same'); 
 
-    addpath code/colorspace
+    addpath 3rdparty/colorspace
     I_lab = colorspace('rgb->lab', I);
 
-    addpath code/guided_filter
-    addpath code/patchmatch-2.0
+    addpath 3rdparty/guided_filter
+    addpath 3rdparty/patchmatch-2.0
 
     r = 2; % try r=2, 4, or 8
     eps = 0.1^2; % try eps=0.1^2, 0.2^2, 0.4^2
@@ -47,12 +49,12 @@
     patch_w = 7;
     ann = nnmex(O1, B, algo, patch_w, [], [], [], [], [], cores);
     O2_base = im2double(votemex(B, ann));
-    
+
     r = 3;
     h = fspecial('gaussian', [2*r+1 2*r+1], r/3);
     O1_base = imfilter(O1, h, 'same');
     O2 = O2_base + O1 - O1_base;
-    
+
     O2 = O2.*sM + B.*(1-sM);
     figure; imshow(I)
     figure; imshow(O2)

diff --git a/results/0_final_res2.png b/results/0_final_res2.png
diff --git a/results/10_final_res2.png b/results/10_final_res2.png
diff --git a/results/11_final_res2.png b/results/11_final_res2.png
diff --git a/results/12_final_res2.png b/results/12_final_res2.png
diff --git a/results/13_final_res2.png b/results/13_final_res2.png
diff --git a/results/14_final_res2.png b/results/14_final_res2.png
diff --git a/results/15_final_res2.png b/results/15_final_res2.png
diff --git a/results/16_final_res2.png b/results/16_final_res2.png
diff --git a/results/17_final_res2.png b/results/17_final_res2.png
diff --git a/results/18_final_res2.png b/results/18_final_res2.png
diff --git a/results/19_final_res2.png b/results/19_final_res2.png
diff --git a/results/1_final_res2.png b/results/1_final_res2.png
diff --git a/results/20_final_res2.png b/results/20_final_res2.png
diff --git a/results/21_final_res2.png b/results/21_final_res2.png
diff --git a/results/22_final_res2.png b/results/22_final_res2.png
diff --git a/results/23_final_res2.png b/results/23_final_res2.png
diff --git a/results/24_final_res2.png b/results/24_final_res2.png
diff --git a/results/25_final_res2.png b/results/25_final_res2.png
diff --git a/results/26_final_res2.png b/results/26_final_res2.png
diff --git a/results/27_final_res2.png b/results/27_final_res2.png
diff --git a/results/28_final_res2.png b/results/28_final_res2.png
diff --git a/results/29_final_res2.png b/results/29_final_res2.png
diff --git a/results/2_final_res2.png b/results/2_final_res2.png
diff --git a/results/30_final_res2.png b/results/30_final_res2.png
diff --git a/results/31_final_res2.png b/results/31_final_res2.png
diff --git a/results/32_final_res2.png b/results/32_final_res2.png
diff --git a/results/33_final_res2.png b/results/33_final_res2.png
diff --git a/results/34_final_res2.png b/results/34_final_res2.png
diff --git a/results/3_final_res2.png b/results/3_final_res2.png
diff --git a/results/4_final_res2.png b/results/4_final_res2.png
diff --git a/results/5_final_res2.png b/results/5_final_res2.png
diff --git a/results/6_final_res2.png b/results/6_final_res2.png
diff --git a/results/7_final_res2.png b/results/7_final_res2.png
diff --git a/results/8_final_res2.png b/results/8_final_res2.png
diff --git a/results/9_final_res2.png b/results/9_final_res2.png