Changeset 93

Timestamp:

07/06/14 20:56:42 (10 years ago)

Author:

bduin

Message:

 

File:

• prextra/hausdm.m (modified) (6 diffs)

prextra/hausdm.m

@@ -1 +1 @@
 %HAUSDM Hausdorff distance between datasets of image blobs
 %
-%       [DH,DM] = hausdm(A,B,fid)
+%       [DH,DM] = hausdm(A,B)
 %
 % Computes a Hausdorff distance matrix between the sets of binary images 
 % A and B, or datasets containing them as features. 
-% Progress is reported in fid (fid = 1: on the sreeen).
 % If A and B are image sets and 
 % size(A) is [may,max,na]
@@ -24 +23 @@
 % P.O. Box 5046, 2600 GA Delft, The Netherlands
 
-function [dh,dm] = hausdm(A,B,fid)
-if nargin < 3, fid = 0; end
+function [dh,dm] = hausdm(A,B)
 
-if isdataset(A) & isdataset(B)
-        [dh,dm] = hausdm(data2im(A),data2im(B),fid);
+if isdataset(A) && isdataset(B)
+        [dh,dm] = hausdm(data2im(A),data2im(B));
         dh = setdata(A,dh);
         dm = setdata(A,dm);
@@ -34 +32 @@
 end
 
-[ma1,ma2,na] = size(A);
-[mb1,mb2,nb] = size(B);
+[dummy,dummy,na] = size(A);
+[dummy,dummy,nb] = size(B);
 dh = zeros(na,nb);
 dm = zeros(na,nb);
@@ -45 +43 @@
         K = [min(K):max(K)];
         a = double(a(K,J));
-        if length(a(:)) > 0
+        if ~isempty(a(:))
                 a = bord(a,0);
         end
@@ -61 +59 @@
                 K = [min(K):max(K)];
                 b = double(b(K,J));
-                if length(b(:)) > 0
+                if ~isempty(b(:))
                         b = bord(b,0);
                 end
@@ -73 +71 @@
                 dh(i,j) = max(max(min(dab)),max(min(dab')));
                 dm(i,j) = max(mean(min(dab)),mean(min(dab')));
-%               if fid, disp([i,j,dh(i,j),dm(i,j)]); end
-                fprintf(fid,'%5d %5d %10.3f %8.3f \n',i,j,dh(i,j),dm(i,j));
         end
 end