git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
in progress
[jalview.git]
/
forester
/
java
/
src
/
org
/
forester
/
application
/
confadd.java
diff --git
a/forester/java/src/org/forester/application/confadd.java
b/forester/java/src/org/forester/application/confadd.java
index
db01fd4
..
b48cde9
100644
(file)
--- 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
// 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;
package org.forester.application;
@@
-59,8
+59,13
@@
public class confadd {
final static private String WWW = "www.phylosoft.org/forester/";
public static void main( final String args[] ) {
final static private String WWW = "www.phylosoft.org/forester/";
public static void main( final String args[] ) {
- ForesterUtil.printProgramInformation( PRG_NAME, null, PRG_VERSION, PRG_DATE, E_MAIL, WWW, ForesterUtil.getForesterLibraryInformation() );
-
+ ForesterUtil.printProgramInformation( PRG_NAME,
+ null,
+ PRG_VERSION,
+ PRG_DATE,
+ E_MAIL,
+ WWW,
+ ForesterUtil.getForesterLibraryInformation() );
CommandLineArguments cla = null;
try {
cla = new CommandLineArguments( args );
CommandLineArguments cla = null;
try {
cla = new CommandLineArguments( args );
@@
-199,7
+204,7
@@
public class confadd {
}
double value = 1;
if ( norm > 0 ) {
}
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 = "";
}
ForesterUtil.programMessage( PRG_NAME, "first topology to use: " + first );
String is_last = "";
@@
-207,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 );
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 ) + ")" );
}
if ( norm > 0 ) {
ForesterUtil.programMessage( PRG_NAME, "normalizer: " + norm + " (" + ForesterUtil.round( value, 6 ) + ")" );
}