halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed CLI params

Browse Source
This commit is contained in:
Fabian Becker 2014-01-23 16:32:37 +01:00
parent 8200d398fb
commit 584adb91dc
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/eva2/cli/Main.java
View File

@ -6,6 +6,8 @@ import eva2.optimization.OptimizationStateListener;
import eva2.optimization.enums.DETypeEnum; import eva2.optimization.enums.DETypeEnum;
import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.go.InterfacePopulationChangedEventListener;
import eva2.optimization.modules.OptimizationParameters; import eva2.optimization.modules.OptimizationParameters;
import eva2.optimization.operator.crossover.InterfaceCrossover;
import eva2.optimization.operator.mutation.InterfaceMutation;
import eva2.optimization.operator.terminators.CombinedTerminator; import eva2.optimization.operator.terminators.CombinedTerminator;
import eva2.optimization.operator.terminators.FitnessValueTerminator; import eva2.optimization.operator.terminators.FitnessValueTerminator;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
@ -49,8 +51,12 @@ public class Main implements OptimizationStateListener, InterfacePopulationChang
private int populationSize = 20; private int populationSize = 20;
private int numberOfRuns = 1; private int numberOfRuns = 1;
private long seed = System.currentTimeMillis(); private long seed = System.currentTimeMillis();
private AbstractOptimizationProblem problem; private AbstractOptimizationProblem problem;
private InterfaceOptimizer optimizer; private InterfaceOptimizer optimizer;
private InterfaceMutation mutator;
private InterfaceCrossover crossover;
private JsonObject jsonObject; private JsonObject jsonObject;
private JsonArray optimizationRuns; private JsonArray optimizationRuns;
private JsonArray generationsArray; private JsonArray generationsArray;
@ -74,6 +80,13 @@ public class Main implements OptimizationStateListener, InterfacePopulationChang
opt.addOption("n", "runs", true, "Number of runs to perform"); opt.addOption("n", "runs", true, "Number of runs to perform");
opt.addOption("s", "seed", true, "Random seed"); opt.addOption("s", "seed", true, "Random seed");
// Those two only make sense when used in an algorithm with mutation/crossover
opt.addOption("pc", true, "Crossover Probability");
opt.addOption("pm", true, "Mutation Probability");
opt.addOption("mutator", true, "Mutator Operator");
opt.addOption("crossover", true, "Crossover Operator");
opt.addOption(OptionBuilder opt.addOption(OptionBuilder
.withLongOpt("help") .withLongOpt("help")
.withDescription("Shows this help message or specific help for [optimizer]") .withDescription("Shows this help message or specific help for [optimizer]")
@ -208,12 +221,16 @@ public class Main implements OptimizationStateListener, InterfacePopulationChang
*/ */
if (commandLine.hasOption("help")) { if (commandLine.hasOption("help")) {
String helpOption = commandLine.getOptionValue("help"); String helpOption = commandLine.getOptionValue("help");
if ("optimizer".equals(helpOption)) { switch (helpOption) {
showOptimizerHelp(); case "optimizer":
} else if ("problem".equals(helpOption)) { showOptimizerHelp();
listProblems(); break;
} else { case "problem":
showHelp(defaultOptions); listProblems();
break;
default:
showHelp(defaultOptions);
break;
} }
System.exit(0); System.exit(0);
@ -277,7 +294,7 @@ public class Main implements OptimizationStateListener, InterfacePopulationChang
System.out.println("DE"); System.out.println("DE");
opt.addOption("F", true, "Differential Weight"); opt.addOption("F", true, "Differential Weight");
opt.addOption("CR", true, "Crossover Rate"); opt.addOption("CR", true, "Crossover Rate");
opt.addOption("DEType", true, "DE Type ("); opt.addOption("DEType", true, "DE Type ()");
/** /**
* Parse default options. * Parse default options.
*/ */