X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fapplication%2Fconfadd.java;h=b48cde9f84b19b4eba9eda218a3c8306f2a9aae0;hb=4740e147a9cc67367527e2fcbd57987331541bd0;hp=0a24dbf7fb503163c771dbd6601de662188ac094;hpb=038c34792757a86f24296de5683e722fab3f9307;p=jalview.git diff --git a/forester/java/src/org/forester/application/confadd.java b/forester/java/src/org/forester/application/confadd.java index 0a24dbf..b48cde9 100644 --- a/forester/java/src/org/forester/application/confadd.java +++ b/forester/java/src/org/forester/application/confadd.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.application; @@ -55,11 +55,17 @@ public class confadd { final static private String PRG_NAME = "confadd"; final static private String PRG_VERSION = "1.01"; final static private String PRG_DATE = "2010.10.26"; - final static private String E_MAIL = "czmasek@burnham.org"; + final static private String E_MAIL = "phylosoft@gmail.com"; final static private String WWW = "www.phylosoft.org/forester/"; public static void main( final String args[] ) { - ForesterUtil.printProgramInformation( PRG_NAME, PRG_VERSION, PRG_DATE, E_MAIL, WWW ); + ForesterUtil.printProgramInformation( PRG_NAME, + null, + PRG_VERSION, + PRG_DATE, + E_MAIL, + WWW, + ForesterUtil.getForesterLibraryInformation() ); CommandLineArguments cla = null; try { cla = new CommandLineArguments( args ); @@ -198,7 +204,7 @@ public class confadd { } double value = 1; if ( norm > 0 ) { - value = norm / ( 1 + last - first ); + value = norm / ( ( 1 + last ) - first ); } ForesterUtil.programMessage( PRG_NAME, "first topology to use: " + first ); String is_last = ""; @@ -206,7 +212,7 @@ public class confadd { is_last = " (corresponds to last topology in file)"; } ForesterUtil.programMessage( PRG_NAME, "last topology to use : " + last + is_last ); - ForesterUtil.programMessage( PRG_NAME, "sum of topologies used as evaluators: " + ( last - first + 1 ) ); + ForesterUtil.programMessage( PRG_NAME, "sum of topologies used as evaluators: " + ( ( last - first ) + 1 ) ); if ( norm > 0 ) { ForesterUtil.programMessage( PRG_NAME, "normalizer: " + norm + " (" + ForesterUtil.round( value, 6 ) + ")" ); }