in progress

[jalview.git] / forester / java / src / org / forester / phylogeny / data / Confidence.java

diff --git a/forester/java/src/org/forester/phylogeny/data/Confidence.java b/forester/java/src/org/forester/phylogeny/data/Confidence.java
index f701f80..e9e631a 100644 (file)
--- a/forester/java/src/org/forester/phylogeny/data/Confidence.java
+++ b/forester/java/src/org/forester/phylogeny/data/Confidence.java
@@ -27,6 +27,9 @@ package org.forester.phylogeny.data;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
 
 import org.forester.io.parsers.nhx.NHXtags;
 import org.forester.io.parsers.phyloxml.PhyloXmlMapping;
@@ -35,9 +38,17 @@ import org.forester.util.ForesterUtil;
 
 public class Confidence implements PhylogenyData, Comparable<Confidence> {
 
-    public final static double CONFIDENCE_DEFAULT_VALUE = -9999.0;
-    private double             _value;
-    private String             _type;
+    public final static int          CONFIDENCE_DEFAULT_VALUE = -9999;
+    private double                   _value;
+    private double                   _sd;
+    private String                   _type;
+    public final static NumberFormat FORMATTER;
+    static {
+        final DecimalFormatSymbols dfs = new DecimalFormatSymbols();
+        dfs.setDecimalSeparator( '.' );
+        FORMATTER = new DecimalFormat( "#.#########", dfs );
+        FORMATTER.setMaximumFractionDigits( PhyloXmlUtil.ROUNDING_DIGITS_FOR_PHYLOXML_DOUBLE_OUTPUT );
+    }
 
     public Confidence() {
         init();
@@ -46,6 +57,13 @@ public class Confidence implements PhylogenyData, Comparable<Confidence> {
     public Confidence( final double value, final String type ) {
         setValue( value );
         setType( type );
+        setStandardDeviation( CONFIDENCE_DEFAULT_VALUE );
+    }
+
+    public Confidence( final double value, final String type, final double sd ) {
+        setValue( value );
+        setType( type );
+        setStandardDeviation( sd );
     }
 
     @Override
@@ -62,6 +80,11 @@ public class Confidence implements PhylogenyData, Comparable<Confidence> {
             sb.append( "] " );
         }
         sb.append( ForesterUtil.FORMATTER_6.format( getValue() ) );
+        if ( getStandardDeviation() != CONFIDENCE_DEFAULT_VALUE ) {
+            sb.append( " (sd=" );
+            sb.append( getStandardDeviation() );
+            sb.append( ")" );
+        }
         return sb;
     }
 
@@ -75,7 +98,7 @@ public class Confidence implements PhylogenyData, Comparable<Confidence> {
 
     @Override
     public PhylogenyData copy() {
-        return new Confidence( getValue(), getType() );
+        return new Confidence( getValue(), getType(), getStandardDeviation() );
     }
 
     public String getType() {
@@ -86,9 +109,14 @@ public class Confidence implements PhylogenyData, Comparable<Confidence> {
         return _value;
     }
 
+    public double getStandardDeviation() {
+        return _sd;
+    }
+
     public void init() {
         setValue( CONFIDENCE_DEFAULT_VALUE );
         setType( "" );
+        setStandardDeviation( CONFIDENCE_DEFAULT_VALUE );
     }
 
     @Override
@@ -117,11 +145,16 @@ public class Confidence implements PhylogenyData, Comparable<Confidence> {
         _value = value;
     }
 
+    public void setStandardDeviation( final double sd ) {
+        _sd = sd;
+    }
+
     @Override
     public StringBuffer toNHX() {
         final StringBuffer sb = new StringBuffer();
         sb.append( NHXtags.SUPPORT );
-        sb.append( getValue() );
+        sb.append( FORMATTER.format( ForesterUtil.round( getValue(),
+                                                         PhyloXmlUtil.ROUNDING_DIGITS_FOR_PHYLOXML_DOUBLE_OUTPUT ) ) );
         return sb;
     }
 
@@ -132,13 +165,28 @@ public class Confidence implements PhylogenyData, Comparable<Confidence> {
         }
         writer.write( ForesterUtil.LINE_SEPARATOR );
         writer.write( indentation );
-        PhylogenyDataUtil.appendElement( writer,
-                                         PhyloXmlMapping.CONFIDENCE,
-                                         String.valueOf( ForesterUtil
-                                                 .round( getValue(),
-                                                         PhyloXmlUtil.ROUNDING_DIGITS_FOR_PHYLOXML_DOUBLE_OUTPUT ) ),
-                                         PhyloXmlMapping.CONFIDENCE_TYPE_ATTR,
-                                         ForesterUtil.isEmpty( getType() ) ? "unknown" : getType() );
+        if ( getStandardDeviation() != CONFIDENCE_DEFAULT_VALUE ) {
+            PhylogenyDataUtil
+                    .appendElement( writer,
+                                    PhyloXmlMapping.CONFIDENCE,
+                                    FORMATTER.format( ForesterUtil
+                                            .round( getValue(), PhyloXmlUtil.ROUNDING_DIGITS_FOR_PHYLOXML_DOUBLE_OUTPUT ) ),
+                                    PhyloXmlMapping.CONFIDENCE_TYPE_ATTR,
+                                    ForesterUtil.isEmpty( getType() ) ? "unknown" : getType(),
+                                    PhyloXmlMapping.CONFIDENCE_SD_ATTR,
+                                    String.valueOf( ForesterUtil
+                                            .round( getStandardDeviation(),
+                                                    PhyloXmlUtil.ROUNDING_DIGITS_FOR_PHYLOXML_DOUBLE_OUTPUT ) ) );
+        }
+        else {
+            PhylogenyDataUtil
+                    .appendElement( writer,
+                                    PhyloXmlMapping.CONFIDENCE,
+                                    FORMATTER.format( ForesterUtil
+                                            .round( getValue(), PhyloXmlUtil.ROUNDING_DIGITS_FOR_PHYLOXML_DOUBLE_OUTPUT ) ),
+                                    PhyloXmlMapping.CONFIDENCE_TYPE_ATTR,
+                                    ForesterUtil.isEmpty( getType() ) ? "unknown" : getType() );
+        }
     }
 
     @Override