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

Change more of the CLI implementation.

Browse Source
This commit is contained in:
Fabian Becker 2013-12-10 18:03:17 +01:00
parent 321796d2c4
commit 5d63aed4b0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,11 +145,11 @@ public class Main implements OptimizationStateListener, InterfacePopulationChang
return optimizerList; return optimizerList;
} }
public static Map<String, Class<? extends AbstractOptimizationProblem>> createProblemList() { public static Map<String, Class<? extends AbstractProblemDouble>> createProblemList() {
Map<String, Class<? extends AbstractOptimizationProblem>> problemList = new TreeMap<String, Class<? extends AbstractOptimizationProblem>>(); Map<String, Class<? extends AbstractProblemDouble>> problemList = new TreeMap<String, Class<? extends AbstractProblemDouble>>();
Reflections reflections = new Reflections("eva2.optimization.problems"); Reflections reflections = new Reflections("eva2.optimization.problems");
Set<Class<? extends AbstractOptimizationProblem>> problems = reflections.getSubTypesOf(AbstractOptimizationProblem.class); Set<Class<? extends AbstractProblemDouble>> problems = reflections.getSubTypesOf(AbstractProblemDouble.class);
for (Class<? extends AbstractOptimizationProblem> problem : problems) { for (Class<? extends AbstractProblemDouble> problem : problems) {
// We only want instantiable classes // We only want instantiable classes
if (problem.isInterface() || Modifier.isAbstract(problem.getModifiers())) { if (problem.isInterface() || Modifier.isAbstract(problem.getModifiers())) {
continue; continue;
@ -330,9 +330,9 @@ public class Main implements OptimizationStateListener, InterfacePopulationChang
} }
private void setProblemFromName(String problemName) { private void setProblemFromName(String problemName) {
Map<String, Class<? extends AbstractOptimizationProblem>> problemList = createProblemList(); Map<String, Class<? extends AbstractProblemDouble>> problemList = createProblemList();
Class<? extends AbstractProblemDoubleOffset> problem = problemList.get(problemName); Class<? extends AbstractProblemDouble> problem = problemList.get(problemName);
try { try {
this.problem = problem.newInstance(); this.problem = problem.newInstance();
} catch (InstantiationException e) { } catch (InstantiationException e) {
@ -387,7 +387,7 @@ public class Main implements OptimizationStateListener, InterfacePopulationChang
} }
private static void listProblems() { private static void listProblems() {
Map<String, Class<? extends AbstractOptimizationProblem>> problemList = createProblemList(); Map<String, Class<? extends AbstractProblemDouble>> problemList = createProblemList();
System.out.println("Available Problems:"); System.out.println("Available Problems:");
for (String name : problemList.keySet()) { for (String name : problemList.keySet()) {