Formatted source

[jalview.git] / src / MCview / Zsort.java

diff --git a/src/MCview/Zsort.java b/src/MCview/Zsort.java
index 215f753..322fd2a 100755 (executable)
--- a/src/MCview/Zsort.java
+++ b/src/MCview/Zsort.java
@@ -16,54 +16,48 @@
 * along with this program; if not, write to the Free Software\r
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
 */\r
-\r
 package MCview;\r
 \r
 import java.util.*;\r
 \r
-public class Zsort {\r
-\r
-  public static void Zsort(Vector bonds) {\r
-\r
-    sort(bonds,0,bonds.size()-1);\r
-  }\r
-\r
-\r
-\r
-  public static void sort(Vector bonds,int p, int r) {\r
-    int q;\r
 \r
-    if (p < r) {\r
-      q = partition(bonds,p,r);\r
-      sort(bonds,p,q);\r
-      sort(bonds,q+1,r);\r
+public class Zsort {\r
+    public static void Zsort(Vector bonds) {\r
+        sort(bonds, 0, bonds.size() - 1);\r
     }\r
-  }\r
-\r
-  private static int partition(Vector bonds, int p, int r) {\r
-    float x = ((Bond)bonds.elementAt(p)).start[2];\r
-    int i = p-1;\r
-    int j = r+1;\r
 \r
-    while(true) {\r
-      do {\r
-        j = j-1;\r
-      }        while (j >= 0  && ((Bond)bonds.elementAt(j)).start[2] > x);\r
+    public static void sort(Vector bonds, int p, int r) {\r
+        int q;\r
 \r
-      do {\r
-        i = i+1;\r
-      } while (i < bonds.size() && ((Bond)bonds.elementAt(i)).start[2] < x);\r
+        if (p < r) {\r
+            q = partition(bonds, p, r);\r
+            sort(bonds, p, q);\r
+            sort(bonds, q + 1, r);\r
+        }\r
+    }\r
 \r
-      if ( i < j) {\r
-        Bond tmp = (Bond)bonds.elementAt(i);\r
-        bonds.setElementAt(bonds.elementAt(j),i);\r
-        bonds.setElementAt(tmp,j);\r
-      } else {\r
-        return j;\r
-      }\r
+    private static int partition(Vector bonds, int p, int r) {\r
+        float x = ((Bond) bonds.elementAt(p)).start[2];\r
+        int i = p - 1;\r
+        int j = r + 1;\r
+\r
+        while (true) {\r
+            do {\r
+                j = j - 1;\r
+            } while ((j >= 0) && (((Bond) bonds.elementAt(j)).start[2] > x));\r
+\r
+            do {\r
+                i = i + 1;\r
+            } while ((i < bonds.size()) &&\r
+                    (((Bond) bonds.elementAt(i)).start[2] < x));\r
+\r
+            if (i < j) {\r
+                Bond tmp = (Bond) bonds.elementAt(i);\r
+                bonds.setElementAt(bonds.elementAt(j), i);\r
+                bonds.setElementAt(tmp, j);\r
+            } else {\r
+                return j;\r
+            }\r
+        }\r
     }\r
-  }\r
 }\r
-\r
-\r
-\r