X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FPairwiseGenomeComparator.java;h=07ece5bae14277fcd1a5c96e5cc933d6f3193de3;hb=eae9b4d545845ccc94c1465c1664086b22188ad1;hp=c020d820738958623157148ff0445fe47057c0b6;hpb=1cc7085032221eb6dea3ceeacc34ed710cf18318;p=jalview.git diff --git a/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java b/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java index c020d82..07ece5b 100644 --- a/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java +++ b/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java @@ -43,6 +43,7 @@ import org.forester.evoinference.matrix.distance.DistanceMatrix; import org.forester.go.GoId; import org.forester.go.GoNameSpace; import org.forester.go.GoTerm; +import org.forester.phylogeny.Phylogeny; import org.forester.species.Species; import org.forester.surfacing.DomainSimilarityCalculator.Detailedness; import org.forester.util.DescriptiveStatistics; @@ -98,7 +99,8 @@ public class PairwiseGenomeComparator { final File out_dir, final boolean write_pairwise_comparisons, final Map tax_code_to_id_map, - final boolean calc_similarity_scores ) { + final boolean calc_similarity_scores, + final Phylogeny phy ) { init(); final BasicSymmetricalDistanceMatrix domain_distance_scores_means = new BasicSymmetricalDistanceMatrix( number_of_genomes ); final BasicSymmetricalDistanceMatrix shared_domains_based_distances = new BasicSymmetricalDistanceMatrix( number_of_genomes ); @@ -206,6 +208,7 @@ public class PairwiseGenomeComparator { : out_dir + ForesterUtil.FILE_SEPARATOR + pairwise_similarities_output_file_str ) ); SurfacingUtil.writeDomainSimilaritiesToFile( html_desc, new StringBuilder( species_i + "-" + species_j ), + null, writer, null, similarities, @@ -214,7 +217,8 @@ public class PairwiseGenomeComparator { domain_similarity_print_option, scoring, false, - tax_code_to_id_map ); + tax_code_to_id_map, + phy ); } catch ( final IOException e ) { ForesterUtil.fatalError( command_line_prg_name, "Failed to write similarites to: \""