X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FPairwiseGenomeComparator.java;h=b23f82b9ec058b0bfc94a74210acb274fda9e4ab;hb=10297bd8b8a4b4ab198a17a42fc6ff24ae2ed49b;hp=07ece5bae14277fcd1a5c96e5cc933d6f3193de3;hpb=380f98efacccdaeff5a86ba6b9b05367df133b79;p=jalview.git

diff --git a/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java b/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java
index 07ece5b..b23f82b 100644
--- a/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java
+++ b/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java
@@ -52,8 +52,8 @@ import org.forester.util.ForesterUtil;
 public class PairwiseGenomeComparator {
 
     private List<DistanceMatrix> _domain_distance_scores_means;
-    private List<DistanceMatrix> _shared_domains_based_distances;
     private List<DistanceMatrix> _shared_binary_combinations_based_distances;
+    private List<DistanceMatrix> _shared_domains_based_distances;
 
     public PairwiseGenomeComparator() {
         init();
@@ -71,19 +71,13 @@ public class PairwiseGenomeComparator {
         return _shared_domains_based_distances;
     }
 
-    private void init() {
-        _domain_distance_scores_means = new ArrayList<DistanceMatrix>();
-        _shared_domains_based_distances = new ArrayList<DistanceMatrix>();
-        _shared_binary_combinations_based_distances = new ArrayList<DistanceMatrix>();
-    }
-
     public void performPairwiseComparisons( final StringBuilder html_desc,
                                             final boolean sort_by_species_count_first,
                                             final Detailedness detailedness,
                                             final boolean ignore_domains_without_combs_in_all_spec,
                                             final boolean ignore_domains_specific_to_one_species,
                                             final DomainSimilarity.DomainSimilaritySortField domain_similarity_sort_field,
-                                            final PrintableDomainSimilarity.PRINT_OPTION domain_similarity_print_option,
+                                            final DomainSimilarity.PRINT_OPTION domain_similarity_print_option,
                                             final DomainSimilarity.DomainSimilarityScoring scoring,
                                             final Map<String, List<GoId>> domain_id_to_go_ids_map,
                                             final Map<GoId, GoTerm> go_id_to_term_map,
@@ -128,11 +122,11 @@ public class PairwiseGenomeComparator {
                 if ( ( list_of_genome_wide_combinable_domains.get( i ).getSize() < 1 )
                         || ( list_of_genome_wide_combinable_domains.get( j ).getSize() < 1 ) ) {
                     domain_distance_scores_means
-                            .setValue( i, j, DomainArchitectureBasedGenomeSimilarityCalculator.MAX_SIMILARITY_SCORE );
+                    .setValue( i, j, DomainArchitectureBasedGenomeSimilarityCalculator.MAX_SIMILARITY_SCORE );
                     shared_domains_based_distances
-                            .setValue( i, j, DomainArchitectureBasedGenomeSimilarityCalculator.MAX_SIMILARITY_SCORE );
+                    .setValue( i, j, DomainArchitectureBasedGenomeSimilarityCalculator.MAX_SIMILARITY_SCORE );
                     shared_binary_combinations_based_distances
-                            .setValue( i, j, DomainArchitectureBasedGenomeSimilarityCalculator.MAX_SIMILARITY_SCORE );
+                    .setValue( i, j, DomainArchitectureBasedGenomeSimilarityCalculator.MAX_SIMILARITY_SCORE );
                     continue;
                 }
                 final List<GenomeWideCombinableDomains> genome_pair = new ArrayList<GenomeWideCombinableDomains>( 2 );
@@ -145,7 +139,8 @@ public class PairwiseGenomeComparator {
                 final DomainSimilarityCalculator calc = new BasicDomainSimilarityCalculator( domain_similarity_sort_field,
                                                                                              sort_by_species_count_first,
                                                                                              true,
-                                                                                             calc_similarity_scores );
+                                                                                             calc_similarity_scores,
+                                                                                             true );
                 final SortedSet<DomainSimilarity> similarities = calc
                         .calculateSimilarities( pw_calc,
                                                 genome_pair,
@@ -156,9 +151,9 @@ public class PairwiseGenomeComparator {
                         .calculateDescriptiveStatisticsForMeanValues( similarities );
                 final String species_j = species[ j ].getSpeciesId();
                 final DomainArchitectureBasedGenomeSimilarityCalculator genome_similarity_calculator = new DomainArchitectureBasedGenomeSimilarityCalculator( list_of_genome_wide_combinable_domains
-                                                                                                                                                                      .get( i ),
+                                                                                                                                                              .get( i ),
                                                                                                                                                               list_of_genome_wide_combinable_domains
-                                                                                                                                                                      .get( j ) );
+                                                                                                                                                              .get( j ) );
                 genome_similarity_calculator.setAllowDomainsToBeIgnored( false );
                 double dissimilarity_score_mean;
                 if ( stats.getN() < 1 ) {
@@ -218,7 +213,8 @@ public class PairwiseGenomeComparator {
                                                                      scoring,
                                                                      false,
                                                                      tax_code_to_id_map,
-                                                                     phy );
+                                                                     phy,
+                                                                     null );
                     }
                     catch ( final IOException e ) {
                         ForesterUtil.fatalError( command_line_prg_name, "Failed to write similarites to: \""
@@ -279,15 +275,15 @@ public class PairwiseGenomeComparator {
                     genome_pair.add( list_of_genome_wide_combinable_domains.get( i ) );
                     genome_pair.add( list_of_genome_wide_combinable_domains.get( j ) );
                     final DomainArchitectureBasedGenomeSimilarityCalculator genome_simiarity_calculator = new DomainArchitectureBasedGenomeSimilarityCalculator( list_of_genome_wide_combinable_domains
-                                                                                                                                                                         .get( i ),
+                                                                                                                                                                 .get( i ),
                                                                                                                                                                  list_of_genome_wide_combinable_domains
-                                                                                                                                                                         .get( j ) );
+                                                                                                                                                                 .get( j ) );
                     genome_simiarity_calculator.setAllowDomainsToBeIgnored( true );
                     genome_simiarity_calculator.setDomainIdsToIgnore( domain_ids_to_ignore );
                     shared_domains_based_distances.setValue( i, j, 1.0 - genome_simiarity_calculator
-                            .calculateSharedDomainsBasedGenomeSimilarityScore() );
+                                                             .calculateSharedDomainsBasedGenomeSimilarityScore() );
                     shared_binary_combinations_based_distances.setValue( i, j, 1.0 - genome_simiarity_calculator
-                            .calculateSharedBinaryDomainCombinationBasedGenomeSimilarityScore() );
+                                                                         .calculateSharedBinaryDomainCombinationBasedGenomeSimilarityScore() );
                 }
             }
             getSharedDomainsBasedDistances().add( shared_domains_based_distances );
@@ -298,6 +294,12 @@ public class PairwiseGenomeComparator {
         }
     }
 
+    private void init() {
+        _domain_distance_scores_means = new ArrayList<DistanceMatrix>();
+        _shared_domains_based_distances = new ArrayList<DistanceMatrix>();
+        _shared_binary_combinations_based_distances = new ArrayList<DistanceMatrix>();
+    }
+
     static private String[] getAllUniqueDomainIdAsArray( final List<GenomeWideCombinableDomains> list_of_genome_wide_combinable_domains ) {
         String[] all_domain_ids_array;
         final SortedSet<String> all_domain_ids = new TreeSet<String>();