From 7632fa2632e7e88659b0bcae694840543bda3f7b Mon Sep 17 00:00:00 2001
From: Jochen Keil <jochen.keil@gmail.com>
Date: Sat, 3 Jul 2010 09:52:23 +0200
Subject: [PATCH] rename envThread to be more generic and appropriate

---
 src/aco/TspAcoGui.java | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/aco/TspAcoGui.java b/src/aco/TspAcoGui.java
index 9e5a684..fae428d 100644
--- a/src/aco/TspAcoGui.java
+++ b/src/aco/TspAcoGui.java
@@ -16,7 +16,7 @@ public class TspAcoGui
 
   static final long serialVersionUID = 100000000L;
 
-  protected Thread envThread = null;
+  protected AntView antView = null;
   protected final String tspdir = "../src/aco/tspproblems/";
 
   String filename;// = "rat99.tsp";
@@ -204,22 +204,22 @@ public class TspAcoGui
         filename = filename.substring(0,i) + " " + filename.substring(i+3);
     }
 
-    if (envThread != null) {
-      if (envThread.isAlive()) {
-        envThread.interrupt();
+    if (antThread != null) {
+      if (antThread.isAlive()) {
+        antThread.interrupt();
         try {
-          envThread.join();
+          antThread.join();
         } catch (InterruptedException ie) {
           System.err.println(ie);
           return;
         }
-        envThread = null;
+        antThread = null;
         startButton.setText("Run selected Algorithm");
         System.gc();
       }
     } else {
-      envThread = new Thread(envRunnable());
-      envThread.start();
+      antThread = new Thread(envRunnable());
+      antThread.start();
       startButton.setText("Stop Computation");
     }
 
@@ -314,27 +314,27 @@ public class TspAcoGui
   }
 
   public Environment envRunnable() {
-    Environment envThread = null;
+    Environment antThread = null;
       switch(choice) {
         case 0:
-          envThread =
+          antThread =
             EnvironmentFactory.as(filename, alpha, beta, 0, roh, ants, runs);
           break;
         case 1:
-          envThread =
+          antThread =
             EnvironmentFactory.eas(filename, alpha, beta, 0, roh, ew, ants, runs);
           break;
         case 2:
-          envThread =
+          antThread =
             EnvironmentFactory.asrank(filename, alpha, beta, 0, roh, w, ants, runs);
           break;
         case 3:
-          envThread =
+          antThread =
             EnvironmentFactory.acs(filename, beta, q, roh, cl, ants, runs);
           break;
       }
 
-    return envThread;
+    return antThread;
   }
 
   public static void main(String[] args) {
-- 
2.11.4.GIT