X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsdi%2FGSDIR.java;h=52620a2f041430acc6f3101ac5ab5c5c8263dd73;hb=06b38f91bc061d8ab1dfea3b6238c94c95a30d26;hp=602e9e20ab285d5bb1d22b49357338da4418eaa3;hpb=cec0663378230521f24a851cb1c1c9491026b70a;p=jalview.git

diff --git a/forester/java/src/org/forester/sdi/GSDIR.java b/forester/java/src/org/forester/sdi/GSDIR.java
index 602e9e2..52620a2 100644
--- a/forester/java/src/org/forester/sdi/GSDIR.java
+++ b/forester/java/src/org/forester/sdi/GSDIR.java
@@ -42,7 +42,7 @@ public class GSDIR implements GSDII {
     private final int                        _min_duplications_sum;
     private final int                        _speciations_sum;
     private final BasicDescriptiveStatistics _duplications_sum_stats;
-    private final List<Phylogeny>            _min_duplications_sum_gene_trees;
+    private Phylogeny                        _min_duplications_sum_gene_tree;
     private final List<PhylogenyNode>        _stripped_gene_tree_nodes;
     private final List<PhylogenyNode>        _stripped_species_tree_nodes;
     private final Set<PhylogenyNode>         _mapped_species_tree_nodes;
@@ -52,7 +52,8 @@ public class GSDIR implements GSDII {
     public GSDIR( final Phylogeny gene_tree,
                   final Phylogeny species_tree,
                   final boolean strip_gene_tree,
-                  final boolean strip_species_tree ) throws SDIException {
+                  final boolean strip_species_tree,
+                  final boolean transfer_taxonomy ) throws SDIException {
         final NodesLinkingResult nodes_linking_result = GSDI.linkNodesOfG( gene_tree,
                                                                            species_tree,
                                                                            strip_gene_tree,
@@ -66,34 +67,45 @@ public class GSDIR implements GSDII {
         final List<PhylogenyBranch> gene_tree_branches_post_order = new ArrayList<PhylogenyBranch>();
         for( final PhylogenyNodeIterator it = gene_tree.iteratorPostorder(); it.hasNext(); ) {
             final PhylogenyNode n = it.next();
-            if ( !n.isRoot() /*&& !( n.getParent().isRoot() && n.isFirstChildNode() )*/) {
+            if ( !n.isRoot() && !( n.getParent().isRoot() && ( gene_tree.getRoot().getNumberOfDescendants() == 2 ) ) ) {
                 gene_tree_branches_post_order.add( new PhylogenyBranch( n, n.getParent() ) );
             }
         }
+        if ( gene_tree.getRoot().getNumberOfDescendants() == 2 ) {
+            gene_tree_branches_post_order.add( new PhylogenyBranch( gene_tree.getRoot().getChildNode1(), gene_tree
+                    .getRoot().getChildNode2() ) );
+        }
         int min_duplications_sum = Integer.MAX_VALUE;
         int speciations_sum = 0;
-        _min_duplications_sum_gene_trees = new ArrayList<Phylogeny>();
         _duplications_sum_stats = new BasicDescriptiveStatistics();
         for( final PhylogenyBranch branch : gene_tree_branches_post_order ) {
-            gene_tree.reRoot( branch );
+            reRoot( branch, gene_tree );
             PhylogenyMethods.preOrderReId( species_tree );
-            //TEST, remove later
-            //            for( final PhylogenyNodeIterator it = _gene_tree.iteratorPostorder(); it.hasNext(); ) {
-            //                final PhylogenyNode g = it.next();
-            //                if ( g.isInternal() ) {
-            //                    g.setLink( null );
-            //                }
-            //            }
-            final GSDIsummaryResult gsdi_result = GSDI.geneTreePostOrderTraversal( gene_tree, true );
+            final GSDIsummaryResult gsdi_result = GSDI.geneTreePostOrderTraversal( gene_tree,
+                                                                                   true,
+                                                                                   min_duplications_sum );
+            if ( gsdi_result == null ) {
+                continue;
+            }
             if ( gsdi_result.getDuplicationsSum() < min_duplications_sum ) {
                 min_duplications_sum = gsdi_result.getDuplicationsSum();
                 speciations_sum = gsdi_result.getSpeciationsSum();
-                _min_duplications_sum_gene_trees.clear();
-                _min_duplications_sum_gene_trees.add( gene_tree.copy() );
-                //_speciations_sum
+                _min_duplications_sum_gene_tree = gene_tree.copy();
+                if ( transfer_taxonomy ) {
+                    transferTaxonomy( _min_duplications_sum_gene_tree );
+                }
             }
             else if ( gsdi_result.getDuplicationsSum() == min_duplications_sum ) {
-                _min_duplications_sum_gene_trees.add( gene_tree.copy() );
+                final List<Phylogeny> l = new ArrayList<Phylogeny>();
+                l.add( _min_duplications_sum_gene_tree );
+                l.add( gene_tree );
+                final int index = getIndexesOfShortestTree( l ).get( 0 );
+                if ( index == 1 ) {
+                    _min_duplications_sum_gene_tree = gene_tree.copy();
+                    if ( transfer_taxonomy ) {
+                        transferTaxonomy( _min_duplications_sum_gene_tree );
+                    }
+                }
             }
             _duplications_sum_stats.addValue( gsdi_result.getDuplicationsSum() );
         }
@@ -114,8 +126,8 @@ public class GSDIR implements GSDII {
         return _min_duplications_sum;
     }
 
-    public List<Phylogeny> getMinDuplicationsSumGeneTrees() {
-        return _min_duplications_sum_gene_trees;
+    public Phylogeny getMinDuplicationsSumGeneTree() {
+        return _min_duplications_sum_gene_tree;
     }
 
     @Override
@@ -172,4 +184,40 @@ public class GSDIR implements GSDII {
         }
         return shortests;
     }
+
+    /**
+     * Places the root of this Phylogeny on Branch b. The new root is always
+     * placed on the middle of the branch b.
+     * 
+     */
+    static final void reRoot( final PhylogenyBranch b, final Phylogeny phy ) {
+        final PhylogenyNode n1 = b.getFirstNode();
+        final PhylogenyNode n2 = b.getSecondNode();
+        if ( n1.isExternal() ) {
+            phy.reRoot( n1 );
+        }
+        else if ( n2.isExternal() ) {
+            phy.reRoot( n2 );
+        }
+        else if ( ( n2 == n1.getChildNode1() ) || ( n2 == n1.getChildNode2() ) ) {
+            phy.reRoot( n2 );
+        }
+        else if ( ( n1 == n2.getChildNode1() ) || ( n1 == n2.getChildNode2() ) ) {
+            phy.reRoot( n1 );
+        }
+        //        else if ( ( n1.getParent() != null ) && n1.getParent().isRoot()
+        //                && ( ( n1.getParent().getChildNode1() == n2 ) || ( n1.getParent().getChildNode2() == n2 ) ) ) {
+        //            phy.reRoot( n1 );
+        //           
+        //        }
+        else {
+            throw new IllegalArgumentException( "reRoot( Branch b ): b is not a branch." );
+        }
+    }
+
+    private final static void transferTaxonomy( final Phylogeny gt ) {
+        for( final PhylogenyNodeIterator it = gt.iteratorPostorder(); it.hasNext(); ) {
+            GSDI.transferTaxonomy( it.next() );
+        }
+    }
 }