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
Merge branch 'doc/JAL-4090_Release_2_11_3_0' into develop
[jalview.git]
/
src
/
jalview
/
datamodel
/
ContactMatrix.java
diff --git
a/src/jalview/datamodel/ContactMatrix.java
b/src/jalview/datamodel/ContactMatrix.java
index
bbc5100
..
48b6e6b
100644
(file)
--- a/
src/jalview/datamodel/ContactMatrix.java
+++ b/
src/jalview/datamodel/ContactMatrix.java
@@
-160,21
+160,17
@@
public abstract class ContactMatrix implements ContactMatrixI
{
return "Contact Matrix";
}
{
return "Contact Matrix";
}
-
GroupSet grps = new GroupSet();
GroupSet grps = new GroupSet();
-
@Override
public GroupSetI getGroupSet()
{
return grps;
}
@Override
public GroupSetI getGroupSet()
{
return grps;
}
-
@Override
public void setGroupSet(GroupSet makeGroups)
{
grps = makeGroups;
}
@Override
public void setGroupSet(GroupSet makeGroups)
{
grps = makeGroups;
}
-
public static String contactToFloatString(ContactMatrixI cm)
{
StringBuilder sb = new StringBuilder();
public static String contactToFloatString(ContactMatrixI cm)
{
StringBuilder sb = new StringBuilder();
@@
-202,7
+198,6
@@
public abstract class ContactMatrix implements ContactMatrixI
float[][] vals = new float[cols][rows];
StringTokenizer tabsep = new StringTokenizer(values, "" + '\t');
int c = 0, r = 0;
float[][] vals = new float[cols][rows];
StringTokenizer tabsep = new StringTokenizer(values, "" + '\t');
int c = 0, r = 0;
-
while (tabsep.hasMoreTokens())
{
double elem = Double.valueOf(tabsep.nextToken());
while (tabsep.hasMoreTokens())
{
double elem = Double.valueOf(tabsep.nextToken());
@@
-214,7
+209,6
@@
public abstract class ContactMatrix implements ContactMatrixI
}
if (c >= vals.length)
{
}
if (c >= vals.length)
{
-
break;
}
}
break;
}
}
@@
-223,7
+217,6
@@
public abstract class ContactMatrix implements ContactMatrixI
Console.warn(
"Ignoring additional elements for Float string to contact matrix parsing.");
}
Console.warn(
"Ignoring additional elements for Float string to contact matrix parsing.");
}
-
return vals;
}
}
return vals;
}
}