--- tsp6.c	2007-11-06 11:22:23.000000000 +0100
+++ tsp8.c	2007-11-06 11:22:37.000000000 +0100
@@ -24,40 +24,38 @@
 	  sqr(cities[i].y-cities[j].y));
 }
 
-void swap(int *p, int *q)
+void swap(point *p, point *q)
 {
-  int tmp=*p;
+  point tmp=*p;
   *p = *q;
   *q = tmp;
 }
 
-void tsp(point cities[], int tour[], int ncities)
+void tsp(point cities[], point tour[], int ncities)
 {
   int i,j;
-  int ThisPt, ClosePt=0;
+  int ClosePt=0;
   double CloseDist;
   int endtour=0;
   
   for (i=1; i<ncities; i++)
-    tour[i]=i-1;
-  ThisPt = ncities-1;
-  tour[0] = ncities-1;
+    tour[i]=cities[i-1];
+  tour[0] = cities[ncities-1];
   
   for (i=1; i<ncities; i++) {
-    double ThisX = cities[ThisPt].x;
-    double ThisY = cities[ThisPt].y;
+    double ThisX = tour[i-1].x;
+    double ThisY = tour[i-1].y;
     CloseDist = DBL_MAX;
     for (j=i; j<ncities; j++) {
-      double ThisDist = sqr(cities[tour[j]].x-ThisX);
+      double ThisDist = sqr(tour[j].x-ThisX);
       if (ThisDist < CloseDist) {
-	ThisDist += sqr(cities[tour[j]].y-ThisY);
+	ThisDist += sqr(tour[j].y-ThisY);
 	if (ThisDist < CloseDist) {
 	  CloseDist = ThisDist;
 	  ClosePt = j;
 	}
       }
     }
-    ThisPt = tour[ClosePt];
     swap(&tour[i],&tour[ClosePt]);
   }
 }