inprogress

[jalview.git] / forester / java / src / org / forester / sdi / SDIR.java

diff --git a/forester/java/src/org/forester/sdi/SDIR.java b/forester/java/src/org/forester/sdi/SDIR.java
index 7af2359..dbab226 100644 (file)
--- a/forester/java/src/org/forester/sdi/SDIR.java
+++ b/forester/java/src/org/forester/sdi/SDIR.java
@@ -23,7 +23,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.sdi;
 
@@ -292,7 +292,7 @@ public class SDIR {
             prev_root_c2 = prev_root.getChildNode2();
             prev_root_was_dup = prev_root.isDuplication();
             final PhylogenyBranch current_branch = branches.get( j );
-            g.reRoot( current_branch );
+            GSDIR.reRoot( current_branch, g );
             if ( minimize_mapping_cost || minimize_sum_of_dup ) {
                 duplications = sdise.updateM( prev_root_was_dup, prev_root_c1, prev_root_c2 );
             }
@@ -494,8 +494,8 @@ public class SDIR {
             branches.add( new PhylogenyBranch( t.getRoot().getChildNode1(), t.getRoot().getChildNode2() ) );
             return branches;
         }
-        final Set<Integer> one = new HashSet<Integer>();
-        final Set<Integer> two = new HashSet<Integer>();
+        final Set<Long> one = new HashSet<Long>();
+        final Set<Long> two = new HashSet<Long>();
         PhylogenyNode node = t.getRoot();
         while ( !node.isRoot() || !two.contains( node.getId() ) ) {
             if ( !node.isExternal() && !two.contains( node.getId() ) ) {