X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fclade_analysis%2FCladeAnalysisTest.java;h=d91e36e71496e9b06f80471dc781396b05ccde3a;hb=aca4b7b8dd799b10748337065bd6b3d7c7530e76;hp=a78e8fea25644e7fb9f79de1612980b7e37f513e;hpb=6dbb3925303243ac10f4f0db558634b5a23acdc1;p=jalview.git

diff --git a/forester/java/src/org/forester/clade_analysis/CladeAnalysisTest.java b/forester/java/src/org/forester/clade_analysis/CladeAnalysisTest.java
index a78e8fe..d91e36e 100644
--- a/forester/java/src/org/forester/clade_analysis/CladeAnalysisTest.java
+++ b/forester/java/src/org/forester/clade_analysis/CladeAnalysisTest.java
@@ -2,6 +2,7 @@
 package org.forester.clade_analysis;
 
 import java.io.File;
+import java.util.List;
 
 import org.forester.io.parsers.PhylogenyParser;
 import org.forester.io.parsers.util.ParserUtils;
@@ -25,6 +26,10 @@ public class CladeAnalysisTest {
             System.out.println( "Clade analysis 2 failed" );
             failed = true;
         }
+        if ( !testCladeAnalysis3() ) {
+            System.out.println( "Clade analysis 3 failed" );
+            failed = true;
+        }
         if ( !failed ) {
             System.out.println( "OK" );
         }
@@ -37,6 +42,9 @@ public class CladeAnalysisTest {
         if ( !testCladeAnalysis2() ) {
             return false;
         }
+        if ( !testCladeAnalysis3() ) {
+            return false;
+        }
         return true;
     }
 
@@ -582,4 +590,60 @@ public class CladeAnalysisTest {
         }
         return true;
     }
+    
+    private static boolean testCladeAnalysis3() {
+        try {
+          final Result2 res1 = new Result2();
+          res1.addGreatestCommonPrefix( "A.1.1", 0.3 );
+          res1.addGreatestCommonPrefix( "A.1.2", 0.3 );
+          res1.addGreatestCommonPrefix( "A.1.3", 0.3 );
+          res1.addGreatestCommonPrefix( "B.1", 0.1 );
+          
+          List<String> x = ForesterUtil.spliIntoPrefixes( "A.1.2.3.4", "." );
+         // System.out.println( x );
+          x =ForesterUtil.spliIntoPrefixes( "A", "." );
+         // System.out.println( x );
+          
+          
+          res1.analyzeGreatestCommonPrefixes( "." );
+          
+          final Result2 res2 = new Result2();
+          res2.addGreatestCommonPrefix( "A.1.1.1", 0.1 );
+          res2.addGreatestCommonPrefix( "A.1", 0.7 );
+          res2.addGreatestCommonPrefix( "A.1.2", 0.1 );
+          res2.addGreatestCommonPrefix( "B.1", 0.1 );
+          res2.analyzeGreatestCommonPrefixes( "." );
+          
+          final Result2 res3 = new Result2();
+          res3.addGreatestCommonPrefix( "A.1.1.1", 0.7 );
+          res3.addGreatestCommonPrefix( "A.1", 0.1 );
+          res3.addGreatestCommonPrefix( "A.1.2", 0.1 );
+          res3.addGreatestCommonPrefix( "B.1", 0.1 );
+          res3.analyzeGreatestCommonPrefixes( "." );
+          
+          
+          final Result2 res4 = new Result2();
+          res4.addGreatestCommonPrefix( "A.1.1.1.1", 0.35);
+          res4.addGreatestCommonPrefix( "A.1.1.1.2", 0.35 );
+          res4.addGreatestCommonPrefix( "A.1", 0.1 );
+          res4.addGreatestCommonPrefix( "A.1.2", 0.1 );
+          res4.addGreatestCommonPrefix( "B.1", 0.1 );
+          res4.analyzeGreatestCommonPrefixes( "." );
+          
+          final Result2 res5 = new Result2();
+          res5.addGreatestCommonPrefix( "A.1.1.1.1", 0.2);
+          res5.addGreatestCommonPrefix( "C.2.3", 0.2 );
+          res5.addGreatestCommonPrefix( "A.1.5", 0.1 );
+          res5.addGreatestCommonPrefix( "A.3.1.4", 0.2 );
+          res5.addGreatestCommonPrefix( "B.1.1", 0.2 );
+          res5.addGreatestCommonPrefix( "B.1.2", 0.09 );
+          res5.addGreatestCommonPrefix( "D.1.1.1.1", 0.01 );
+          res5.analyzeGreatestCommonPrefixes( "." );
+        }
+        catch ( final Exception e ) {
+            e.printStackTrace( System.out );
+            return false;
+        }
+        return true;
+    }
 }