Changeset 16899 for branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/EMMClustering.cs

Timestamp:

05/06/19 14:20:06 (5 years ago)

Author:

msemenki

Message:

#2988: New version of class structure.

File:

• branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/EMMClustering.cs (modified) (6 diffs)

branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/EMMClustering.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace HeuristicLab.Algorithms.EvolvmentModelsOfModels {
@@ -40 +39 @@
       return K;
     }
-    public static void ApplyFullConectedMapCreationAlgorithm(IRandom random, double[,] distances, List<List<int>> map, int k, int neghboorNumber = 10) {
-      int mapSize = distances.GetLength(0);
-      List<double> currentList = new List<double>();
-      for (int i = 0; i < mapSize; i++) {
-        map.Add(new List<int>());
-        for (int j = 0; j < mapSize; j++) {
-          currentList.Add(distances[i, j]);
-        }
-        map[i].Add(ChooseMinElement(currentList));
-        while (map[i].Count < neghboorNumber) {
-          map[i].Add(ChooseMinElement(currentList, i, map[i]));
-        }
-        currentList.Clear();
-      }
-    }
-    private static bool CheckNumberIsInList(int number, List<int> priviousNumber) {
-      foreach (var pNum in priviousNumber) {
-        if (number == pNum)
-          return true;
-      }
-      return false;
-    }
+
     public static int ApplyClusteringAlgorithm(IRandom random, double[,] distances, List<int> numberCluster, int k) {
       int mapSize = distances.GetLength(0);
@@ -82 +60 @@
         }
         for (int i = 0; i < mapSize; i++) {
-          numberCluster[i] = LookCloseCentroid(centroids, mapSize, distances, i, k);
+          numberCluster[i] = LookCloseCentroid(centroids, distances, i, k);
           clusters[numberCluster[i]].Add(numberCluster[i]);
         }
@@ -89 +67 @@
         for (int i = 0; i < k; i++) {
           AverageClusterDistanceCalculation(averageClusterDistance, distances, numberCluster, mapSize, i);
-          var newCentroid = clusters[i][ChooseMinElement(averageClusterDistance)];
+          var newCentroid = clusters[i][HelpFunctions.ChooseMinElementIndex(averageClusterDistance)];
           if (newCentroid != centroids[i]) {
             flag = true;
@@ -104 +82 @@
       }
     }
-    private static int LookCloseCentroid(List<int> centroids, int MapSize, double[,] distances, int currentNumber, int k) {
+    private static int LookCloseCentroid(List<int> centroids, double[,] distances, int currentNumber, int k) {
       double minDistanse = distances[currentNumber, centroids[0]];
       int clusterNum = 0;
@@ -152 +130 @@
       }
     }
-    private static int ChooseMinElement(List<double> averageClusterDistance) {
-      double minValue = averageClusterDistance[0];
-      int minElementNumber = 0;
-      for (int i = 1; i < averageClusterDistance.Count(); i++) {
-        if (averageClusterDistance[i] < minValue) {
-          minValue = averageClusterDistance[i];
-          minElementNumber = i;
-        }
-      }
-      return minElementNumber;
-    }
-    private static int ChooseMinElement(List<double> distances, int currentElement, List<int> previousNumbers) {
-      double minValue = 100;
-      int minElementNumber = 0;
-      int temp = 0, i = 0;
-      while (temp == 0) {
-        if ((currentElement != i) && (!CheckNumberIsInList(i, previousNumbers))) {
-          minValue = distances[i];
-          minElementNumber = i;
-          temp = i;
-        }
-        i++;
-      }
-      for (i = 0; i < distances.Count(); i++) {
-        if ((distances[i] < minValue) && (currentElement != i) && (!CheckNumberIsInList(i, previousNumbers))) {
-          minValue = distances[i];
-          minElementNumber = i;
-        }
-      }
-      return minElementNumber;
-    }
+
+
   }
 }