X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FPairwiseGenomeComparator.java;h=62817642a76a9d6199935d4d76b1f495e544da6a;hb=ce9e2773527fda17dcd058c8432a3bffbfadecdc;hp=789574a2e6d9d8740a2b36e253e0507ae4eafccf;hpb=eee996a6476a1e3d84c07f8f690dcde3ff4b2ef5;p=jalview.git diff --git a/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java b/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java index 789574a..6281764 100644 --- a/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java +++ b/forester/java/src/org/forester/surfacing/PairwiseGenomeComparator.java @@ -22,7 +22,7 @@ // 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; @@ -43,6 +43,8 @@ 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.protein.DomainId; +import org.forester.species.Species; import org.forester.surfacing.DomainSimilarityCalculator.Detailedness; import org.forester.util.DescriptiveStatistics; import org.forester.util.ForesterUtil; @@ -99,7 +101,6 @@ public class PairwiseGenomeComparator { final boolean verbose, final String automated_pairwise_comparison_prefix, final String command_line_prg_name, - final boolean display_histograms, final File out_dir, final boolean write_pairwise_comparisons ) { init(); @@ -164,7 +165,6 @@ public class PairwiseGenomeComparator { list_of_genome_wide_combinable_domains .get( j ) ); genome_similarity_calculator.setAllowDomainsToBeIgnored( false ); - // TODO make histos for these 5 values double dissimilarity_score_mean; if ( stats.getN() < 1 ) { // No domains in common @@ -216,6 +216,7 @@ public class PairwiseGenomeComparator { new StringBuilder( species_i + "-" + species_j ), writer, + null, similarities, true, null, @@ -229,8 +230,6 @@ public class PairwiseGenomeComparator { + pairwise_similarities_output_file_str + "\" [" + e.getMessage() + "]" ); } } - // pairwise_matrix.setValue( i, j, cdc_list.get( cdc_list.size() - // - 1 ) ); if ( pw_stats != null ) { if ( pw_stats.getMin() >= pw_stats.getMax() ) { ForesterUtil @@ -239,16 +238,6 @@ public class PairwiseGenomeComparator { + pw_stats.getMax() + "], possibly indicating that a genome is compared to itself" ); } - if ( display_histograms && ( pw_stats.getMin() < pw_stats.getMax() ) ) { - //final double[] values = pw_stats.getDataAsDoubleArray(); - // List data_items = new - // ArrayList( values.length ); - // for( int n = 0; n < values.length; i++ ) { - // data_items.add( new BasicHistogramDataItem( "", values[ n ] ) - // ); - // } - //~ _histogram_datas.add( new HistogramData( species_i + "-" + species_j, values, null, 20 ) ); - } } } }