X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FGenomeWideCombinableDomains.java;h=81fd861a4322ca726d261c258d49ad47792227f1;hb=63685dd0262a506f0bf17cba6be1aa1ada5330f3;hp=537f44f4cacad5380e2ab4187353dae9f97b9ddd;hpb=eee996a6476a1e3d84c07f8f690dcde3ff4b2ef5;p=jalview.git

diff --git a/forester/java/src/org/forester/surfacing/GenomeWideCombinableDomains.java b/forester/java/src/org/forester/surfacing/GenomeWideCombinableDomains.java
index 537f44f..81fd861 100644
--- a/forester/java/src/org/forester/surfacing/GenomeWideCombinableDomains.java
+++ b/forester/java/src/org/forester/surfacing/GenomeWideCombinableDomains.java
@@ -23,39 +23,39 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 //
 // Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
 
 package org.forester.surfacing;
 
 import java.util.SortedMap;
 import java.util.SortedSet;
 
-import org.forester.surfacing.BinaryDomainCombination.DomainCombinationType;
+import org.forester.protein.BinaryDomainCombination;
+import org.forester.protein.BinaryDomainCombination.DomainCombinationType;
+import org.forester.species.Species;
 import org.forester.util.DescriptiveStatistics;
 
 public interface GenomeWideCombinableDomains {
 
-    public boolean contains( DomainId key_id );
+    public boolean contains( String key_id );
 
-    public CombinableDomains get( DomainId key_id );
+    public CombinableDomains get( String key_id );
 
-    public SortedMap<DomainId, CombinableDomains> getAllCombinableDomainsIds();
+    public SortedMap<String, CombinableDomains> getAllCombinableDomainsIds();
 
     /**
      * This should return all domains ids present in the genome.
-     * 
+     *
      * @return a sorted set of domains ids
      */
-    public SortedSet<DomainId> getAllDomainIds();
+    public SortedSet<String> getAllDomainIds();
 
     public DomainCombinationType getDomainCombinationType();
 
-    SortedSet<DomainId> getMostPromiscuosDomain();
-
     /**
-     * This should return a statistic for per domain 
+     * This should return a statistic for per domain
      * promiscuity in a genome.
-     * 
+     *
      * @return descriptive statistics for per domain promiscuity in a genome
      */
     public DescriptiveStatistics getPerGenomeDomainPromiscuityStatistics();
@@ -66,14 +66,16 @@ public interface GenomeWideCombinableDomains {
 
     /**
      * This should return all binary domain combinations present in the genome.
-     * 
+     *
      * @return a sorted set of binary domain combinations
      */
     public SortedSet<BinaryDomainCombination> toBinaryDomainCombinations();
 
     public StringBuilder toStringBuilder( GenomeWideCombinableDomainsSortOrder order );
 
+    SortedSet<String> getMostPromiscuosDomain();
+
     public static enum GenomeWideCombinableDomainsSortOrder {
-        ALPHABETICAL_KEY_ID, KEY_DOMAIN_PROTEINS_COUNT, KEY_DOMAIN_COUNT, COMBINATIONS_COUNT
+        ALPHABETICAL_KEY_ID, COMBINATIONS_COUNT, KEY_DOMAIN_COUNT, KEY_DOMAIN_PROTEINS_COUNT
     }
 }