X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FContactListImpl.java;h=beb557faae4fd4d8a9a39cceebc7f32121820ee1;hb=0fbfbe484308a0a6d9663f69f287cc61cfba958a;hp=6eb4cdb301afe4680b4015ef4b4cefbd3a0927c2;hpb=4a560601f94b229cca59f64561bf87f146cc896b;p=jalview.git diff --git a/src/jalview/datamodel/ContactListImpl.java b/src/jalview/datamodel/ContactListImpl.java index 6eb4cdb..beb557f 100644 --- a/src/jalview/datamodel/ContactListImpl.java +++ b/src/jalview/datamodel/ContactListImpl.java @@ -10,7 +10,6 @@ public class ContactListImpl implements ContactListI { ContactListProviderI clist; - public static ContactListI newContactList(ContactListProviderI list) { return new ContactListImpl(list); @@ -22,6 +21,12 @@ public class ContactListImpl implements ContactListI } @Override + public int getPosition() + { + return clist.getPosition(); + } + + @Override 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; - for (int i = from_column; i < to_column; i++) + for (int i = from_column; i <= to_column; i++) { double contact = getContactAt(i); tot += contact; @@ -80,7 +85,7 @@ public class ContactListImpl implements ContactListI } if (tot > 0) { - cr.setMean(tot / (to_column - from_column)); + cr.setMean(tot / (1 + to_column - from_column)); } else {