X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fprotein%2FBasicProtein.java;h=03bf129ae612e0258d8ef1fa5faadbf4ad0dcd3a;hb=6035dd06c322b649ac5a0c4df39abbf4503d3ad1;hp=b33082c8e6eed29caef2648b33e1056fa56d9706;hpb=9a4a1484a2ae6b664aa0adee8cbbc529d029ceb1;p=jalview.git

diff --git a/forester/java/src/org/forester/protein/BasicProtein.java b/forester/java/src/org/forester/protein/BasicProtein.java
index b33082c..03bf129 100644
--- a/forester/java/src/org/forester/protein/BasicProtein.java
+++ b/forester/java/src/org/forester/protein/BasicProtein.java
@@ -50,16 +50,16 @@ public class BasicProtein implements Protein {
     private final List<Domain>       _protein_domains;
     public static Comparator<Domain> DomainMidPositionComparator = new Comparator<Domain>() {
 
-                                                                     @Override
-                                                                     public int compare( final Domain d1,
-                                                                                         final Domain d2 ) {
-                                                                         final int m1 = ( d1.getTo() + d1.getFrom() );
-                                                                         final int m2 = ( d2.getTo() + d2.getFrom() );
-                                                                         return m1 < m2 ? -1 : m1 > m2 ? 1 : d1
-                                                                                 .getDomainId().getId()
-                                                                                 .compareTo( d2.getDomainId().getId() );
-                                                                     }
-                                                                 };
+        @Override
+        public int compare( final Domain d1,
+                            final Domain d2 ) {
+            final int m1 = ( d1.getTo() + d1.getFrom() );
+            final int m2 = ( d2.getTo() + d2.getFrom() );
+            return m1 < m2 ? -1 : m1 > m2 ? 1 : d1
+                    .getDomainId()
+                    .compareTo( d2.getDomainId() );
+        }
+    };
 
     public BasicProtein( final String id_str, final String species_str, final int length ) {
         if ( length < 0 ) {
@@ -88,17 +88,17 @@ public class BasicProtein implements Protein {
      * If in_nc_order is set to true, this returns true only and only if
      * the order in List 'domains' and this protein (as determined by the start positions
      * of the domains of this proteins, _not_ by their index) are the same
-     * (interspersing, 'other', domains in this are ignored). 
+     * (interspersing, 'other', domains in this are ignored).
      * If in_nc_order is set to false, this returns true only and only if
      * this contains all domains listed in 'domains' (order and count do not matter).
-     * 
+     *
      * @param domains a list of domain ids in a certain order.
      * @param in_nc_order to consider order
      * @return
      */
-    public boolean contains( final List<DomainId> query_domain_ids, final boolean in_nc_order ) {
+    public boolean contains( final List<String> query_domain_ids, final boolean in_nc_order ) {
         if ( !in_nc_order ) {
-            for( final DomainId query_domain_id : query_domain_ids ) {
+            for( final String query_domain_id : query_domain_ids ) {
                 if ( !getProteinDomainIds().contains( query_domain_id ) ) {
                     return false;
                 }
@@ -107,7 +107,7 @@ public class BasicProtein implements Protein {
         }
         else {
             int current_start_position = -1;
-            I: for( final DomainId query_domain_id : query_domain_ids ) {
+            I: for( final String query_domain_id : query_domain_ids ) {
                 if ( getProteinDomainIds().contains( query_domain_id ) ) {
                     final List<Domain> found_domains = getProteinDomains( query_domain_id );
                     final SortedSet<Integer> ordered_start_positions = new TreeSet<Integer>();
@@ -171,7 +171,7 @@ public class BasicProtein implements Protein {
     }
 
     @Override
-    public int getProteinDomainCount( final DomainId domain_id ) {
+    public int getProteinDomainCount( final String domain_id ) {
         return getProteinDomains( domain_id ).size();
     }
 
@@ -181,7 +181,7 @@ public class BasicProtein implements Protein {
     }
 
     @Override
-    public List<Domain> getProteinDomains( final DomainId domain_id ) {
+    public List<Domain> getProteinDomains( final String domain_id ) {
         final List<Domain> domains = new ArrayList<Domain>();
         for( final Domain domain : getProteinDomains() ) {
             if ( domain.getDomainId().equals( domain_id ) ) {
@@ -223,42 +223,57 @@ public class BasicProtein implements Protein {
             else {
                 sb.append( separator );
             }
-            sb.append( d.getDomainId().getId() );
+            sb.append( d.getDomainId() );
         }
         return sb.toString();
     }
 
-    public String toDomainArchitectureString( final String separator, int max_repeats ) {
-        if ( max_repeats < 2 ) {
-            throw new IllegalArgumentException( "max repeats cannot be smaller than 2" );
+    public String toDomainArchitectureString( final String separator,
+                                              final int repeats_limit,
+                                              final String repeat_separator ) {
+        if ( repeats_limit < 3 ) {
+            throw new IllegalArgumentException( "repeats limit cannot be smaller than 3" );
         }
         final StringBuilder sb = new StringBuilder();
-        boolean first = true;
+        StringBuilder buffer = new StringBuilder();
         String prev_id = "";
-        int counter = 0;
+        int counter = 1;
         for( final Domain d : getDomainsSortedByPosition() ) {
-            if ( first ) {
-                first = false;
-            }
-            else {
-                sb.append( separator );
-            }
-            if ( prev_id.equals( d.getDomainId().getId() ) ) {
+            final String id = d.getDomainId();
+            if ( prev_id.equals( id ) ) {
                 counter++;
             }
             else {
-                counter = 0;
+                counter = 1;
+                sb.append( buffer );
+                buffer = new StringBuilder();
+            }
+            if ( counter < repeats_limit ) {
+                buffer.append( id );
+                buffer.append( separator );
             }
-            if ( counter >= max_repeats ) {
+            else if ( counter == repeats_limit ) {
+                buffer = new StringBuilder();
+                buffer.append( id );
+                buffer.append( repeat_separator );
+                buffer.append( id );
+                buffer.append( repeat_separator );
+                buffer.append( id );
+                buffer.append( separator );
             }
-            sb.append( d.getDomainId().getId() );
-            prev_id = d.getDomainId().getId();
+            prev_id = id;
         }
+        sb.append( buffer.substring( 0, buffer.length() - 1 ) );
         return sb.toString();
     }
 
-    private List<DomainId> getProteinDomainIds() {
-        final List<DomainId> ids = new ArrayList<DomainId>( getProteinDomains().size() );
+    @Override
+    public String toString() {
+        return toDomainArchitectureString( "~" );
+    }
+
+    private List<String> getProteinDomainIds() {
+        final List<String> ids = new ArrayList<String>( getProteinDomains().size() );
         for( final Domain domain : getProteinDomains() ) {
             ids.add( domain.getDomainId() );
         }