git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3349 Remove processed args from list to send to jalview
[jalview.git]
/
src
/
MCview
/
Zsort.java
diff --git
a/src/MCview/Zsort.java
b/src/MCview/Zsort.java
index
654eb80
..
6bdbafa
100755
(executable)
--- a/
src/MCview/Zsort.java
+++ b/
src/MCview/Zsort.java
@@
-20,16
+20,22
@@
*/
package MCview;
*/
package MCview;
-import java.util.*;
+import java.util.Vector;
public class Zsort
{
public class Zsort
{
- public void Zsort(Vector bonds)
+ /**
+ * Sorts the Bond list in ascending order of the z-value of the bond start
+ * atom
+ *
+ * @param bonds
+ */
+ public void sort(Vector<Bond> bonds)
{
sort(bonds, 0, bonds.size() - 1);
}
{
sort(bonds, 0, bonds.size() - 1);
}
- public void sort(Vector bonds, int p, int r)
+ public void sort(Vector<Bond> bonds, int p, int r)
{
int q;
{
int q;
@@
-41,9
+47,9
@@
public class Zsort
}
}
}
}
- private int partition(Vector bonds, int p, int r)
+ private int partition(Vector<Bond> bonds, int p, int r)
{
{
- float x = ((Bond) bonds.elementAt(p)).start[2];
+ float x = bonds.elementAt(p).start[2];
int i = p - 1;
int j = r + 1;
Bond tmp;
int i = p - 1;
int j = r + 1;
Bond tmp;
@@
-52,17
+58,16
@@
public class Zsort
do
{
j--;
do
{
j--;
- } while ((j >= 0) && (((Bond) bonds.elementAt(j)).start[2] > x));
+ } while ((j >= 0) && (bonds.elementAt(j).start[2] > x));
do
{
i++;
do
{
i++;
- } while ((i < bonds.size())
- && (((Bond) bonds.elementAt(i)).start[2] < x));
+ } while ((i < bonds.size()) && (bonds.elementAt(i).start[2] < x));
if (i < j)
{
if (i < j)
{
- tmp = (Bond) bonds.elementAt(i);
+ tmp = bonds.elementAt(i);
bonds.setElementAt(bonds.elementAt(j), i);
bonds.setElementAt(tmp, j);
}
bonds.setElementAt(bonds.elementAt(j), i);
bonds.setElementAt(tmp, j);
}