Merge branch 'master' of github.com:synchro--/ADIP

Author: synchro--

Diff for: Final Report.pdf

@@ -3,9 +3,12 @@ This is a project about digital image processing, with particular regard to imag
 
 The goals are: 
 <ul>
-<li>Implement an efficient approach to estimate the oriented gradient</li>
+<li>Implement an efficient approach to estimate the oriented gradient of histograms. </li>
 <li>Utilize the local minimum of the latter as a seed for a morphological watershed segmentation</li>
 </ul>
 
 <h3>Results</h3>
-We're working on it! 
+
+We succesfully managed to achieve both tasks. See "Final Report" to get an intro to the topics of this research and the presentation of our work and the idea behind the actual implementation of the algorithm, following the Arbelaez paper. 
+
+Soon more documentation will be added.

Diff for: README.md

@@ -155,39 +155,3 @@
 imshow(white1)
 title('Segmented Image')
 toc
-
-
-
-% im = max(max(im))-im;           % We will work with a negative image
-                                % so cells are dark (minima)
-
-%   Get some useful parameters of the image
-% imin = min(min(grad));
-% imax = max(max(grad));
-% [imheight, imwidth] = size(grad);
-% 
-% raws=size(grad,1);
-% cols=size(grad,2);
-% %   Initializes the catchment basins
-% CB  = bwlabel(grad < imin+1);   % C[min+1] = T[min+1]
-
-% Stablishing a neighbourhood of 20 pixels in which there will only be one
-% seed 
-% J=integralImage(CB);
-% for r=10:raws-10
-%     for c=10:cols-10
-%         if CB(r,c)>0,
-%             [sR sC eR eC] = deal(r-9,c-9,r+10,c+10);
-%             regionSum = J(eR+1,eC+1) - J(eR+1,sC) - J(sR,eC+1) + J(sR,sC);
-%             if regionSum~=CB(r,c)
-%                 for i=-9:1:10
-%                     for j=-9:1:10
-%                         if CB(r+i,c+j)>0
-%                             CB(r+i,c+j)=0;
-%                         end
-%                     end
-%                 end
-%             end
-%         end
-%     end
-% end

Diff for: code/final/optim_watershed.m

@@ -145,26 +145,3 @@
 imshow(white1)
 title('Segmented Image')
 toc
-
-
-% Idea to remove the seeds from small areas
-% Stablishing a neighbourhood of 20 pixels in which there will only be one
-% seed
-% J=integralImage(CB);
-% for r=10:raws-10
-%     for c=10:cols-10
-%         if CB(r,c)>0,
-%             [sR sC eR eC] = deal(r-9,c-9,r+10,c+10);
-%             regionSum = J(eR+1,eC+1) - J(eR+1,sC) - J(sR,eC+1) + J(sR,sC);
-%             if regionSum~=CB(r,c)
-%                 for i=-9:1:10
-%                     for j=-9:1:10
-%                         if CB(r+i,c+j)>0
-%                             CB(r+i,c+j)=0;
-%                         end
-%                     end
-%                 end
-%             end
-%         end
-%     end
-% end