diff --git a/src/fr/inrialpes/exmo/align/util/GroupAlign.java b/src/fr/inrialpes/exmo/align/util/GroupAlign.java index 812b54a1030129551ccd3e09dc793cb716f56353..e4c4cf279d133ae3caccbcd27a65a5cabcbdaa22 100644 --- a/src/fr/inrialpes/exmo/align/util/GroupAlign.java +++ b/src/fr/inrialpes/exmo/align/util/GroupAlign.java @@ -158,11 +158,7 @@ public class GroupAlign { case 'p' : /* Read parameters from filename */ paramfile = g.getOptarg(); - //try { - // FileInputStream fis = new FileInputStream( paramfile ); - // System.setIn( fis ); - //} catch (Exception e) { e.printStackTrace(); } - params = (Parameters)BasicParameters.read(paramfile); + BasicParameters.read( params, paramfile ); break; case 'r' : /* Use the given class for rendering */ @@ -215,6 +211,7 @@ public class GroupAlign { if (debug == 0 && params.getParameter("debug") != null) { debug = Integer.parseInt((String)params.getParameter("debug")); } + // Exception to the parameter as string rule if (debug > 0) params.setParameter("debug", new Integer(debug-1)); iterateDirectories(); diff --git a/src/fr/inrialpes/exmo/align/util/GroupEval.java b/src/fr/inrialpes/exmo/align/util/GroupEval.java index f439cc89581759b62f44c2a62a5b34f31efb6dce..c4cfc2dd2329e37b50637cc8dc76f9faaacdbd17 100644 --- a/src/fr/inrialpes/exmo/align/util/GroupEval.java +++ b/src/fr/inrialpes/exmo/align/util/GroupEval.java @@ -63,7 +63,7 @@ import fr.inrialpes.exmo.align.parser.AlignmentParser; /** A basic class for synthesizing the results of a set of alignments provided by different algorithms. The output is a table showing various classical measures - for each test and for each algorithm. Average is also computed. + for each test and for each algorithm. Average is also computed as Harmonic means. <pre> java -cp procalign.jar fr.inrialpes.exmo.align.util.GroupEval [options] diff --git a/src/fr/inrialpes/exmo/align/util/Procalign.java b/src/fr/inrialpes/exmo/align/util/Procalign.java index a9da4b18199c11bb7df8cadf5215076cf3383b07..e0599760ee4d87d540411120a8020b80048904d5 100644 --- a/src/fr/inrialpes/exmo/align/util/Procalign.java +++ b/src/fr/inrialpes/exmo/align/util/Procalign.java @@ -169,7 +169,7 @@ public class Procalign { // FileInputStream fis = new FileInputStream( paramfile ); // System.setIn( fis ); //} catch (Exception e) { e.printStackTrace(); } - params = (Parameters)BasicParameters.read(paramfile); + BasicParameters.read( params, paramfile); break; case 'r' : /* Use the given class for rendering */