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-629 Improved consistency of ArgParser classes (use of ArgValuesMap). Added settin...
[jalview.git]
/
src
/
jalview
/
datamodel
/
ContactListImpl.java
diff --git
a/src/jalview/datamodel/ContactListImpl.java
b/src/jalview/datamodel/ContactListImpl.java
index
6eb4cdb
..
beb557f
100644
(file)
--- a/
src/jalview/datamodel/ContactListImpl.java
+++ b/
src/jalview/datamodel/ContactListImpl.java
@@
-10,7
+10,6
@@
public class ContactListImpl implements ContactListI
{
ContactListProviderI clist;
{
ContactListProviderI clist;
-
public static ContactListI newContactList(ContactListProviderI list)
{
return new ContactListImpl(list);
public static ContactListI newContactList(ContactListProviderI list)
{
return new ContactListImpl(list);
@@
-22,6
+21,12
@@
public class ContactListImpl implements ContactListI
}
@Override
}
@Override
+ public int getPosition()
+ {
+ return clist.getPosition();
+ }
+
+ @Override
public double getContactAt(int column)
{
return clist.getContactAt(column);
public double getContactAt(int column)
{
return clist.getContactAt(column);
@@
-53,7
+58,7
@@
public class ContactListImpl implements ContactListI
cr.setFrom_column(from_column);
cr.setTo_column(to_column);
double tot = 0;
cr.setFrom_column(from_column);
cr.setTo_column(to_column);
double tot = 0;
- for (int i = from_column; i < to_column; i++)
+ for (int i = from_column; i <= to_column; i++)
{
double contact = getContactAt(i);
tot += contact;
{
double contact = getContactAt(i);
tot += contact;
@@
-80,7
+85,7
@@
public class ContactListImpl implements ContactListI
}
if (tot > 0)
{
}
if (tot > 0)
{
- cr.setMean(tot / (to_column - from_column));
+ cr.setMean(tot / (1 + to_column - from_column));
}
else
{
}
else
{