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

Reformat code and optimize imports.

Browse Source 
Language Level changed to 1.7
This commit is contained in:
Fabian Becker
2013-10-12 13:49:50 +02:00
parent 6473b35859
commit 595d0084a9
214 changed files with 989 additions and 1461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/eva2/EvAInfo.java
View File

@@ -1,12 +1,12 @@
package eva2;
import eva2.tools.BasicResourceLoader;
import java.io.InputStream;
import java.util.Properties;
/**
* @author mkron
*
*/
public class EvAInfo {
/**
@@ -30,7 +30,7 @@ public class EvAInfo {
public static final String propertyFile = "META-INF/EvA2.props";
public static final String LGPLFile = "lgpl-3.0.txt";
public static final String GPLFile= "gpl-3.0.txt";
public static final String GPLFile = "gpl-3.0.txt";
/**
* Relative path to application icon.
@@ -42,12 +42,13 @@ public class EvAInfo {
*/
public static final String splashLocation = "images/EvASplashScreen.png";
public static final String infoTitle = productName+" Information";
public static final String infoTitle = productName + " Information";
public static final String copyrightYear = "2010-2012";
////////////// Property handling...
private static Properties evaProperties;
static {
try {
evaProperties = BasicResourceLoader.readProperties(EvAInfo.propertyFile);
@@ -57,7 +58,7 @@ public class EvAInfo {
System.exit(1);
}
InputStream istr = BasicResourceLoader.instance().getStreamFromResourceLocation(EvAInfo.iconLocation);
if (istr==null) {
if (istr == null) {
throw new RuntimeException(resourceNotFoundErrorMessage(EvAInfo.iconLocation) + " (EvAInfo.static)");
}
}
@@ -65,6 +66,7 @@ public class EvAInfo {
/**
* An eloquent error message in case a resource was not found - which was
* expected in the EvA2 resource directory.
*
* @param resourceName
* @return
*/
@@ -91,7 +93,7 @@ public class EvAInfo {
public static String getVersion() {
String version = getProperty("EvA2Version");
if (version==null) {
if (version == null) {
System.err.println("ERROR, missing property EvA2Version!");
}
return version;

67
src/eva2/OptimizerFactory.java
View File

@@ -1,41 +1,13 @@
package eva2;
import eva2.optimization.modules.OptimizationParameters;
import eva2.optimization.operator.mutation.InterfaceMutation;
import eva2.optimization.operator.mutation.NoMutation;
import eva2.optimization.operator.mutation.MutateESFixedStepSize;
import eva2.optimization.operator.mutation.MutateESCovarianceMatrixAdaption;
import eva2.optimization.operator.mutation.MutateESGlobal;
import eva2.optimization.operator.mutation.MutateESRankMuCMA;
import eva2.optimization.strategies.ParticleSwarmOptimization;
import eva2.optimization.strategies.EvolutionStrategyIPOP;
import eva2.optimization.strategies.GradientDescentAlgorithm;
import eva2.optimization.strategies.NelderMeadSimplex;
import eva2.optimization.strategies.DifferentialEvolution;
import eva2.optimization.strategies.EsDpiNiching;
import eva2.optimization.strategies.HillClimbing;
import eva2.optimization.strategies.EvolutionStrategies;
import eva2.optimization.strategies.PopulationBasedIncrementalLearning;
import eva2.optimization.strategies.EsDpiNichingCma;
import eva2.optimization.strategies.MultiObjectiveEA;
import eva2.optimization.strategies.GeneticAlgorithm;
import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.optimization.strategies.Tribes;
import eva2.optimization.strategies.SimulatedAnnealing;
import eva2.optimization.strategies.ClusteringHillClimbing;
import eva2.optimization.strategies.ClusterBasedNichingEA;
import eva2.optimization.strategies.MonteCarloSearch;
import eva2.optimization.individuals.IndividualInterface;
import eva2.optimization.go.InterfacePopulationChangedEventListener;
import eva2.optimization.go.InterfaceTerminator;
import eva2.optimization.enums.DETypeEnum;
import eva2.optimization.enums.MutateESCrossoverTypeEnum;
import eva2.optimization.enums.PSOTopologyEnum;
import eva2.optimization.enums.PostProcessMethod;
import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.individuals.InterfaceDataTypeBinary;
import eva2.optimization.individuals.InterfaceDataTypeDouble;
import eva2.optimization.individuals.InterfaceESIndividual;
import eva2.optimization.go.InterfacePopulationChangedEventListener;
import eva2.optimization.go.InterfaceTerminator;
import eva2.optimization.individuals.*;
import eva2.optimization.modules.OptimizationParameters;
import eva2.optimization.operator.archiving.ArchivingNSGAII;
import eva2.optimization.operator.archiving.InformationRetrievalInserting;
import eva2.optimization.operator.archiving.InterfaceArchiving;
@@ -46,6 +18,7 @@ import eva2.optimization.operator.crossover.CrossoverESDefault;
import eva2.optimization.operator.crossover.InterfaceCrossover;
import eva2.optimization.operator.crossover.NoCrossover;
import eva2.optimization.operator.distancemetric.IndividualDataMetric;
import eva2.optimization.operator.mutation.*;
import eva2.optimization.operator.postprocess.InterfacePostProcessParams;
import eva2.optimization.operator.postprocess.PostProcessParams;
import eva2.optimization.operator.selection.InterfaceSelection;
@@ -56,7 +29,9 @@ import eva2.optimization.population.PBILPopulation;
import eva2.optimization.population.Population;
import eva2.optimization.problems.AbstractOptimizationProblem;
import eva2.optimization.stat.InterfaceStatistics;
import eva2.optimization.strategies.*;
import eva2.tools.math.RNG;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.List;
@@ -76,11 +51,11 @@ import java.util.List;
* while (!terminator.isTerminated(optimizer.getPopulation())) optimizer.optimize();
* </code> </p>
*
* @version 0.1
* @since 2.0
* @author mkron
* @author Andreas Dr&auml;ger
* @version 0.1
* @date 17.04.2007
* @since 2.0
*/
public class OptimizerFactory {
@@ -434,9 +409,9 @@ public class OptimizerFactory {
* @param speedLim
* @param listener
* @param topology
* @see ParticleSwarmOpimization
* @return An optimization algorithm that performs particle swarm
* optimization.
* @see ParticleSwarmOpimization
*/
public static ParticleSwarmOptimization createParticleSwarmOptimization(
AbstractOptimizationProblem problem, int popsize, double phi1,
@@ -556,6 +531,7 @@ public class OptimizerFactory {
}
// /////////////////////////// constructing a default OptimizerRunnable
/**
* For an optimizer identifier, return the corresponding default parameter
* set including initialization (thats why the problem is required).
@@ -672,16 +648,17 @@ public class OptimizerFactory {
}
// /////////////////////////// constructing a default OptimizerRunnable
/**
* Produce a runnable optimizer from a strategy identifier, a problem
* instance and with the current static terminator in use. Output is written
* to a file if the prefix String is given.
*
* @see #getOptRunnable(int, AbstractOptimizationProblem, int, String)
* @param optType
* @param problem
* @param outputFilePrefix
* @return a runnable optimizer
* @see #getOptRunnable(int, AbstractOptimizationProblem, int, String)
*/
public static OptimizerRunnable getOptRunnable(final int optType,
AbstractOptimizationProblem problem, String outputFilePrefix) {
@@ -713,6 +690,7 @@ public class OptimizerFactory {
}
// /////////////////////// Creating default strategies
/**
* Use lambda, default random seed and terminator to produce OptimizationParameters.
*
@@ -728,12 +706,12 @@ public class OptimizerFactory {
/**
* Use default random seed and terminator for a parameter set.
*
* @see #makeParams(InterfaceOptimizer, int, AbstractOptimizationProblem,
* long, InterfaceTerminator)
* @param opt
* @param popSize
* @param problem
* @return
* @see #makeParams(InterfaceOptimizer, int, AbstractOptimizationProblem,
* long, InterfaceTerminator)
*/
public static OptimizationParameters makeParams(InterfaceOptimizer opt, int popSize, AbstractOptimizationProblem problem) {
return makeParams(opt, popSize, problem, randSeed, getTerminator());
@@ -742,12 +720,12 @@ public class OptimizerFactory {
/**
* Use default random seed and the population size of the optimizer.
*
* @see #makeParams(InterfaceOptimizer, int, AbstractOptimizationProblem,
* long, InterfaceTerminator)
* @param opt
* @param popSize
* @param problem
* @return
* @see #makeParams(InterfaceOptimizer, int, AbstractOptimizationProblem,
* long, InterfaceTerminator)
*/
public static OptimizationParameters makeParams(InterfaceOptimizer opt, AbstractOptimizationProblem problem, InterfaceTerminator term) {
return makeParams(opt, opt.getPopulation().getTargetSize(), problem, randSeed, term);
@@ -757,14 +735,14 @@ public class OptimizerFactory {
* Set the population size, initialize the population and return a parameter
* structure containing all given parts.
*
* @see #makeParams(InterfaceOptimizer, Population,
* AbstractOptimizationProblem, long, InterfaceTerminator)
* @param opt
* @param popSize
* @param problem
* @param seed
* @param term
* @return
* @see #makeParams(InterfaceOptimizer, Population,
* AbstractOptimizationProblem, long, InterfaceTerminator)
*/
public static OptimizationParameters makeParams(InterfaceOptimizer opt,
int popSize, AbstractOptimizationProblem problem, long seed,
@@ -780,13 +758,13 @@ public class OptimizerFactory {
* The result can be modified and then used to create an OptimizerRunnable,
* which of course can simply be run.
*
* @see OptimizerRunnable
* @param opt
* @param pop
* @param problem
* @param seed
* @param term
* @return
* @see OptimizerRunnable
*/
public static OptimizationParameters makeParams(InterfaceOptimizer opt,
Population pop, AbstractOptimizationProblem problem, long seed,
@@ -1137,6 +1115,7 @@ public class OptimizerFactory {
}
///////////////////////////// termination management
/**
* Replace the current user-defined terminator by the given one.
*
@@ -1185,6 +1164,7 @@ public class OptimizerFactory {
}
///////////////////////////// default parameters
/**
* Create a standard multi-start hill-climber parameter set with 50 initial
* individuals.
@@ -1323,7 +1303,6 @@ public class OptimizerFactory {
}
/**
*
* @param problem
* @return
*/

57
src/eva2/OptimizerRunnable.java
View File

@@ -1,24 +1,20 @@
package eva2;
import eva2.optimization.go.InterfaceOptimizationParameters;
import eva2.optimization.stat.StatisticsDummy;
import eva2.optimization.stat.InterfaceStatistics;
import eva2.optimization.stat.StatisticsParameter;
import eva2.optimization.stat.AbstractStatistics;
import eva2.optimization.stat.StatisticsStandalone;
import eva2.optimization.stat.InterfaceTextListener;
import eva2.optimization.OptimizationStateListener;
import eva2.optimization.individuals.IndividualInterface;
import eva2.optimization.go.InterfaceOptimizationParameters;
import eva2.optimization.go.InterfaceTerminator;
import eva2.optimization.individuals.IndividualInterface;
import eva2.optimization.individuals.InterfaceDataTypeBinary;
import eva2.optimization.individuals.InterfaceDataTypeDouble;
import eva2.optimization.individuals.InterfaceDataTypeInteger;
import eva2.optimization.modules.OptimizationParameters;
import eva2.optimization.modules.Processor;
import eva2.optimization.operator.postprocess.InterfacePostProcessParams;
import eva2.optimization.operator.postprocess.PostProcessParams;
import eva2.optimization.population.Population;
import eva2.optimization.population.SolutionSet;
import eva2.optimization.modules.OptimizationParameters;
import eva2.optimization.modules.Processor;
import eva2.optimization.stat.*;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.BitSet;
@@ -28,7 +24,6 @@ import java.util.BitSet;
* This Runnable class just encapsulates the Processor class with some simple ways to access a solution.
*
* @author mkron
*
*/
public class OptimizerRunnable implements Runnable {
private Processor proc;
@@ -36,7 +31,7 @@ public class OptimizerRunnable implements Runnable {
private boolean doRestart = false; // indicate whether start or restart should be done --> whether pop will be reinitialized.
private boolean postProcessOnly = false;
private InterfaceTextListener listener = null;
private String ident="OptimizerRunnable";
private String ident = "OptimizerRunnable";
private static int cntID = 0;
private int rnblID = -1;
@@ -89,13 +84,13 @@ public class OptimizerRunnable implements Runnable {
proc = new Processor(stats, null, params);
if (proc.getStatistics() instanceof AbstractStatistics) {
((AbstractStatistics)proc.getStatistics()).setSaveParams(false);
((AbstractStatistics) proc.getStatistics()).setSaveParams(false);
}
doRestart = restart;
}
public void setIdentifier(String id) {
ident=id;
ident = id;
}
public String getIdentifier() {
@@ -104,6 +99,7 @@ public class OptimizerRunnable implements Runnable {
/**
* A unique ID for the runnable.
*
* @return
*/
public int getID() {
@@ -125,7 +121,7 @@ public class OptimizerRunnable implements Runnable {
InterfaceOptimizationParameters params = proc.getGOParams();
proc = new Processor(stats, null, params);
if (proc.getStatistics() instanceof AbstractStatistics) {
((AbstractStatistics)proc.getStatistics()).setSaveParams(false);
((AbstractStatistics) proc.getStatistics()).setSaveParams(false);
}
}
@@ -153,17 +149,16 @@ public class OptimizerRunnable implements Runnable {
try {
proc.setSaveParams(false);
if (postProcessOnly) {
proc.performPostProcessing((PostProcessParams)proc.getGOParams().getPostProcessParams(), listener);
proc.performPostProcessing((PostProcessParams) proc.getGOParams().getPostProcessParams(), listener);
} else {
if (doRestart) {
proc.restartOptimization();
}
else {
} else {
proc.startOptimization();
}
proc.runOptOnce();
}
} catch(Exception e) {
} catch (Exception e) {
proc.getStatistics().printToTextListener("Exception in OptimizeThread::run: " + e.getMessage() + "\n");
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
@@ -184,7 +179,7 @@ public class OptimizerRunnable implements Runnable {
}
public boolean wasAborted() {
return (proc!=null && (proc.wasAborted()));
return (proc != null && (proc.wasAborted()));
}
public void restartOpt() {
@@ -204,7 +199,7 @@ public class OptimizerRunnable implements Runnable {
}
public SolutionSet getSolutionSet() {
return (SolutionSet)proc.getGOParams().getOptimizer().getAllSolutions();
return (SolutionSet) proc.getGOParams().getOptimizer().getAllSolutions();
}
public void setPostProcessingParams(InterfacePostProcessParams ppp) {
@@ -231,7 +226,7 @@ public class OptimizerRunnable implements Runnable {
public double[] getDoubleSolution() {
IndividualInterface indy = getResult();
if (indy instanceof InterfaceDataTypeDouble) {
return ((InterfaceDataTypeDouble)indy).getDoubleData();
return ((InterfaceDataTypeDouble) indy).getDoubleData();
} else {
return null;
}
@@ -240,7 +235,7 @@ public class OptimizerRunnable implements Runnable {
public BitSet getBinarySolution() {
IndividualInterface indy = getResult();
if (indy instanceof InterfaceDataTypeBinary) {
return ((InterfaceDataTypeBinary)indy).getBinaryData();
return ((InterfaceDataTypeBinary) indy).getBinaryData();
} else {
return null;
}
@@ -249,7 +244,7 @@ public class OptimizerRunnable implements Runnable {
public int[] getIntegerSolution() {
IndividualInterface indy = getResult();
if (indy instanceof InterfaceDataTypeInteger) {
return ((InterfaceDataTypeInteger)indy).getIntegerData();
return ((InterfaceDataTypeInteger) indy).getIntegerData();
} else {
return null;
}
@@ -258,8 +253,8 @@ public class OptimizerRunnable implements Runnable {
/**
* Set the verbosity level in the statistics module to the given value.
*
* @see StatsParameter
* @param vLev
* @see StatsParameter
*/
public void setVerbosityLevel(int vLev) {
if (vLev >= 0 && vLev < proc.getStatistics().getStatisticsParameter().getOutputVerbosity().getTags().length) {
@@ -272,27 +267,29 @@ public class OptimizerRunnable implements Runnable {
/**
* Set the output direction in the statistics module.
*
* @see StatsParameter
* @param outp
* @see StatsParameter
*/
public void setOutputTo(int outp) {
((StatisticsParameter)proc.getStatistics().getStatisticsParameter()).setOutputTo(outp);
((StatisticsParameter) proc.getStatistics().getStatisticsParameter()).setOutputTo(outp);
}
/**
* Set the number of multiruns in the statistics module.
*
* @param multis
*/
public void setMultiRuns(int multis) {
((AbstractStatistics)proc.getStatistics()).getStatisticsParameter().setMultiRuns(multis);
((AbstractStatistics) proc.getStatistics()).getStatisticsParameter().setMultiRuns(multis);
}
/**
* Indicate whether full stats should be printed as text (or only selected entries).
* @see StatsParameter
*
* @param addInfo
* @see StatsParameter
*/
public void setOutputFullStatsToText(boolean addInfo) {
((AbstractStatistics)proc.getStatistics()).getStatisticsParameter().setOutputAllFieldsAsText(addInfo);
((AbstractStatistics) proc.getStatistics()).getStatisticsParameter().setOutputAllFieldsAsText(addInfo);
}
}

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

@@ -1,21 +1,19 @@
package eva2.cli;
import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.optimization.strategies.DifferentialEvolution;
import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.util.annotation.Parameter;
import org.apache.commons.cli.*;
import eva2.optimization.OptimizationStateListener;
import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.optimization.strategies.InterfaceOptimizer;
import org.apache.commons.cli.*;
import org.reflections.Reflections;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.*;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
public class Main implements OptimizationStateListener {
private static Options createDefaultCommandLineOptions() {
Options opt = new Options();
@@ -56,15 +54,15 @@ public class Main implements OptimizationStateListener {
//To change body of implemented methods use File | Settings | File Templates.
}
public static void printProgressBar(int percent){
public static void printProgressBar(int percent) {
StringBuilder bar = new StringBuilder("[");
for(int i = 0; i < 50; i++){
if( i < (percent/2)){
for (int i = 0; i < 50; i++) {
if (i < (percent / 2)) {
bar.append("=");
}else if( i == (percent/2)){
} else if (i == (percent / 2)) {
bar.append(">");
}else{
} else {
bar.append(" ");
}
}
@@ -78,9 +76,9 @@ public class Main implements OptimizationStateListener {
Reflections reflections = new Reflections("eva2.optimization.strategies");
Set<Class<? extends InterfaceOptimizer>> optimizers = reflections.getSubTypesOf(InterfaceOptimizer.class);
for(Class<? extends InterfaceOptimizer> optimizer : optimizers) {
for (Class<? extends InterfaceOptimizer> optimizer : optimizers) {
// We only want instantiable classes.ya
if(optimizer.isInterface() || Modifier.isAbstract(optimizer.getModifiers())) {
if (optimizer.isInterface() || Modifier.isAbstract(optimizer.getModifiers())) {
continue;
}
optimizerList.put(optimizer.getSimpleName(), optimizer);
@@ -92,9 +90,9 @@ public class Main implements OptimizationStateListener {
Map<String, Class<? extends InterfaceOptimizationProblem>> problemList = new TreeMap<String, Class<? extends InterfaceOptimizationProblem>>();
Reflections reflections = new Reflections("eva2.optimization.problems");
Set<Class<? extends InterfaceOptimizationProblem>> problems = reflections.getSubTypesOf(InterfaceOptimizationProblem.class);
for(Class<? extends InterfaceOptimizationProblem> problem : problems) {
for (Class<? extends InterfaceOptimizationProblem> problem : problems) {
// We only want instantiable classes
if(problem.isInterface() || Modifier.isAbstract(problem.getModifiers())) {
if (problem.isInterface() || Modifier.isAbstract(problem.getModifiers())) {
continue;
}
problemList.put(problem.getSimpleName(), problem);
@@ -130,9 +128,9 @@ public class Main implements OptimizationStateListener {
/**
* Process help and help sub pages.
*/
if(commandLine.hasOption("help")) {
if (commandLine.hasOption("help")) {
String helpOption = commandLine.getOptionValue("help");
if("optimizer".equals(helpOption)) {
if ("optimizer".equals(helpOption)) {
showOptimizerHelp();
} else if ("problem".equals(helpOption)) {
showProblemHelp();
@@ -148,16 +146,16 @@ public class Main implements OptimizationStateListener {
Map<String, Class<? extends InterfaceOptimizer>> optimizerList = createOptimizerList();
System.out.println("Available Optimizers:");
for(String name : optimizerList.keySet()) {
for (String name : optimizerList.keySet()) {
System.out.printf("\t%s\n", name);
}
}
private static void showProblemHelp() {
Map<String, Class<? extends InterfaceOptimizationProblem>> problemList= createProblemList();
Map<String, Class<? extends InterfaceOptimizationProblem>> problemList = createProblemList();
System.out.println("Available Problems:");
for(String name : problemList.keySet()) {
for (String name : problemList.keySet()) {
System.out.printf("\t%s\n", name);
}
}

1
src/eva2/client/ClassPreloader.java
View File

@@ -8,7 +8,6 @@ import eva2.gui.editor.GenericObjectEditor;
* done at startup time and accelerates later reloading.
*
* @author mkron
*
*/
public class ClassPreloader implements Runnable {

10
src/eva2/examples/TestingCbnPostProc.java
View File

@@ -1,10 +1,12 @@
package eva2.examples;
import eva2.OptimizerFactory;
import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.modules.OptimizationParameters;
import eva2.optimization.operator.postprocess.PostProcessParams;
import eva2.optimization.operator.terminators.EvaluationTerminator;
import eva2.optimization.problems.FM0Problem;
import eva2.optimization.modules.OptimizationParameters;
import java.util.List;
public class TestingCbnPostProc {
@@ -17,7 +19,7 @@ public class TestingCbnPostProc {
OptimizationParameters esParams = OptimizerFactory.standardCbnES(fm0);
esParams.setTerminator(new EvaluationTerminator(2000));
esParams.setSeed(0);
best = (AbstractEAIndividual)OptimizerFactory.optimizeToInd(esParams, null);
best = (AbstractEAIndividual) OptimizerFactory.optimizeToInd(esParams, null);
System.out.println(esParams.getTerminator().lastTerminationMessage() + "\nFound solution: "
+ AbstractEAIndividual.getDefaultDataString(best));
@@ -35,5 +37,7 @@ public class TestingCbnPostProc {
for (AbstractEAIndividual indy : ppSols) {
System.out.println(AbstractEAIndividual.getDefaultDataString(indy));
}
};
}
;
}

14
src/eva2/examples/TestingGAB1.java
View File

@@ -1,11 +1,13 @@
package eva2.examples;
import eva2.OptimizerFactory;
import eva2.optimization.modules.OptimizationParameters;
import eva2.optimization.operator.selection.SelectXProbRouletteWheel;
import eva2.optimization.operator.terminators.EvaluationTerminator;
import eva2.optimization.population.Population;
import eva2.optimization.problems.B1Problem;
import eva2.optimization.strategies.GeneticAlgorithm;
import eva2.optimization.modules.OptimizationParameters;
import java.util.BitSet;
public class TestingGAB1 {
@@ -20,7 +22,7 @@ public class TestingGAB1 {
gaParams.setSeed(2342);
// access the GA
GeneticAlgorithm ga = (GeneticAlgorithm)gaParams.getOptimizer();
GeneticAlgorithm ga = (GeneticAlgorithm) gaParams.getOptimizer();
ga.setElitism(false);
ga.setParentSelection(new SelectXProbRouletteWheel()); // roulette wheel selection
ga.setPopulation(new Population(150)); // population size 150
@@ -28,10 +30,12 @@ public class TestingGAB1 {
// run optimization and print intermediate results to a file with given prefix
sol = OptimizerFactory.optimizeToBinary(gaParams, "ga-opt-results");
System.out.println(OptimizerFactory.terminatedBecause() + "\nFound solution: ");
for (int i=0; i<b1.getProblemDimension(); i++) {
System.out.print(sol.get(i)+" ");
for (int i = 0; i < b1.getProblemDimension(); i++) {
System.out.print(sol.get(i) + " ");
}
System.out.println();
};
}
;
}

3
src/eva2/examples/TestingPlusCmaEs.java
View File

@@ -39,5 +39,6 @@ public class TestingPlusCmaEs {
System.out.println(esParams.getTerminator().lastTerminationMessage() + "\nFound solution: "
+ AbstractEAIndividual.getDefaultDataString(bestIndy));
}
;
;
}

6
src/eva2/gui/AboutDialog.java
View File

@@ -6,12 +6,12 @@ package eva2.gui;
import eva2.tools.BasicResourceLoader;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.*;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
/**
* @author becker

10
src/eva2/gui/BeanInspector.java
View File

@@ -7,13 +7,8 @@ import eva2.tools.SelectedTag;
import eva2.tools.StringTools;
import eva2.tools.Tag;
import eva2.util.annotation.Description;
import eva2.util.annotation.Parameter;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.MethodDescriptor;
import java.beans.PropertyDescriptor;
import java.beans.*;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -641,7 +636,8 @@ public class BeanInspector {
infoBf.append((String) ret);
} else {
Description description = obj.getClass().getAnnotation(Description.class);
if(description != null) {;
if (description != null) {
;
infoBf.append("\t");
infoBf.append(description.text());
}

4
src/eva2/gui/EvAModuleButtonPanelMaker.java
View File

@@ -15,14 +15,12 @@ import eva2.optimization.modules.ModuleAdapter;
import eva2.optimization.stat.OptimizationJob;
import eva2.tools.ToolBoxGui;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.Serializable;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JButton;
import javax.swing.JOptionPane;
import javax.swing.JToolBar;
/**
* Contains the GUI elements of start and stop buttons and optionally a help

4
src/eva2/gui/EvATabbedFrameMaker.java
View File

@@ -8,14 +8,14 @@ package eva2.gui;
import eva2.optimization.go.InterfaceNotifyOnInformers;
import eva2.optimization.problems.InterfaceAdditionalPopulationInformer;
import javax.swing.*;
import javax.swing.plaf.basic.BasicButtonUI;
import java.awt.*;
import java.awt.event.*;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
import javax.swing.*;
import javax.swing.plaf.basic.BasicButtonUI;
/**
* Produces the main EvA2 frame and a tool bar instance. TODO This class should be removed

10
src/eva2/gui/EvATreeSelectionListener.java
View File

@@ -1,14 +1,14 @@
package eva2.gui;
import java.awt.Component;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyEditor;
import javax.swing.JTree;
import javax.swing.*;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyEditor;
/**
* Listener for use with the EvATreeNode class. It implements both the tree selection listener

5
src/eva2/gui/ExtAction.java
View File

@@ -13,10 +13,7 @@ package eva2.gui;
* IMPORTS
*==========================================================================*/
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.KeyStroke;
import javax.swing.*;
/**
*

2
src/eva2/gui/ExtActionChangedListener.java
View File

@@ -13,9 +13,9 @@ package eva2.gui;
* IMPORTS
*==========================================================================*/
import javax.swing.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import javax.swing.JComponent;
/**
*

8
src/eva2/gui/ExtDesktopManager.java
View File

@@ -10,14 +10,10 @@ package eva2.gui;
* $Author: streiche $
*/
import java.awt.Component;
import java.awt.Event;
import javax.swing.*;
import java.awt.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.DefaultDesktopManager;
import javax.swing.JInternalFrame;
import javax.swing.JMenuItem;
import javax.swing.KeyStroke;
/**
*

15
src/eva2/gui/HtmlDemo.java
View File

@@ -13,20 +13,15 @@ package eva2.gui;
import eva2.EvAInfo;
import eva2.tools.BasicResourceLoader;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Toolkit;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import javax.swing.JEditorPane;
import javax.swing.JFrame;
import javax.swing.JScrollPane;
import javax.swing.JViewport;
import javax.swing.*;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
import javax.swing.text.html.HTMLDocument;
import javax.swing.text.html.HTMLFrameHyperlinkEvent;
import java.awt.*;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
/**
*

14
src/eva2/gui/JDocFrame.java
View File

@@ -1,19 +1,7 @@
package eva2.gui;
/*
* Title: EvA2
* Description:
* Copyright: Copyright (c) 2003
* Company: University of Tuebingen, Computer Architecture
* @author Holger Ulmer, Felix Streichert, Hannes Planatscher
* @version: $Revision: 10 $
* $Date: 2006-01-18 11:02:22 +0100 (Wed, 18 Jan 2006) $
* $Author: streiche $
*/
import javax.swing.*;
import java.io.File;
import javax.swing.JInternalFrame;
import javax.swing.JMenu;
import javax.swing.JToolBar;
/**
*

11
src/eva2/gui/JEFrame.java
View File

@@ -10,16 +10,13 @@ package eva2.gui;
* $Author: streiche $
*/
import java.awt.Event;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import javax.swing.AbstractAction;
import javax.swing.JComponent;
import javax.swing.JInternalFrame;
import javax.swing.KeyStroke;
import javax.swing.*;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent;
import javax.swing.event.InternalFrameListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
public class JEFrame extends JInternalFrame {
private boolean closeAllOnClose = false;

2
src/eva2/gui/JEFrameRegister.java
View File

@@ -1,8 +1,8 @@
package eva2.gui;
import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JDesktopPane;
/*
* Title: EvA2
* Description:

5
src/eva2/gui/JExtDesktopPane.java
View File

@@ -7,14 +7,13 @@ package eva2.gui;
import eva2.gui.editor.ComponentFilter;
import java.awt.Component;
import java.awt.Event;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.beans.PropertyVetoException;
import java.util.Vector;
import javax.swing.*;
/**
*

4
src/eva2/gui/JExtDesktopPaneToolBar.java
View File

@@ -2,11 +2,9 @@ package eva2.gui;
import eva2.tools.ToolBoxGui;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JToolBar;
import javax.swing.SwingConstants;
/**
* @author becker

2
src/eva2/gui/JExtFileChooser.java
View File

@@ -13,8 +13,8 @@ package eva2.gui;
* IMPORTS
*==========================================================================*/
import java.io.File;
import javax.swing.*;
import java.io.File;
public class JExtFileChooser extends JFileChooser {
private boolean overwriteWarning = true;

9
src/eva2/gui/JExtMenu.java
View File

@@ -10,12 +10,9 @@ package eva2.gui;
* $Author: streiche $
*/
import java.beans.*;
import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.KeyStroke;
import javax.swing.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
/**
*

4
src/eva2/gui/JExtToolBar.java
View File

@@ -10,11 +10,11 @@ package eva2.gui;
* $Author: streiche $
*/
import java.awt.Insets;
import javax.swing.*;
import java.awt.*;
import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import javax.swing.*;
/**
*

3
src/eva2/gui/JParaPanel.java
View File

@@ -11,11 +11,10 @@ package eva2.gui;
import eva2.gui.editor.GenericObjectEditor;
import eva2.optimization.stat.OptimizationJobList;
import javax.swing.*;
import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager;
import java.io.Serializable;
import javax.swing.JComponent;
import javax.swing.JPanel;
public class JParaPanel implements Serializable, PanelMaker {

19
src/eva2/gui/JTextEditorInternalFrame.java
View File

@@ -13,14 +13,21 @@ package eva2.gui;
* IMPORTS
*==========================================================================*/
import java.awt.Event;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.UndoableEditEvent;
import javax.swing.event.UndoableEditListener;
import javax.swing.text.DefaultEditorKit;
import javax.swing.text.Keymap;
import javax.swing.undo.CannotRedoException;
import javax.swing.undo.CannotUndoException;
import javax.swing.undo.UndoManager;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.io.*;
import java.util.Hashtable;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.text.*;
import javax.swing.undo.*;
public class JTextEditorInternalFrame extends JDocFrame {

10
src/eva2/gui/JTextoutputFrame.java
View File

@@ -5,18 +5,14 @@ package eva2.gui;
* $ $Date: 2007-11-15 14:58:12 +0100 (Thu, 15 Nov 2007) $ $Author: mkron $
*/
import eva2.EvAInfo;
import eva2.optimization.tools.FileTools;
import eva2.tools.BasicResourceLoader;
import java.awt.*;
import java.awt.event.*;
import java.io.Serializable;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent;
import java.awt.*;
import java.awt.event.*;
import java.io.Serializable;
/**
*

4
src/eva2/gui/LoggingLevelLabel.java
View File

@@ -4,15 +4,13 @@
*/
package eva2.gui;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JLabel;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
/**
* This is a JLabel that shows the current logging level

10
src/eva2/gui/LoggingPanel.java
View File

@@ -1,17 +1,15 @@
package eva2.gui;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Point;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.logging.Handler;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
/**
* Simple logging panel that shows logs produced by EvA2

9
src/eva2/gui/Main.java
View File

@@ -1,7 +1,8 @@
package eva2.gui;
import eva2.EvAInfo;
import eva2.client.*;
import eva2.client.ClassPreloader;
import eva2.client.EvAComAdapter;
import eva2.optimization.OptimizationStateListener;
import eva2.optimization.go.InterfaceOptimizationParameters;
import eva2.optimization.modules.AbstractModuleAdapter;
@@ -23,8 +24,9 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.net.URL;
import java.util.*;
import java.util.logging.ConsoleHandler;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -373,7 +375,6 @@ public class Main extends JFrame implements OptimizationStateListener {
}
LoggingPanel logPanel = new LoggingPanel();
logPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));

13
src/eva2/gui/OptimizationEditorPanel.java
View File

@@ -6,8 +6,9 @@ import eva2.tools.BasicResourceLoader;
import eva2.tools.EVAHELP;
import eva2.tools.SerializedObject;
import eva2.util.annotation.Description;
import org.reflections.Reflections;
import javax.swing.*;
import javax.swing.plaf.basic.BasicComboBoxRenderer;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -19,11 +20,11 @@ import java.beans.PropertyChangeSupport;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Proxy;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Vector;
import java.util.logging.Logger;
import javax.swing.*;
import javax.swing.plaf.basic.BasicComboBoxRenderer;
/**
*
@@ -352,9 +353,9 @@ public class OptimizationEditorPanel extends JPanel implements ItemListener {
}
// If the globalInfo method doesn't exist try to use the Annotation
if(tip == null || tip.isEmpty()) {
if (tip == null || tip.isEmpty()) {
Description description = instances.get(i).getAnnotation(Description.class);
if(description != null) {
if (description != null) {
tip = description.text();
}
}

2
src/eva2/gui/PanelMaker.java
View File

@@ -1,6 +1,6 @@
package eva2.gui;
import javax.swing.JComponent;
import javax.swing.*;
/**
* Simple helper interface.

2
src/eva2/gui/PropertyBoolSelector.java
View File

@@ -1,9 +1,9 @@
package eva2.gui;
import javax.swing.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.beans.PropertyEditor;
import javax.swing.JCheckBox;
/**
* A checkbox for boolean editors.

5
src/eva2/gui/PropertyDialog.java
View File

@@ -9,10 +9,9 @@ import eva2.EvAInfo;
import eva2.tools.BasicResourceLoader;
import eva2.tools.EVAHELP;
import java.awt.BorderLayout;
import java.awt.Component;
import javax.swing.*;
import java.awt.*;
import java.beans.PropertyEditor;
import javax.swing.JDialog;
/**
*

7
src/eva2/gui/PropertyPanel.java
View File

@@ -12,14 +12,9 @@ package eva2.gui;
import eva2.tools.EVAHELP;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyEditor;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
/**
*

10
src/eva2/gui/PropertySheetPanel.java
View File

@@ -13,6 +13,11 @@ package eva2.gui;
import eva2.gui.editor.GenericObjectEditor;
import eva2.tools.EVAHELP;
import javax.swing.*;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableModel;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -22,11 +27,6 @@ import java.lang.reflect.Method;
import java.util.EventObject;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.*;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableModel;
/**
* There are some trick methods interpreted here. Check EvA2Notes.txt.

10
src/eva2/gui/PropertySheetPanelStat.java
View File

@@ -13,18 +13,12 @@ package eva2.gui;
* IMPORTS
*==========================================================================*/
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.beans.PropertyChangeSupport;
import java.io.Serializable;
import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
/**
*

7
src/eva2/gui/PropertySlider.java
View File

@@ -5,6 +5,9 @@ package eva2.gui;
* $Date: 2006-01-18 11:02:22 +0100 (Wed, 18 Jan 2006) $ $Author: streiche $
*/
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.KeyAdapter;
@@ -12,10 +15,6 @@ import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyEditor;
import javax.swing.JPanel;
import javax.swing.JSlider;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
/**
*

3
src/eva2/gui/PropertyText.java
View File

@@ -1,12 +1,11 @@
package eva2.gui;
import javax.swing.*;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.beans.PropertyEditor;
import javax.swing.BorderFactory;
import javax.swing.JTextField;
/**
* A text property editor view. Updates the editor on key release and lost focus

5
src/eva2/gui/PropertyValueSelector.java
View File

@@ -5,11 +5,8 @@ package eva2.gui;
* $Date: 2007-05-04 14:22:16 +0200 (Fri, 04 May 2007) $ $Author: mkron $
*/
import javax.swing.*;
import java.beans.PropertyEditor;
import javax.swing.BorderFactory;
import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
public class PropertyValueSelector extends JComboBox {

2
src/eva2/gui/SplashScreen.java
View File

@@ -14,8 +14,8 @@ package eva2.gui;
import eva2.tools.BasicResourceLoader;
import java.awt.*;
import javax.swing.*;
import java.awt.*;
class SplashScreen extends Frame {

13
src/eva2/gui/editor/AbstractListSelectionEditor.java
View File

@@ -1,23 +1,14 @@
package eva2.gui.editor;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.GridLayout;
import java.awt.Rectangle;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.SwingConstants;
/**
* Created by IntelliJ IDEA.

11
src/eva2/gui/editor/BigStringEditor.java
View File

@@ -15,10 +15,15 @@ package eva2.gui.editor;
import eva2.gui.PropertyDialog;
import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
/*==========================================================================*
* CLASS DECLARATION

4
src/eva2/gui/editor/EnumEditor.java
View File

@@ -2,11 +2,11 @@ package eva2.gui.editor;
import eva2.gui.PropertyValueSelector;
import java.awt.BorderLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.beans.PropertyEditorSupport;
import javax.swing.JFrame;
/**
* Created by IntelliJ IDEA.

6
src/eva2/gui/editor/GenericArrayEditor.java
View File

@@ -4,6 +4,9 @@ import eva2.gui.*;
import eva2.tools.EVAHELP;
import eva2.tools.SerializedObject;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.*;
import java.awt.event.*;
import java.beans.PropertyChangeEvent;
@@ -15,9 +18,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
public class GenericArrayEditor extends JPanel implements PropertyEditor {

21
src/eva2/gui/editor/GenericDoubleArrayEditor.java
View File

@@ -2,27 +2,12 @@ package eva2.gui.editor;
import eva2.gui.PropertyDoubleArray;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.GridLayout;
import java.awt.Rectangle;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.SwingConstants;
/**
* A simple focus listener with an object ID and callback.

2
src/eva2/gui/editor/GenericEpsilonConstraintEditor.java
View File

@@ -2,12 +2,12 @@ package eva2.gui.editor;
import eva2.gui.PropertyEpsilonConstraint;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
import javax.swing.*;
/**
* Created by IntelliJ IDEA.

2
src/eva2/gui/editor/GenericEpsilonThresholdEditor.java
View File

@@ -2,12 +2,12 @@ package eva2.gui.editor;
import eva2.gui.PropertyEpsilonThreshold;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
import javax.swing.*;
/**
* Created by IntelliJ IDEA.

5
src/eva2/gui/editor/GenericFilePathEditor.java
View File

@@ -2,6 +2,7 @@ package eva2.gui.editor;
import eva2.gui.PropertyFilePath;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -9,10 +10,6 @@ import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
import java.io.File;
import javax.swing.JFileChooser;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
/**
* Created by IntelliJ IDEA.

2
src/eva2/gui/editor/GenericIntArrayEditor.java
View File

@@ -2,6 +2,7 @@ package eva2.gui.editor;
import eva2.gui.PropertyIntArray;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -10,7 +11,6 @@ import java.awt.event.KeyListener;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
import javax.swing.*;
/**
* Created by IntelliJ IDEA.

14
src/eva2/gui/editor/GenericObjectEditor.java
View File

@@ -4,18 +4,8 @@ import eva2.EvAInfo;
import eva2.gui.OptimizationEditorPanel;
import eva2.tools.ReflectPackage;
import java.awt.Component;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Rectangle;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.MethodDescriptor;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyDescriptor;
import java.beans.PropertyEditor;
import java.awt.*;
import java.beans.*;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;

21
src/eva2/gui/editor/GenericOptimizationObjectivesEditor.java
View File

@@ -9,31 +9,14 @@ import eva2.optimization.tools.AbstractObjectEditor;
import eva2.optimization.tools.GeneralOptimizationEditorProperty;
import eva2.tools.BasicResourceLoader;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Rectangle;
import java.awt.Toolkit;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.SwingConstants;
/**

23
src/eva2/gui/editor/GenericOptimizationObjectivesWithParamEditor.java
View File

@@ -8,17 +8,8 @@ import eva2.optimization.tools.AbstractObjectEditor;
import eva2.optimization.tools.GeneralOptimizationEditorProperty;
import eva2.tools.BasicResourceLoader;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.Rectangle;
import java.awt.Toolkit;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
@@ -27,16 +18,6 @@ import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.SwingConstants;
/**

7
src/eva2/gui/editor/GenericWeigthedLPTchebycheffEditor.java
View File

@@ -2,12 +2,15 @@ package eva2.gui.editor;
import eva2.gui.PropertyWeightedLPTchebycheff;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
import javax.swing.*;
/**
* Created by IntelliJ IDEA.

7
src/eva2/gui/editor/MultiLineStringEditor.java
View File

@@ -3,8 +3,11 @@ package eva2.gui.editor;
import eva2.gui.MultiLineString;
import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import java.awt.event.TextEvent;
import java.awt.event.TextListener;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
/**

7
src/eva2/gui/editor/StatisticsEditor.java
View File

@@ -13,9 +13,12 @@ package eva2.gui.editor;
import eva2.gui.PropertySheetPanelStat;
import eva2.optimization.stat.GenericStatistics;
import java.awt.*;
import java.beans.*;
import javax.swing.*;
import java.awt.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor;
public class StatisticsEditor implements PropertyEditor {

5
src/eva2/gui/editor/TagEditor.java
View File

@@ -16,13 +16,12 @@ import eva2.tools.BasicResourceLoader;
import eva2.tools.SelectedTag;
import eva2.tools.Tag;
import java.awt.BorderLayout;
import java.awt.Toolkit;
import javax.swing.*;
import java.awt.*;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.beans.PropertyEditorManager;
import java.beans.PropertyEditorSupport;
import javax.swing.JFrame;
/**
*

15
src/eva2/gui/plot/DPointSetMultiIcon.java
View File

@@ -1,20 +1,9 @@
package eva2.gui.plot;
import eva2.tools.chart2d.DArray;
import eva2.tools.chart2d.DBorder;
import eva2.tools.chart2d.DComponent;
import eva2.tools.chart2d.DIntDoubleMap;
import eva2.tools.chart2d.DMeasures;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIcon;
import eva2.tools.chart2d.DPointSet;
import eva2.tools.chart2d.DRectangle;
import eva2.tools.chart2d.*;
import java.awt.BasicStroke;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Stroke;
import java.awt.*;
import java.util.ArrayList;

2
src/eva2/gui/plot/DataViewerInterface.java
View File

@@ -1,7 +1,5 @@
package eva2.gui.plot;
import eva2.gui.plot.Graph;
/*
* Title: EvA2
* Description:

31
src/eva2/gui/plot/FunctionArea.java
View File

@@ -1,31 +1,15 @@
package eva2.gui.plot;
import eva2.gui.*;
import eva2.gui.Exp;
import eva2.gui.InterfaceSelectablePointIcon;
import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.mocco.paretofrontviewer.InterfaceRefPointListener;
import eva2.tools.ToolBoxGui;
import eva2.tools.chart2d.Chart2DDPointIconCircle;
import eva2.tools.chart2d.Chart2DDPointIconContent;
import eva2.tools.chart2d.Chart2DDPointIconCross;
import eva2.tools.chart2d.Chart2DDPointIconPoint;
import eva2.tools.chart2d.Chart2DDPointIconText;
import eva2.tools.chart2d.DArea;
import eva2.tools.chart2d.DBorder;
import eva2.tools.chart2d.DFunction;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIcon;
import eva2.tools.chart2d.DPointSet;
import eva2.tools.chart2d.ScaledBorder;
import eva2.tools.chart2d.*;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintWriter;
@@ -35,9 +19,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JFileChooser;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
/**
*

9
src/eva2/gui/plot/GraphPointSet.java
View File

@@ -14,15 +14,10 @@ package eva2.gui.plot;
* IMPORTS
*==========================================================================*/
import eva2.tools.chart2d.DArea;
import eva2.tools.chart2d.DMeasures;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIcon;
import eva2.tools.chart2d.DPointSet;
import eva2.tools.chart2d.*;
import eva2.tools.math.Mathematics;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.*;
import java.io.Serializable;
import java.util.ArrayList;

15
src/eva2/gui/plot/GraphPointSetLegend.java
View File

@@ -4,20 +4,11 @@ import eva2.tools.Pair;
import eva2.tools.StringTools;
import eva2.tools.chart2d.SlimRect;
import java.awt.Color;
import java.awt.FontMetrics;
import java.awt.Graphics;
import javax.swing.*;
import java.awt.*;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.*;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
import javax.swing.BoxLayout;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
/**
* A class representing the legend of a plot. It is created from a list of

22
src/eva2/gui/plot/Plot.java
View File

@@ -7,25 +7,17 @@ import eva2.optimization.population.Population;
import eva2.tools.BasicResourceLoader;
import eva2.tools.chart2d.DPointSet;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Formatter;
import java.util.Locale;
import javax.imageio.ImageIO;
import javax.swing.*;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import java.io.*;
import java.util.Formatter;
import java.util.Locale;
/**
* ToDo: Rename to PlotWindow

22
src/eva2/gui/plot/TopoPlot.java
View File

@@ -1,17 +1,4 @@
package eva2.gui.plot;
/*
* Title: EvA2
* Description:
* Copyright: Copyright (c) 2003
* Company: University of Tuebingen, Computer Architecture
* @author Holger Ulmer, Felix Streichert, Hannes Planatscher
* @version: $Revision: 306 $
* $Date: 2007-12-04 14:22:52 +0100 (Tue, 04 Dec 2007) $
* $Author: mkron $
*/
/*==========================================================================*
* IMPORTS
*==========================================================================*/
import eva2.optimization.problems.Interface2DBorderProblem;
import eva2.optimization.problems.InterfaceFirstOrderDerivableProblem;
@@ -19,13 +6,8 @@ import eva2.tools.chart2d.DRectangle;
import eva2.tools.diagram.ColorBarCalculator;
import eva2.tools.math.Mathematics;
import java.awt.Color;
import javax.swing.JPanel;
/*==========================================================================*
* CLASS DECLARATION
*==========================================================================*/
import javax.swing.*;
import java.awt.*;
/**
*

6
src/eva2/gui/utils/CustomTabbedPaneUI.java
View File

@@ -4,13 +4,13 @@
*/
package eva2.gui.utils;
import javax.swing.*;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicTabbedPaneUI;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import javax.swing.*;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicTabbedPaneUI;
public class CustomTabbedPaneUI extends BasicTabbedPaneUI {

6
src/eva2/gui/utils/VerticalButtonUI.java
View File

@@ -1,11 +1,9 @@
package eva2.gui.utils;
import javax.swing.*;
import javax.swing.plaf.basic.BasicButtonUI;
import java.awt.*;
import java.awt.geom.AffineTransform;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.plaf.basic.BasicButtonUI;
public class VerticalButtonUI extends BasicButtonUI {

7
src/eva2/optimization/go/GOStandaloneVersion.java
View File

@@ -21,8 +21,8 @@ import eva2.optimization.strategies.GeneticAlgorithm;
import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.tools.math.RNG;
import java.awt.BorderLayout;
import java.awt.List;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
@@ -32,9 +32,8 @@ import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import javax.swing.*;
@eva2.util.annotation.Description(text="This is a simple example framework for Evolutionary Algorithms.")
@eva2.util.annotation.Description(text = "This is a simple example framework for Evolutionary Algorithms.")
public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopulationChangedEventListener, java.io.Serializable {
// Interface GUI Stuff

27
src/eva2/optimization/go/MOCCOStandalone.java
View File

@@ -1,42 +1,23 @@
package eva2.optimization.go;
import eva2.optimization.mocco.MOCCOState;
import eva2.optimization.mocco.MOCCOParameterizeGDF;
import eva2.optimization.mocco.MOCCOParameterizeTchebycheff;
import eva2.optimization.mocco.MOCCOParameterizeRefPoint;
import eva2.optimization.mocco.MOCCOChooseReferenceSolution;
import eva2.optimization.mocco.MOCCOChooseReferencePoint;
import eva2.optimization.mocco.MOCCOParameterizeSTEP;
import eva2.optimization.mocco.MOCCOProblemInitialization;
import eva2.optimization.mocco.MOCCOProblemRedefinition;
import eva2.optimization.mocco.MOCCOParameterizeMO;
import eva2.optimization.mocco.MOCCOChooseMOStrategy;
import eva2.optimization.mocco.MOCCOInitialPopulationSize;
import eva2.optimization.mocco.MOCCOParameterizeSO;
import eva2.optimization.mocco.InterfaceProcessElement;
import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem;
import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem;
import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.optimization.problems.TF1Problem;
import eva2.optimization.problems.InterfaceOptimizationObjective;
import eva2.gui.JParaPanel;
import eva2.gui.PropertyDoubleArray;
import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.mocco.*;
import eva2.optimization.mocco.paretofrontviewer.MOCCOViewer;
import eva2.optimization.operator.moso.InterfaceMOSOConverter;
import eva2.optimization.operator.moso.MOSOWeightedFitness;
import eva2.optimization.operator.terminators.EvaluationTerminator;
import eva2.optimization.population.Population;
import eva2.optimization.problems.*;
import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.optimization.strategies.IslandModelEA;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.*;
import javax.swing.*;
/**
* Created by IntelliJ IDEA.

2
src/eva2/optimization/go/SwingWorker.java
View File

@@ -1,6 +1,6 @@
package eva2.optimization.go;
import javax.swing.SwingUtilities;
import javax.swing.*;
/**
* This is the 3rd version of SwingWorker (also known as

2
src/eva2/optimization/individuals/AbstractEAIndividualComparator.java
View File

@@ -19,7 +19,7 @@ import java.util.Comparator;
* @author mkron
* @see #AbstractEAIndividual().isDominatingFitness(double[], double[])
*/
@eva2.util.annotation.Description(text="A comparator class for general EA individuals. Compares individuals based on their fitness in context of minimization.")
@eva2.util.annotation.Description(text = "A comparator class for general EA individuals. Compares individuals based on their fitness in context of minimization.")
public class AbstractEAIndividualComparator implements Comparator<Object>, Serializable {
// flag whether a data field should be used.
private String indyDataKey = "";

2
src/eva2/optimization/individuals/ESIndividualBinaryData.java
View File

@@ -14,7 +14,7 @@ import java.util.BitSet;
* This individual uses a real-valued genotype to code for binary values, either
* by using a threshold value of by interpreting the double value as probability.
*/
@eva2.util.annotation.Description(text="This is an ES individual adopted to optimize binary values.")
@eva2.util.annotation.Description(text = "This is an ES individual adopted to optimize binary values.")
public class ESIndividualBinaryData extends AbstractEAIndividual implements InterfaceESIndividual, InterfaceDataTypeBinary, java.io.Serializable {
private BitSet m_Phenotype = new BitSet();

2
src/eva2/optimization/individuals/ESIndividualDoubleData.java
View File

@@ -15,7 +15,7 @@ import eva2.util.annotation.Description;
/**
* This individual uses a real-valued genotype to code for double values.
*/
@Description(text="This is an ES individual suited to optimize double values.")
@Description(text = "This is an ES individual suited to optimize double values.")
public class ESIndividualDoubleData extends AbstractEAIndividual implements InterfaceESIndividual, InterfaceDataTypeDouble, java.io.Serializable {
private double[] genotype;

2
src/eva2/optimization/individuals/ESIndividualIntegerData.java
View File

@@ -11,7 +11,7 @@ import eva2.util.annotation.Description;
/**
* This individual uses a real-valued genotype to code for integer values.
*/
@Description(text="This is an ES individual suited to optimize integer values.")
@Description(text = "This is an ES individual suited to optimize integer values.")
public class ESIndividualIntegerData extends AbstractEAIndividual implements InterfaceESIndividual, InterfaceDataTypeInteger, java.io.Serializable {
private double[] genotype;

2
src/eva2/optimization/individuals/ESIndividualPermutationData.java
View File

@@ -12,7 +12,7 @@ import eva2.util.annotation.Description;
* This individual uses a real-valued genotype to code for a permutations,
* the sorting of the real-valued genotype gives the permutation.
*/
@Description(text="This is an ES individual suited to optimize permutations.")
@Description(text = "This is an ES individual suited to optimize permutations.")
public class ESIndividualPermutationData extends AbstractEAIndividual implements InterfaceESIndividual, InterfaceDataTypePermutation, java.io.Serializable {
private double[][] m_Genotype;

2
src/eva2/optimization/individuals/GAESIndividualBinaryDoubleData.java
View File

@@ -12,7 +12,7 @@ import java.util.BitSet;
/**
* This individual combines a binary and a real-valued phenotype.
*/
@Description(text="This is a mixed data type combining a BitSet and a real-valued vector.")
@Description(text = "This is a mixed data type combining a BitSet and a real-valued vector.")
public class GAESIndividualBinaryDoubleData extends AbstractEAIndividual implements InterfaceDataTypeBinary, InterfaceDataTypeDouble, java.io.Serializable {
private InterfaceDataTypeDouble m_Numbers = new ESIndividualDoubleData();

2
src/eva2/optimization/individuals/GAIndividualBinaryData.java
View File

@@ -14,7 +14,7 @@ import java.util.BitSet;
/**
* This individual uses a binary genotype to code for binary values.
*/
@Description(text="This is a GA individual suited to optimize binary values.")
@Description(text = "This is a GA individual suited to optimize binary values.")
public class GAIndividualBinaryData extends AbstractEAIndividual implements InterfaceDataTypeBinary, InterfaceGAIndividual, java.io.Serializable {
protected BitSet m_Genotype = new BitSet();

2
src/eva2/optimization/individuals/GAIndividualDoubleData.java
View File

@@ -17,7 +17,7 @@ import java.util.BitSet;
* This individual uses a binary genotype to code for double values
* using two alternative encodings.
*/
@Description(text="This is a GA individual suited to optimize double values.")
@Description(text = "This is a GA individual suited to optimize double values.")
public class GAIndividualDoubleData extends AbstractEAIndividual implements InterfaceGAIndividual, InterfaceDataTypeDouble, java.io.Serializable {
private double[] m_Phenotype;

2
src/eva2/optimization/individuals/GAIndividualIntegerData.java
View File

@@ -16,7 +16,7 @@ import java.util.BitSet;
* This individual uses a binary genotype to code for binary values using
* two alternative encodings.
*/
@Description(text="This is a GA individual suited to optimize int values.")
@Description(text = "This is a GA individual suited to optimize int values.")
public class GAIndividualIntegerData extends AbstractEAIndividual implements InterfaceGAIndividual, InterfaceDataTypeInteger, java.io.Serializable {
private int[] phenotype;

2
src/eva2/optimization/individuals/GEIndividualProgramData.java
View File

@@ -18,7 +18,7 @@ import java.util.BitSet;
* This individual uses a binary genotype to code for a tree-based representation
* using a BNF grammar, see also Grammatical Evolution.
*/
@Description(text="This is a GE individual suited to optimize programs.")
@Description(text = "This is a GE individual suited to optimize programs.")
public class GEIndividualProgramData extends AbstractEAIndividual implements InterfaceGAIndividual, InterfaceDataTypeProgram, java.io.Serializable {
protected GPArea[] m_Area;

2
src/eva2/optimization/individuals/GIIndividualIntegerData.java
View File

@@ -11,7 +11,7 @@ import eva2.util.annotation.Description;
/**
* This individual uses a integer genotype to code for integer values.
*/
@Description(text="This is a GI individual suited to optimize int values.")
@Description(text = "This is a GI individual suited to optimize int values.")
public class GIIndividualIntegerData extends AbstractEAIndividual implements InterfaceGIIndividual, InterfaceDataTypeInteger, java.io.Serializable {
private int[] m_Phenotype;

2
src/eva2/optimization/individuals/GIOBGAIndividualIntegerPermutationData.java
View File

@@ -9,7 +9,7 @@ import eva2.util.annotation.Description;
/**
* This individual combines a binary and a real-valued phenotype.
*/
@Description(text="This is a mixed data type combining an integer vector with a permutation vector.")
@Description(text = "This is a mixed data type combining an integer vector with a permutation vector.")
public class GIOBGAIndividualIntegerPermutationData extends AbstractEAIndividual implements InterfaceDataTypeInteger, InterfaceDataTypePermutation, java.io.Serializable {
private InterfaceDataTypeInteger m_Integer = new GIIndividualIntegerData();

2
src/eva2/optimization/individuals/GPIndividualProgramData.java
View File

@@ -15,7 +15,7 @@ import eva2.util.annotation.Description;
/**
* This individual uses a tree-based genotype to code for program trees.
*/
@Description(text="This is a GP individual suited to optimize Koza style program trees.")
@Description(text = "This is a GP individual suited to optimize Koza style program trees.")
public class GPIndividualProgramData extends AbstractEAIndividual implements InterfaceGPIndividual, InterfaceDataTypeProgram, java.io.Serializable {
protected AbstractGPNode[] genotype;

2
src/eva2/optimization/individuals/OBGAIndividualPermutationData.java
View File

@@ -14,7 +14,7 @@ import java.util.ArrayList;
* This individual uses a permutation based genotype to code for
* permutations.
*/
@Description(text="This is a GA individual coding permutations.")
@Description(text = "This is a GA individual coding permutations.")
public class OBGAIndividualPermutationData extends AbstractEAIndividual implements InterfaceDataTypePermutation, InterfaceOBGAIndividual, java.io.Serializable {
int[][] phenotype;

2
src/eva2/optimization/mocco/MOCCOChooseMOStrategy.java
View File

@@ -4,10 +4,10 @@ package eva2.optimization.mocco;
import eva2.optimization.go.MOCCOStandalone;
import eva2.tools.BasicResourceLoader;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.*;
/**

2
src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java
View File

@@ -6,10 +6,10 @@ import eva2.optimization.mocco.paretofrontviewer.InterfaceRefPointListener;
import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem;
import eva2.optimization.problems.InterfaceOptimizationObjective;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.*;
/**
* Created by IntelliJ IDEA.

2
src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java
View File

@@ -8,10 +8,10 @@ import eva2.optimization.population.Population;
import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem;
import eva2.optimization.problems.InterfaceOptimizationObjective;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.*;
/**
* Created by IntelliJ IDEA.

9
src/eva2/optimization/mocco/MOCCOInitialPopulationSize.java
View File

@@ -2,15 +2,10 @@ package eva2.optimization.mocco;
import eva2.optimization.go.MOCCOStandalone;
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
/**
* Created by IntelliJ IDEA.

4
src/eva2/optimization/mocco/MOCCOParameterizeGDF.java
View File

@@ -1,9 +1,9 @@
package eva2.optimization.mocco;
import eva2.gui.editor.GenericObjectEditor;
import eva2.gui.PropertyDoubleArray;
import eva2.gui.PropertyEditorProvider;
import eva2.gui.editor.GenericObjectEditor;
import eva2.optimization.go.InterfaceTerminator;
import eva2.optimization.go.MOCCOStandalone;
import eva2.optimization.individuals.AbstractEAIndividual;
@@ -16,11 +16,11 @@ import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.optimization.tools.AbstractObjectEditor;
import eva2.optimization.tools.GeneralOptimizationEditorProperty;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import javax.swing.*;
/**
* Created by IntelliJ IDEA.

4
src/eva2/optimization/mocco/MOCCOParameterizeMO.java
View File

@@ -1,8 +1,8 @@
package eva2.optimization.mocco;
import eva2.gui.editor.GenericObjectEditor;
import eva2.gui.PropertyEditorProvider;
import eva2.gui.editor.GenericObjectEditor;
import eva2.optimization.go.InterfaceTerminator;
import eva2.optimization.go.MOCCOStandalone;
import eva2.optimization.population.Population;
@@ -12,10 +12,10 @@ import eva2.optimization.strategies.MultiObjectiveEA;
import eva2.optimization.tools.AbstractObjectEditor;
import eva2.optimization.tools.GeneralOptimizationEditorProperty;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.*;
/**
* Created by IntelliJ IDEA.

11
src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java
View File

@@ -1,8 +1,8 @@
package eva2.optimization.mocco;
import eva2.gui.editor.GenericObjectEditor;
import eva2.gui.PropertyEditorProvider;
import eva2.gui.editor.GenericObjectEditor;
import eva2.optimization.go.InterfaceTerminator;
import eva2.optimization.go.MOCCOStandalone;
import eva2.optimization.operator.migration.SOBestMigration;
@@ -13,15 +13,10 @@ import eva2.optimization.tools.AbstractObjectEditor;
import eva2.optimization.tools.GeneralOptimizationEditorProperty;
import eva2.tools.math.RNG;
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
/**
* Created by IntelliJ IDEA.

11
src/eva2/optimization/mocco/MOCCOParameterizeSO.java
View File

@@ -1,8 +1,8 @@
package eva2.optimization.mocco;
import eva2.gui.editor.GenericObjectEditor;
import eva2.gui.PropertyEditorProvider;
import eva2.gui.editor.GenericObjectEditor;
import eva2.optimization.go.InterfaceTerminator;
import eva2.optimization.go.MOCCOStandalone;
import eva2.optimization.strategies.GeneticAlgorithm;
@@ -11,15 +11,10 @@ import eva2.optimization.strategies.MultiObjectiveEA;
import eva2.optimization.tools.AbstractObjectEditor;
import eva2.optimization.tools.GeneralOptimizationEditorProperty;
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
/**
* Created by IntelliJ IDEA.

13
src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java
View File

@@ -1,9 +1,9 @@
package eva2.optimization.mocco;
import eva2.gui.editor.GenericObjectEditor;
import eva2.gui.PropertyDoubleArray;
import eva2.gui.PropertyEditorProvider;
import eva2.gui.editor.GenericObjectEditor;
import eva2.optimization.go.InterfaceTerminator;
import eva2.optimization.go.MOCCOStandalone;
import eva2.optimization.individuals.AbstractEAIndividual;
@@ -16,18 +16,11 @@ import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.optimization.tools.AbstractObjectEditor;
import eva2.optimization.tools.GeneralOptimizationEditorProperty;
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
/**
* Created by IntelliJ IDEA.

13
src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java
View File

@@ -1,8 +1,8 @@
package eva2.optimization.mocco;
import eva2.gui.editor.GenericObjectEditor;
import eva2.gui.PropertyEditorProvider;
import eva2.gui.editor.GenericObjectEditor;
import eva2.optimization.go.InterfaceTerminator;
import eva2.optimization.go.MOCCOStandalone;
import eva2.optimization.operator.migration.SOBestMigration;
@@ -13,17 +13,10 @@ import eva2.optimization.tools.AbstractObjectEditor;
import eva2.optimization.tools.GeneralOptimizationEditorProperty;
import eva2.tools.math.RNG;
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
/**
* Created by IntelliJ IDEA.

8
src/eva2/optimization/mocco/MOCCOPhase.java
View File

@@ -2,14 +2,10 @@ package eva2.optimization.mocco;
import eva2.optimization.go.MOCCOStandalone;
import java.awt.BorderLayout;
import java.awt.Font;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.BorderFactory;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JTextArea;
/**
* Created by IntelliJ IDEA.

6
src/eva2/optimization/mocco/MOCCOProblemInitialization.java
View File

@@ -5,12 +5,10 @@ import eva2.optimization.go.MOCCOStandalone;
import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.ReflectPackage;
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.*;
/**
* Created by IntelliJ IDEA.

2
src/eva2/optimization/mocco/MOCCOProblemRedefinition.java
View File

@@ -5,10 +5,10 @@ import eva2.gui.JParaPanel;
import eva2.optimization.go.MOCCOStandalone;
import eva2.optimization.problems.InterfaceOptimizationProblem;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.*;
/**
* Created by IntelliJ IDEA.

2
src/eva2/optimization/mocco/MOCCOState.java
View File

@@ -12,7 +12,7 @@ import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.optimization.strategies.MultiObjectiveEA;
import java.awt.Color;
import java.awt.*;
import java.util.ArrayList;
/**

2
src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java
View File

@@ -14,6 +14,7 @@ import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIcon;
import eva2.tools.chart2d.ScaledBorder;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -23,7 +24,6 @@ import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.text.SimpleDateFormat;
import java.util.Date;
import javax.swing.*;
/**

9
src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java
View File

@@ -8,18 +8,13 @@ import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.population.Population;
import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem;
import eva2.optimization.problems.InterfaceOptimizationObjective;
import eva2.tools.chart2d.Chart2DDPointContentSelectable;
import eva2.tools.chart2d.Chart2DDPointIconCross;
import eva2.tools.chart2d.Chart2DDPointIconPoint;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIcon;
import eva2.tools.chart2d.ScaledBorder;
import eva2.tools.chart2d.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import javax.swing.*;
/**

Some files were not shown because too many files have changed in this diff Show More