From 91ece41baeccb6bdeea7ec9a238a5ddd15ce3d49 Mon Sep 17 00:00:00 2001
From: "facat@lab.com" <facat@lab.com>
Date: Mon, 8 Dec 2014 10:23:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=AF=84=E4=BB=B7=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E6=9D=A5=E6=B5=8B=E8=B7=9D=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: facat@lab.com <facat@lab.com>
---
 main.m      | 25 +++++++++++++++----------
 metricFun.m |  4 ++++
 2 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 metricFun.m

diff --git a/main.m b/main.m
index a5fdce2..17f751c 100644
--- a/main.m
+++ b/main.m
@@ -5,15 +5,15 @@ tic
 %先形成初始点
 center=[1,1,1,1,1;10,10,10,10,10;100,100,100,100,100;1000,1000,1000,1000,1000];
 % center=[1;10;100;1000];
-dataN=50000;% 生成多少个数据
+dataN=100;% 生成多少个数据
 Dim=5;
-clusterN=100;
-data=zeros(Dim,dataN);
-% data=[11,101,1001,1,2,3];
-for I=1:dataN
-    i=round(1+(4-1)*rand());
-    data(:,I)=center(i)*( -1+(1+1)*rand(Dim,1));
-end
+clusterN=10;
+% data=zeros(Dim,dataN);
+% % data=[11,101,1001,1,2,3];
+% for I=1:dataN
+%     i=round(1+(4-1)*rand());
+%     data(:,I)=center(i)*( -1+(1+1)*rand(Dim,1));
+% end
 
 data=rand(Dim,dataN);
 
@@ -42,11 +42,13 @@ for clusterI=1:clusterN-1
 %                     continue
 %                 end
                 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) );
             Cij=Cij+max([minD-distanceIJ,0]);
         end
         maxG(cluster)=Cij;
@@ -80,6 +82,7 @@ while 1
                 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)) );
                     if distance<minD
                         minD=distance;
                     else
@@ -89,8 +92,10 @@ while 1
                     end
                     
                 end
-                distanceIJ=sum((d-data(:,cadUSetS(H))).^2).^.5;%S(I)已经等于U(H)
-                distanceHJ=sum((d-data(:,cadSetS(I))).^2).^.5;
+%                 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;
+                distanceHJ=metricFun( d,data(:,cadSetS(I)) );
                 if distanceIJ>minD
                     Kjih=min([distanceHJ-minD,0]);
                 end
diff --git a/metricFun.m b/metricFun.m
new file mode 100644
index 0000000..341bf7a
--- /dev/null
+++ b/metricFun.m
@@ -0,0 +1,4 @@
+function [ output_args ] = metricFun( a,b )
+output_args=sum((a-b).^2).^.5;
+end
+