remove unnecessary codes

Yigang0622 · Dec 10, 2016 · 8558ec6 · 8558ec6
1 parent e168157
commit 8558ec6
Show file tree

Hide file tree

Showing 12 changed files with 803 additions and 59 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/production/KMeans/Algo/Cluster.class b/out/production/KMeans/Algo/Cluster.class
diff --git a/out/production/KMeans/Algo/Distance.class b/out/production/KMeans/Algo/Distance.class
diff --git a/out/production/KMeans/Algo/KMeans.class b/out/production/KMeans/Algo/KMeans.class
diff --git a/out/production/KMeans/Algo/Main.class b/out/production/KMeans/Algo/Main.class
diff --git a/out/production/KMeans/Algo/MyVector.class b/out/production/KMeans/Algo/MyVector.class
diff --git a/out/production/KMeans/ColorPicker/FileUtil.class b/out/production/KMeans/ColorPicker/FileUtil.class
diff --git a/out/production/KMeans/ColorPicker/PaletteGUI.class b/out/production/KMeans/ColorPicker/PaletteGUI.class
diff --git a/out/production/KMeans/ColorPicker/ThemeColorPicker.class b/out/production/KMeans/ColorPicker/ThemeColorPicker.class
diff --git a/src/Algo/Cluster.java b/src/Algo/Cluster.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 
 /**
- * 簇
+ * 聚类
  * Created by Mike on 12/9/2016.
  */
 public class Cluster {
@@ -59,36 +59,6 @@ public MyVector getCenterVector(){
         return vector;
     }
 
-    private boolean hasVector(MyVector vector){
-
-        boolean has = false;
-
-        for(MyVector mVector:vectors){
-            if (mVector.isSameVector(vector)){
-                has = true;
-            }
-        }
-
-        return has;
-    }
-
-    public boolean isSameCluster(Cluster cluster){
-
-        if (cluster.eachVectorSize != this.eachVectorSize){
-            return false;
-        }
-
-        int counter = 0;
-        for (MyVector vector:cluster.getVectors()){
-            if (hasVector(vector)){
-                counter ++;
-            }
-        }
-
-        return counter == vectors.size();
-
-    }
-
 
 
     public static void main(String[] args){
@@ -102,7 +72,6 @@ public static void main(String[] args){
         cluster2.addToCluster(myVector2);
         cluster2.addToCluster(myVector);
 
-        System.out.println(cluster.isSameCluster(cluster2));
 
 
 

diff --git a/src/Algo/KMeans.java b/src/Algo/KMeans.java
@@ -10,7 +10,6 @@
 public class KMeans {
 
     private List<MyVector> vectors = new ArrayList<>();
-
     private List<MyVector> centers = new ArrayList<>(); //质心
 
     private int numberOfCluster = 0;
@@ -23,8 +22,6 @@ public KMeans(List<MyVector> vectors,int numberOfCluster){
         this.numberOfCluster = numberOfCluster;
         initCenters();
         initClusters();
-
-
     }
 
     public List<Cluster> getClusters(){
@@ -59,10 +56,9 @@ public void startClustering(){
         boolean converged = false;
 
         while (!converged && counter < numberOfIteration){
-
+            //printCenters();
             System.out.println("第"+counter+"次迭代");
 
-           // printCenters();
             double[][] distanceMatrix = new double[vectors.size()][numberOfCluster];
 
             //生成距离矩阵
@@ -107,10 +103,15 @@ public void startClustering(){
 
         System.out.println("聚类完成\n迭代次数"+counter);
 
-      //  printClusters();
+        //printClusters();
 
     }
 
+    /**
+     * 检测是否收敛(中心点和上次比是否变化)
+     * @param lastCenters
+     * @return
+     */
     private boolean isConverged(List<MyVector> lastCenters){
 
         if (lastCenters.size() != numberOfCluster){
@@ -138,7 +139,11 @@ private boolean isConverged(List<MyVector> lastCenters){
 
     }
 
-
+    /**
+     * 得到数组中最小值的下标
+     * @param arr
+     * @return
+     */
     private int getMinDistanceIndex(double[] arr){
 
         double min = 99999999999999999999999.0;
@@ -153,6 +158,10 @@ private int getMinDistanceIndex(double[] arr){
         return index;
     }
 
+    /**
+     * 打印二维数组
+     * @param mat
+     */
     private void printMatrix(double[][] mat){
 
         int height = mat.length;
@@ -166,13 +175,19 @@ private void printMatrix(double[][] mat){
         }
     }
 
+    /**
+     * 打印中心点
+     */
     private void printCenters(){
         System.out.println("Printing Centers");
         for (MyVector vector:centers){
             vector.printVector();
         }
     }
 
+    /**
+     * 打印所有聚类
+     */
     private void printClusters(){
         for (Cluster cluster:clusters){
             cluster.printCluster(false);
@@ -198,36 +213,22 @@ private void initCenters(){
 
     public static void main(String[] args){
         List<MyVector> vectors = new ArrayList<>();
-        vectors.add(new MyVector(new double[]{1.0, 1.0}));
-        vectors.add(new MyVector(new double[]{9.0, 8.0}));
         vectors.add(new MyVector(new double[]{2.0, 1.0}));
         vectors.add(new MyVector(new double[]{3.0, 2.0}));
         vectors.add(new MyVector(new double[]{10.0, 10.0}));
         vectors.add(new MyVector(new double[]{7.0, 8.0}));
         vectors.add(new MyVector(new double[]{3.0, 1.0}));
         vectors.add(new MyVector(new double[]{8.0, 9.0}));
-        vectors.add(new MyVector(new double[]{367, 10.0}));
         vectors.add(new MyVector(new double[]{10.0, 7.0}));
         vectors.add(new MyVector(new double[]{33.0, 8.0}));
         vectors.add(new MyVector(new double[]{1.0, 2.0}));
         vectors.add(new MyVector(new double[]{33.0, 9.0}));
         vectors.add(new MyVector(new double[]{35.0, 7.0}));
-        vectors.add(new MyVector(new double[]{100.0, 9.0}));
         vectors.add(new MyVector(new double[]{33.0, 10.0}));
         vectors.add(new MyVector(new double[]{8.0, 10.0}));
-        vectors.add(new MyVector(new double[]{105.0, 7.0}));
-        vectors.add(new MyVector(new double[]{99.0, 8.0}));
-        vectors.add(new MyVector(new double[]{1.0, 4.0}));
-        vectors.add(new MyVector(new double[]{101.0, 10.0}));
-        vectors.add(new MyVector(new double[]{333, 8.0}));
-        vectors.add(new MyVector(new double[]{444, 9.0}));
-        vectors.add(new MyVector(new double[]{423, 7.0}));
         vectors.add(new MyVector(new double[]{0.1, 2.0}));
-        KMeans kMeans = new KMeans(vectors,5);
+        KMeans kMeans = new KMeans(vectors,3);
         kMeans.startClustering();
-
-
-
     }
 
 

diff --git a/src/ColorPicker/ThemeColorPicker.java b/src/ColorPicker/ThemeColorPicker.java
@@ -36,11 +36,8 @@ public ThemeColorPicker(String path){
 
     public void getThemeColor(){
 
-        System.out.println("开始分析图片主色调");
-
         KMeans kMeans = new KMeans(vectors,colorNumber);
         kMeans.startClustering();
-        System.out.println("分析完成");
         List<Cluster> clusters = kMeans.getClusters();
 
         List<MyVector> vectors = new ArrayList<>();
@@ -102,8 +99,8 @@ private double getB(int x,int y){
     }
 
     public static void main(String[] args){
-        ThemeColorPicker picker = new ThemeColorPicker("C:\\Users\\Mike\\Desktop\\1.png");
-        picker.setColorNumber(8);
+        ThemeColorPicker picker = new ThemeColorPicker("/Users/Mike/Desktop/1.jpg");
+        picker.setColorNumber(5);
         picker.getThemeColor();
     }