Changeset 14597

Timestamp:

04/16/13 10:26:16 (12 years ago)

Author:

Eric.Larour

Message:

CHG: Issue in aggregation fixed.
nunataks routine to bias morphological operations towards expanding bedrock.

Location:

issm/trunk-jpl/src/m/morphological

Files:

• aggregation.m (modified) (1 diff)
• nunataks.m (modified) (2 diffs)

issm/trunk-jpl/src/m/morphological/aggregation.m

@@ -60 +60 @@
 
 if optional,
-        s=size(mask);
         varargout{1}=x(1:windowsize:s(2));
         varargout{2}=y(1:windowsize:s(1));

issm/trunk-jpl/src/m/morphological/nunataks.m

@@ -1 +1 @@
 function [mask]=nunataks(mask)
-%NUNATAKS - bias mask towards increased 0 covergage
+%NUNATAKS - bias mask towards increased 0 coverage
 % 
 %  mask is an image of arbitrary size, format binary, with values 1 for foreground, and 0 for background
@@ -9 +9 @@
 %  See also CLOSING, OPENING, DILATION, EROSION, AGGREGATION
 
-%check input arguments  %{{{
-%even windowsize
-if mod(windowsize,2)==0,
-        error('windowsize should be an even number');
-end
+rocks=~mask;
 
-%check on presence of varargin: 
-optional=0;
-if nargin>3,
-        if nargin~=5,
-                help aggregation;
-                error('wrong number of optional arguments specified');
-        else
-                optional=1;
-                x=varargin{1};
-                y=varargin{2};
-        end
-end
+%matrices for convolution: 
+matrix=[0 1 0; 1 0 1; 0 1 0];
 
-%check on presence of varargout: 
-if optional,
-        if nargout~=3,
-                help aggregation;
-                error('wrong number of optional output arguments specified');
-        end
-end
-%}}}
+%do not exist, i.e. locations that stand pretty much alone. 
+mask=filter2(matrix1,mask,'same');
+pos=find(~crocks & rocks);
 
-%convolve mask
-matrix=ones(windowsize,windowsize); 
-mask=filter2(matrix,mask,'same');
-
-%apply threshhold
-pos=find(mask>threshhold); 
-pos2=find(mask<=threshhold); 
-mask(pos)=1;
-mask(pos2)=0;
-
-%mask has been transformed into double format from the filter2  operation. Bring back to binary. 
-mask=logical(mask);
-
-%subsample: 
-s=size(mask);
-mask=mask(1:windowsize:s(1),1:windowsize:s(2));
-
-if optional,
-        s=size(mask);
-        varargout{1}=x(1:windowsize:s(2));
-        varargout{2}=y(1:windowsize:s(1));
-end
-
-
-function nunataks();
-
-%Bias towards increased rock coverage:
-matrix1=[1 0 1; 0 0 0 ; 1 0 1];
-matrix2=[0 1 0; 1 0 1; 0 1 0];
-
-
-
+mask(pos)=0;