Changeset 7232 for branches/FitnessLandscapeAnalysis/VRPProblemAnalyzer/KMeansClustering.cs

Timestamp:

12/22/11 16:23:01 (12 years ago)

Author:

epitzer

Message:

#1696: Updated build configuration and simplified thread handling and removed hard coded paths

File:

• branches/FitnessLandscapeAnalysis/VRPProblemAnalyzer/KMeansClustering.cs (modified) (2 diffs)

branches/FitnessLandscapeAnalysis/VRPProblemAnalyzer/KMeansClustering.cs

@@ -23 +23 @@
         double[,] centers = null;
         int[] xyc = null;
-        bool aborted = false;
 
 
@@ -29 +28 @@
           alglib.kmeansgenerate(vertices, vertices.Length / 2, 2, k, restarts + 1, out info, out centers, out xyc);
         });
-
         t.Start();
-        Stopwatch sw = new Stopwatch();
-        sw.Start();
-        while (t.ThreadState == System.Threading.ThreadState.Running && sw.ElapsedMilliseconds < 1000) {
-          Thread.Sleep(10);
+        if (!t.Join(1000)) {
+          t.Abort();
+          continue;
         }
-        sw.Stop();
-
-        if (t.ThreadState == System.Threading.ThreadState.Running) {
-          aborted = true;
-          t.Abort();
-        } 
 
         if (info == -3)
           return new List<Cluster>();
-        else if (info == 1 && !aborted) {
+        else if (info == 1) {
           List<Cluster> result = new List<Cluster>();
           int count = centers.Length / 2;