inprogress

[jalview.git] / forester / java / src / org / forester / surfacing / DomainSimilarity.java

diff --git a/forester/java/src/org/forester/surfacing/DomainSimilarity.java b/forester/java/src/org/forester/surfacing/DomainSimilarity.java
index b9e9860..bf9cef4 100644 (file)
--- a/forester/java/src/org/forester/surfacing/DomainSimilarity.java
+++ b/forester/java/src/org/forester/surfacing/DomainSimilarity.java
@@ -26,11 +26,12 @@
 
 package org.forester.surfacing;
 
+import java.util.Map;
 import java.util.SortedMap;
 import java.util.SortedSet;
 
-import org.forester.protein.DomainId;
 import org.forester.species.Species;
+import org.forester.surfacing.PrintableDomainSimilarity.PRINT_OPTION;
 
 /*
  * This is to represent a measure of similarity between two or more domains from
@@ -38,9 +39,17 @@ import org.forester.species.Species;
  */
 public interface DomainSimilarity extends Comparable<DomainSimilarity> {
 
-    public SortedSet<DomainId> getCombinableDomainIds( final Species species_of_combinable_domain );;
+    static public enum DomainSimilarityScoring {
+        DOMAINS, PROTEINS, COMBINATIONS;
+    }
+
+    public static enum DomainSimilaritySortField {
+        MIN, MAX, SD, MEAN, ABS_MAX_COUNTS_DIFFERENCE, MAX_COUNTS_DIFFERENCE, MAX_DIFFERENCE, SPECIES_COUNT, DOMAIN_ID,
+    }
+
+    public SortedSet<String> getCombinableDomainIds( final Species species_of_combinable_domain );
 
-    public DomainId getDomainId();
+    public String getDomainId();
 
     /**
      * For pairwise similarities, this should return the "difference"; for example the difference in counts
@@ -88,17 +97,9 @@ public interface DomainSimilarity extends Comparable<DomainSimilarity> {
      * 
      * @return SortedMap<String, SpeciesSpecificDomainSimilariyData>
      */
-    public SortedMap<Species, SpeciesSpecificDomainSimilariyData> getSpeciesData();
+    public SortedMap<Species, SpeciesSpecificDcData> getSpeciesData();
 
     public double getStandardDeviationOfSimilarityScore();
 
-    public StringBuffer toStringBuffer( final PrintableDomainSimilarity.PRINT_OPTION print_option );
-
-    static public enum DomainSimilarityScoring {
-        DOMAINS, PROTEINS, COMBINATIONS;
-    }
-
-    public static enum DomainSimilaritySortField {
-        MIN, MAX, SD, MEAN, ABS_MAX_COUNTS_DIFFERENCE, MAX_COUNTS_DIFFERENCE, MAX_DIFFERENCE, SPECIES_COUNT, DOMAIN_ID,
-    }
+    public StringBuffer toStringBuffer( PRINT_OPTION print_option, Map<String, Integer> tax_code_to_id_map );
 }