Commit a1730c2a authored by Dennis Hendriks's avatar Dennis Hendriks
Browse files

#344 DSM application option improvements and fixes.

 - Application runs again.
parent 3fe2f636
......@@ -22,7 +22,7 @@ public class ConvergenceOption extends DoubleOption {
private static final String NAME = "Convergence limit";
/** Description of the option. */
private static final String DESCRIPTION = "Allowed remaining numerical error for convergence of the algorithm."
private static final String DESCRIPTION = "Allowed remaining numerical error for convergence of the algorithm. "
+ "Between 0 and 1. [DEFAULT=1e-4].";
/** Short option name. */
......@@ -38,16 +38,16 @@ public class ConvergenceOption extends DoubleOption {
private static final double DEFAULT_VALUE = 1e-4;
/** Minimum value of the option. */
private static final Double MIN_VALUE = 0.0;
private static final double MIN_VALUE = 0.0;
/** Maximum value of the option. */
private static final Double MAX_VALUE = 1.0;
private static final double MAX_VALUE = 1.0;
/** Whether to show the option in a dialog box. */
private static final boolean SHOW_IN_DIALOG = true;
/** Description of the option in the dialog box. */
private static final String DIALOG_DESCR = "Allowed remaining numerical error.";
private static final String DIALOG_DESCR = "Allowed remaining numerical error for convergence of the algorithm.";
/** Label to use as prefix in the dialog box. */
private static final String DIALOG_OPTION_TEXT = NAME + ":";
......
......@@ -23,7 +23,9 @@ public class DsmBusDetectionAlgorithmOption extends EnumOption<BusDetectionAlgor
private static final String NAME = "Bus detection algorithm";
/** Description of the option. */
private static final String DESCRIPTION = "Which bus detection algorithm to use. Use 'no-bus' to skip bus detection, 'fix-point' for using the fixed-point algorithm, and 'top-k' for selecting the K top-nodes. [DEFAULT=no-bus].";
private static final String DESCRIPTION = "The bus detection algorithm to use. Use \"no-bus\" to skip bus "
+ "detection, \"fix-point\" for using the fixed-point algorithm, and \"top-k\" for selecting the K "
+ "top-nodes. [DEFAULT=no-bus].";
/** Short option name. */
private static final Character CMD_SHORT = null;
......@@ -41,7 +43,7 @@ public class DsmBusDetectionAlgorithmOption extends EnumOption<BusDetectionAlgor
private static final boolean SHOW_IN_DIALOG = true;
/** Description of the option in the dialog box. */
private static final String DIALOG_DESCR = NAME + ":";
private static final String DIALOG_DESCR = "The bus detection algorithm to use.";
/** Constructor of the {@link DsmBusDetectionAlgorithmOption} class. */
public DsmBusDetectionAlgorithmOption() {
......
......@@ -37,16 +37,16 @@ public class DsmBusFactorOption extends DoubleOption {
private static final double DEFAULT_VALUE = 2;
/** Minimum value of the option. */
private static final Double MIN_VALUE = 0.0;
private static final double MIN_VALUE = 0.0;
/** Maximum value of the option. */
private static final Double MAX_VALUE = 10000.0;
private static final double MAX_VALUE = Integer.MAX_VALUE;
/** Whether to show the option in a dialog box. */
private static final boolean SHOW_IN_DIALOG = true;
/** Description of the option in the dialog box. */
private static final String DIALOG_DESCR = "Bus factor.";
private static final String DIALOG_DESCR = "Bus factor for the bus detection algorithms.";
/** Label to use as prefix in the dialog box. */
private static final String DIALOG_OPTION_TEXT = NAME + ":";
......
......@@ -32,22 +32,22 @@ public class DsmEvaporationOption extends DoubleOption {
private static final String CMD_LONG = "evaporation";
/** Name of the optional value. */
private static final String CMD_VALUE = NAME;
private static final String CMD_VALUE = "EVAP";
/** Default value of the option. */
private static final double DEFAULT_VALUE = 2.0;
/** Minimum value of the option. */
private static final Double MIN_VALUE = 1.0;
private static final double MIN_VALUE = 1.0;
/** Maximum value of the option. */
private static final Double MAX_VALUE = 10.0;
private static final double MAX_VALUE = 10.0;
/** Whether to show the option in a dialog box. */
private static final boolean SHOW_IN_DIALOG = true;
/** Description of the option in the dialog box. */
private static final String DIALOG_DESCR = "Evaporation factor.";
private static final String DIALOG_DESCR = "Evaporation factor to increase number of clusters.";
/** Label to use as prefix in the dialog box. */
private static final String DIALOG_OPTION_TEXT = NAME + ":";
......
......@@ -32,22 +32,22 @@ public class DsmInflationOption extends DoubleOption {
private static final String CMD_LONG = "inflation";
/** Name of the optional value. */
private static final String CMD_VALUE = NAME;
private static final String CMD_VALUE = "INFL";
/** Default value of the option. */
private static final double DEFAULT_VALUE = 2.0;
/** Minimum value of the option. */
private static final Double MIN_VALUE = 1.0;
private static final double MIN_VALUE = 1.0;
/** Maximum value of the option. */
private static final Double MAX_VALUE = 4.0;
private static final double MAX_VALUE = 4.0;
/** Whether to show the option in a dialog box. */
private static final boolean SHOW_IN_DIALOG = true;
/** Description of the option in the dialog box. */
private static final String DIALOG_DESCR = "Inflation factor.";
private static final String DIALOG_DESCR = "Inflation factor to increase gap between low and high values.";
/** Label to use as prefix in the dialog box. */
private static final String DIALOG_OPTION_TEXT = NAME + ":";
......
......@@ -22,7 +22,7 @@ public class DsmStepCountOption extends IntegerOption {
private static final String NAME = "Step count";
/** Description of the option. */
private static final String DESCRIPTION = "Number of visited nodes in an iteration."
private static final String DESCRIPTION = "Number of visited nodes in an iteration. "
+ "Between 1 and 4, is rarely modified. [DEFAULT=2].";
/** Short option name. */
......@@ -32,7 +32,7 @@ public class DsmStepCountOption extends IntegerOption {
private static final String CMD_LONG = "stepcount";
/** Name of the optional value. */
private static final String CMD_VALUE = NAME;
private static final String CMD_VALUE = "STEPCNT";
/** Default value of the option. */
private static final int DEFAULT_VALUE = 2;
......@@ -50,7 +50,7 @@ public class DsmStepCountOption extends IntegerOption {
private static final boolean SHOW_IN_DIALOG = true;
/** Description of the option in the dialog box. */
private static final String DIALOG_DESCR = "Number of visited nodes.";
private static final String DIALOG_DESCR = "Number of visited nodes in an iteration.";
/** Label to use as prefix in the dialog box. */
private static final String DIALOG_OPTION_TEXT = NAME + ":";
......
......@@ -22,7 +22,8 @@ public class OutputGroupsOption extends BooleanOption {
private static final String NAME = "Output groups";
/** Description of the option. */
private static final String DESCRIPTION = "Whether to output bus and cluster node groups. [DEFAULT=yes].";
private static final String DESCRIPTION = "Whether to output bus and cluster node groups (BOOL=yes) or not "
+ "(BOOL=no). [DEFAULT=yes].";
/** Short option name. */
private static final Character CMD_SHORT = null;
......@@ -31,7 +32,7 @@ public class OutputGroupsOption extends BooleanOption {
private static final String CMD_LONG = "output-groups";
/** Name of the option value. */
private static final String CMD_VALUE = "OUTPGROUPS";
private static final String CMD_VALUE = "BOOL";
/** Default value of the option. */
private static final boolean DEFAULT_VALUE = true;
......@@ -40,10 +41,10 @@ public class OutputGroupsOption extends BooleanOption {
private static final boolean SHOW_IN_DIALOG = true;
/** Description of the option in the dialog box. */
private static final String DIALOG_DESCR = "Output bus and cluster node groups.";
private static final String DIALOG_DESCR = "Whether to output bus and cluster node groups.";
/** Label to use as prefix in the dialog box. */
private static final String DIALOG_OPTION_TEXT = NAME + ":";
private static final String DIALOG_OPTION_TEXT = "Output bus and cluster node groups";
/** Constructor of the {@link OutputGroupsOption} class. */
public OutputGroupsOption() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment