From d45c8c4eabfdcf0a5c162b5953f85628ebf605b1 Mon Sep 17 00:00:00 2001
From: "facat@lab.com" <facat@lab.com>
Date: Mon, 8 Dec 2014 11:36:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=20if=20distance<minD=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20min2D=3DminD?=
 =?UTF-8?q?;=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20minD=3Ddistance;=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20else=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20if=20distanc?=
 =?UTF-8?q?e<min2D=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20min2D=3Ddistance;=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?end=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20end=20=E4=BF=AE=E5=A4=8D=E8=BF=99=E9=87=8C=E7=9A=84bug?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E4=B8=BA=E6=9B=B4=E6=96=B0minD=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A7=E7=9A=84=E5=80=BC=E5=BA=94=E8=AF=A5=E7=BB=99?=
 =?UTF-8?q?min2D=EF=BC=8C=E6=97=A7=E7=9A=84=E5=80=BC=E6=98=AF=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E5=B0=8F=E7=9A=84=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2.

if abs(distanceIJ-minD)<1e-5
                    Kjih=min([distanceHJ,min2D])-minD;
                elseif distanceIJ<sminD
                    fprintf('Input must be a string\n')
                end

由于舍入误差的原因，可能distanceIJ与sminD相等的时候distanceIJ<sminD仍成立。

Signed-off-by: facat@lab.com <facat@lab.com>
---
 main.m      | 58 +++++++++++++++++++++++++++++++++++++----------------
 metricFun.m |  2 ++
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/main.m b/main.m
index 17f751c..eca3f4d 100644
--- a/main.m
+++ b/main.m
@@ -16,7 +16,8 @@ clusterN=10;
 % end
 
 data=rand(Dim,dataN);
-
+data=load('data');
+data=data.data;
 
 SetS=[1;];
 
@@ -37,18 +38,21 @@ for clusterI=1:clusterN-1
             d=data(:,J);
             %Ѱ����̾���
             minD=1e20;
-            for D=1:length(SetS)%between j and the closest object in S.
-%                 if J==cadSetS(D)
-%                     continue
-%                 end
-                distance=sum((d-data(:,SetS(D))).^2).^.5;
+%             for D=1:length(SetS)%between j and the closest object in S.
+% %                 distance=sum((d-data(:,SetS(D))).^2).^.5;
 %                 distance=metricFun( d,data(:,SetS(D)) );
-                if distance<minD
-                    minD=distance;
-                end
-            end
-            distanceIJ=sum((d-data(:,cddtI)).^2).^.5;
-%             distanceIJ=metricFun( d,data(:,cddtI) );
+%                 if distance<minD
+%                     minD=distance;
+%                 end
+%             end
+
+            matDistance=repmat(d,1,length(SetS));
+            minD=matDistance-data(:,SetS);
+            minD=diag(minD'*minD);
+            minD=min(minD.^.5);
+            
+%             distanceIJ=sum((d-data(:,cddtI)).^2).^.5;
+            distanceIJ=metricFun( d,data(:,cddtI) );
             Cij=Cij+max([minD-distanceIJ,0]);
         end
         maxG(cluster)=Cij;
@@ -80,10 +84,12 @@ while 1
                 end
                 minD=1e20;
                 min2D=minD;
+                
                 for G=1:length(SetS)%between j and the closest object in S.
-                    distance=sum((d-data(:,SetS(G))).^2).^.5;
-%                     distance=metricFun( d,data(:,SetS(G)) );
+%                     distance=sum((d-data(:,SetS(G))).^2).^.5;
+                    distance=metricFun( d,data(:,SetS(G)) );
                     if distance<minD
+                        min2D=minD;
                         minD=distance;
                     else
                         if distance<min2D
@@ -92,6 +98,24 @@ while 1
                     end
                     
                 end
+
+                smatDistance=repmat(d,1,length(SetS));
+                sminD=smatDistance-data(:,SetS);
+                sminD=diag(sminD'*sminD).^.5;
+                tsminD=sminD;
+                sminD_t=min(sminD);
+                sminD(sminD==sminD_t)=1e20;
+                smin2D=min(sminD);
+                sminD=sminD_t;
+                if abs(sminD-minD)>1e-5 || abs(smin2D-min2D)>1e-5
+                    fdf=0;
+                end
+%                 minD=sminD;
+%                 minD
+%                 sminD
+%                 min2D=smin2D;
+
+
 %                 distanceIJ=sum((d-data(:,cadUSetS(H))).^2).^.5;%S(I)�Ѿ�����U(H)
                 distanceIJ=metricFun( d,data(:,cadUSetS(H)) );
 %                 distanceHJ=sum((d-data(:,cadSetS(I))).^2).^.5;
@@ -99,12 +123,12 @@ while 1
                 if distanceIJ>minD
                     Kjih=min([distanceHJ-minD,0]);
                 end
-                if distanceIJ<minD
-                    fprintf('Input must be a string\n')
-                end
                 if abs(distanceIJ-minD)<1e-5
                     Kjih=min([distanceHJ,min2D])-minD;
+                elseif distanceIJ<sminD
+                    fprintf('Input must be a string\n')
                 end
+
                 sumKjih=sumKjih+Kjih;
             end
             if sumKjih<minKjih
diff --git a/metricFun.m b/metricFun.m
index 341bf7a..708660e 100644
--- a/metricFun.m
+++ b/metricFun.m
@@ -1,4 +1,6 @@
 function [ output_args ] = metricFun( a,b )
 output_args=sum((a-b).^2).^.5;
+% output_args=(a-b)'*(a-b);
+% output_args=sum(abs(a-b));
 end